[Gelistirici] COMAR katarları için yapılacak değişiklikler
Necmettin Begiter
necmettin at pardus.org.tr
4 Tem 2009 Cmt 13:19:33 EEST
Aşağıdadır, yorumlarınızı bekliyorum. Yorumlara göre gerekli
değişiklikleri yapıp depoya göndereceğim.
Index: 2009devel/programming/library/omniORB/comar/service.py
===================================================================
--- 2009devel/programming/library/omniORB/comar/service.py (revision 71688)
+++ 2009devel/programming/library/omniORB/comar/service.py (working copy)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
import os
import socket
from comar.service import *
@@ -6,12 +7,23 @@
serviceDefault = "off"
serviceDesc = _({"en": "CORBA Naming Service",
- "tr": "CORBA İsimlendirme Servisi"})
+ "tr": "CORBA İsimlendirme Servisi",
+ })
serviceConf = "omniNames"
logDir = "/var/log/omniNames"
keyFile = "/var/lib/omniMapper/NameService"
+MSG_ERR_CONFNASEGENI = {"en": "Unable to configure NameService with genior.",
+ "tr": "İsim servisi genior ile yapılandırılamadı.",
+ }
+MSG_ERR_STRTSRVC = {"en": "Unable to start service.",
+ "tr": "Servis başlatılamadı.",
+ }
+MSG_ERR_STRTSRVCPCN1 = {"en": "Unable to start: %s",
+ "tr": "Başlatılamadı: %s",
+ }
+
def start():
options = "-errlog %s/error.log -logdir %s" % (logDir, logDir)
hostname = socket.gethostname()
@@ -35,11 +47,11 @@
if ret == 0:
notify("System.Service", "Changed", (script(), "started"))
else:
- fail("Unable to configure NameService with genior")
+ fail(_(MSG_ERR_CONFNASEGENI))
else:
- err = "Unable to start service"
+ err = _(MSG_ERR_STRTSRVC)
if ret.stderr != "":
- err = "Unable to start: %s" % str(ret.stderr)
+ err = _(MSG_ERR_STRTSRVCPCN1) % str(ret.stderr)
fail(err)
def stop():
Index: 2009devel/system/boot/kexec-tools/comar/service.py
===================================================================
--- 2009devel/system/boot/kexec-tools/comar/service.py (revision 71688)
+++ 2009devel/system/boot/kexec-tools/comar/service.py (working copy)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
from comar.service import *
import os
@@ -6,6 +7,8 @@
"tr": "KExec Araçları"})
serviceConf = "kexec"
+MSG_ERR_STOPKEXC = {"en": "Couldn't stop kexec, rebooting system.",
+ "tr": "kexec durdurulamadı, bilgisayar yeniden
başlatılıyor."}
@synchronized
def start():
kpar=[]
@@ -35,7 +38,7 @@
args="-u",
donotify=True)
else:
- fail("Unable to stop kexec - system is rebooting")
+ fail(_(MSG_ERR_STOPKEXC))
def status():
return int(file("/sys/kernel/kexec_loaded").read().strip())
Index: 2009devel/system/base/wireless-tools/comar/link.py
===================================================================
--- 2009devel/system/base/wireless-tools/comar/link.py (revision 71688)
+++ 2009devel/system/base/wireless-tools/comar/link.py (working copy)
@@ -1,141 +1,108 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
-MSG_WIRELESS = {
- "en": "Wireless",
- "tr": "Kablosuz Ağlar",
- "fr": "Réseaux sans-fil",
- "es": "Redes inalambricos",
- "sv": "Trådlösa nätverk",
- "de": "Drahtlose Netzwerke",
-}
+MSG_WIRELESS = _({"en": "Wireless",
+ "tr": "Kablosuz Ağlar",
+ "fr": "Réseaux sans-fil",
+ "es": "Redes inalambricos",
+ "sv": "Trådlösa nätverk",
+ "de": "Drahtlose Netzwerke",
+ })
+MSG_DHCP_FAILED = _({"en": "Could not acquire an address.",
+ "tr": "Adres alınamadı.",
+ "fr": "Impossible d'obtenir une adresse.",
+ "es": "No posible obtener dirección.",
+ "sv": "Kunde inte erhålla adress.",
+ "de": "Konnte keine Adresse beziehen.",
+ })
+MSG_NO_DEVICE = _({"en": "Device is not plugged.",
+ "tr": "Aygıt takılı değil.",
+ "fr": "Le matériel est débranché.",
+ "es": "Dispositivo no esté conectado.",
+ "sv": "Enheten är inte ansluten.",
+ "de": "Gerät ist nicht angeschlossen.",
+ })
+MSG_NO_DRIVER = _({"en": "Device driver is missing. You may need to
install device firmware.",
+ "tr": "Aygıt sürücüsü bulunamadı. Aygıta ait
bellenim paketini kurmanız gerekebilir.",
+ "fr": "Il n'y a pas de pilote installé pour ce matériel.",
+ "es": "Falta el controlador del dispositivo. Se
requiere instalar el firmware del dispositivo.",
+ "de": "Gerätetreiber fehlt. Bitte entsprechenden
Firmwaretreiber installieren.",
+ })
+MSG_NO_SUPPLICANT = _({"en": "WPA supplicant not found.",
+ "tr": "WPA aracısı bulunamadı.",
+ "fr": "Impossible de trouver WPA supplicant.",
+ "es": "WPA supplicant no encontrado.",
+ "sv": "Kunde inte hitta WPA supplikant.",
+ "de": "WPA supplicant nicht gefunden.",
+ })
+MSG_NO_SUPPLICANT_SERVICE = _({"en": "Unable to start WPA supplicant service.",
+ "tr": "WPA aracı servisi başlatılamadı.",
+ "fr": "Impossible de lancer le service
WPA supplicant.",
+ "es": "No posible iniciar el servicio
WPA supplicant",
+ "de": "WPA supplicant service konnte
nicht gestartet werden.",
+ })
+MSG_WPA_FAILED = _({"en": "Authentication failed.",
+ "tr": "Kimlik doğrulama başarısız oldu.",
+ "fr": "Échec d'authentification.",
+ "es": "Autenticación fallada.",
+ "sv": "Autentiseringen misslyckades.",
+ "de": "Authentifizierung fehlgeschlagen.",
+ })
+AUTH_WPA_PSK = _({"en": "WPA Pre-shared Key",
+ "tr": "WPA Ortak Anahtar",
+ "fr": "Clef WPA pre-shared",
+ "es": "Clave compartida WPA",
+ "sv": "Utdelad WPA-nyckel",
+ "de": "WPA Pre-Shared Key",
+ })
+AUTH_WEP_DYNAMIC = _({"en": "Dynamic WEP (802.1x)",
+ "tr": "Dinamik WEP (802.1x)",
+ "fr": "WEP dynamique (802.1x)",
+ "es": "WEP dinámico (802.1x)",
+ "sv": "Dynamisk WEP (802.1x)",
+ "de": "Dynamische WEP (802.1x)",
+ })
+PARAM_PASSWORD = _({"en": "Password",
+ "tr": "Parola",
+ "fr": "Mot de passe",
+ })
+PARAM_USERNAME = _({"en": "Username",
+ "tr": "Kullanıcı Adı",
+ "fr": "Nom d'utilisateur",
+ "es": "Contraseña",
+ "de": "Passwort",
+ })
+PARAM_CLIENT_CERT = _({"en": "Client Certificate",
+ "tr": "İstemci Sertifikası",
+ "fr": "Certificat du client",
+ "es": "Certificado del cliente",
+ "de": "Zertifikat des Clients",
+ })
+PARAM_CA_CERT = _({"en": "Authority Certificate",
+ "tr": "Otorite Sertifikası",
+ "fr": "Certificat d'autorité",
+ })
+PARAM_KEY_FILE = _({"en": "Key File",
+ "tr": "Anahtar Dosyası",
+ "fr": "Fichier clef",
+ "es": "Archivo de Clave",
+ "de": "Datei mit Schlüssel",
+ })
+DEVICE_MANAGED = _({"en": "Normal",
+ "tr": "Normal",
+ "fr": "Normal",
+ "es": "Normal",
+ "de": "Normal",
+ })
+DEVICE_ADHOC = _({"en": "Ad-Hoc",
+ "tr": "Ad-Hoc",
+ "fr": "Ad-hoc",
+ })
+REMOTE_LABEL = _({"en": "ESSID",
+ "tr": "ESSID",
+ "fr": "ESSID",
+ })
-MSG_DHCP_FAILED = {
- "en": "Could not acquire an address.",
- "tr": "Adres alınamadı.",
- "fr": "Impossible d'obtenir une adresse.",
- "es": "No posible obtener dirección.",
- "sv": "Kunde inte erhålla adress.",
- "de": "Konnte keine Adresse beziehen.",
-}
-
-MSG_NO_DEVICE = {
- "en": "Device is not plugged.",
- "tr": "Aygıt takılı değil.",
- "fr": "Le matériel est débranché.",
- "es": "Dispositivo no esté conectado.",
- "sv": "Enheten är inte ansluten.",
- "de": "Gerät ist nicht angeschlossen.",
-}
-
-MSG_NO_DRIVER = {
- "en": "Device driver is missing. You may need to install device firmware.",
- "tr": "Aygıt sürücüsü bulunamadı. Aygıta ait bellenim paketini
kurmanız gerekebilir.",
- "fr": "Il n'y a pas de pilote installé pour ce matériel.",
- "es": "Falta el controlador del dispositivo. Se requiere instalar
el firmware del dispositivo.",
- "de": "Gerätetreiber fehlt. Bitte entsprechenden Firmwaretreiber
installieren.",
-}
-
-MSG_NO_SUPPLICANT = {
- "en": "WPA supplicant not found.",
- "tr": "WPA aracısı bulunamadı.",
- "fr": "Impossible de trouver WPA supplicant.",
- "es": "WPA supplicant no encontrado.",
- "sv": "Kunde inte hitta WPA supplikant.",
- "de": "WPA supplicant nicht gefunden.",
-}
-
-MSG_NO_SUPPLICANT_SERVICE = {
- "en": "Unable to start WPA supplicant service.",
- "tr": "WPA aracı servisi başlatılamadı.",
- "fr": "Impossible de lancer le service WPA supplicant.",
- "es": "No posible iniciar el servicio WPA supplicant",
- "de": "WPA supplicant service konnte nicht gestartet werden.",
-}
-
-MSG_WPA_FAILED = {
- "en": "Authentication failed.",
- "tr": "Kimlik doğrulama başarısız oldu.",
- "fr": "Échec d'authentification.",
- "es": "Autenticación fallada.",
- "sv": "Autentiseringen misslyckades.",
- "de": "Authentifizierung fehlgeschlagen.",
-}
-
-AUTH_WPA_PSK = {
- "en": "WPA Pre-shared Key",
- "tr": "WPA Ortak Anahtar",
- "fr": "Clef WPA pre-shared",
- "es": "Clave compartida WPA",
- "sv": "Utdelad WPA-nyckel",
- "de": "WPA Pre-Shared Key",
-}
-
-AUTH_WEP_DYNAMIC = {
- "en": "Dynamic WEP (802.1x)",
- "tr": "Dinamik WEP (802.1x)",
- "fr": "WEP dynamique (802.1x)",
- "es": "WEP dinámico (802.1x)",
- "sv": "Dynamisk WEP (802.1x)",
- "de": "Dynamische WEP (802.1x)",
-}
-
-PARAM_PASSWORD = {
- "en": "Password",
- "tr": "Parola",
- "fr": "Mot de passe",
-}
-
-PARAM_USERNAME = {
- "en": "Username",
- "tr": "Kullanıcı Adı",
- "fr": "Nom d'utilisateur",
- "es": "Contraseña",
- "de": "Passwort",
-}
-
-PARAM_CLIENT_CERT = {
- "en": "Client Certificate",
- "tr": "İstemci Sertifikası",
- "fr": "Certificat du client",
- "es": "Certificado del cliente",
- "de": "Zertifikat des Clients",
-}
-
-PARAM_CA_CERT = {
- "en": "Authority Certificate",
- "tr": "Otorite Sertifikası",
- "fr": "Certificat d'autorité",
-}
-
-PARAM_KEY_FILE = {
- "en": "Key File",
- "tr": "Anahtar Dosyası",
- "fr": "Fichier clef",
- "es": "Archivo de Clave",
- "de": "Datei mit Schlüssel",
-}
-
-DEVICE_MANAGED = {
- "en": "Normal",
- "tr": "Normal",
- "fr": "Normal",
- "es": "Normal",
- "de": "Normal",
-}
-
-DEVICE_ADHOC = {
- "en": "Ad-Hoc",
- "tr": "Ad-Hoc",
- "fr": "Ad-hoc",
-}
-
-REMOTE_LABEL = {
- "en": "ESSID",
- "tr": "ESSID",
- "fr": "ESSID",
-}
-
import os
import re
import socket
@@ -199,7 +166,7 @@
# Some drivers cant do the scan while interface is down, doh :(
ifc.setAddress("0.0.0.0")
if ifc.up() == None:
- fail(_(MSG_NO_DRIVER))
+ fail(MSG_NO_DRIVER)
cmd = subprocess.Popen(["/usr/sbin/iwlist", ifc.name,
"scan"], stdout=subprocess.PIPE)
data = cmd.communicate()[0]
points = []
@@ -281,15 +248,15 @@
os.system("/usr/sbin/iwconfig '%s' enc restricted 's:%s'"
% (self.ifc.name, parameters["password"]))
elif mode == "wpa-psk":
if not supplicant:
- fail(_(MSG_NO_SUPPLICANT))
+ fail(MSG_NO_SUPPLICANT)
if not wpa_supplicant.startWpaService():
- fail(_(MSG_NO_SUPPLICANT_SERVICE))
+ fail(MSG_NO_SUPPLICANT_SERVICE)
try:
ret =
wpa_supplicant.setWpaAuthentication(self.ifc.name, self.ssid,
parameters["password"])
except:
return
if not ret:
- fail(_(MSG_WPA_FAILED))
+ fail(MSG_WPA_FAILED)
elif mode == "802.1x":
pass
@@ -309,7 +276,7 @@
def linkInfo():
d = {
"type": "wifi",
- "name": _(MSG_WIRELESS),
+ "name": MSG_WIRELESS,
"modes": "device,device_mode,remote,remote_scan,net,auto,auth",
}
return d
@@ -318,31 +285,31 @@
return [
("wep", "WEP"),
("wepascii", "WEP ASCII"),
- ("wpa-psk", _(AUTH_WPA_PSK)),
- ("802.1x", _(AUTH_WEP_DYNAMIC)),
+ ("wpa-psk", AUTH_WPA_PSK),
+ ("802.1x", AUTH_WEP_DYNAMIC),
]
def authParameters(mode):
if mode in ("wep", "wepascii", "wpa-psk"):
return [
- ("password", _(PARAM_PASSWORD), "pass"),
+ ("password", PARAM_PASSWORD, "pass"),
]
elif mode == "802.1x":
return [
- ("username", _(PARAM_USERNAME), "text"),
- ("password", _(PARAM_PASSWORD), "pass"),
- ("cert_cli", _(PARAM_CLIENT_CERT), "file"),
- ("cert_ca", _(PARAM_CA_CERT), "file"),
- ("keyfile", _(PARAM_KEY_FILE), "file"),
+ ("username", PARAM_USERNAME, "text"),
+ ("password", PARAM_PASSWORD, "pass"),
+ ("cert_cli", PARAM_CLIENT_CERT, "file"),
+ ("cert_ca", PARAM_CA_CERT, "file"),
+ ("keyfile", PARAM_KEY_FILE, "file"),
]
def remoteName():
- return _(REMOTE_LABEL)
+ return REMOTE_LABEL
def deviceModes():
return [
- ("managed", _(DEVICE_MANAGED)),
- ("adhoc", _(DEVICE_ADHOC)),
+ ("managed", DEVICE_MANAGED),
+ ("adhoc", DEVICE_ADHOC),
]
def deviceList():
@@ -483,10 +450,10 @@
else:
iface.down()
# Save state to profile database
- profile.info["state"] = "inaccessible %s" %
_(MSG_DHCP_FAILED)
+ profile.info["state"] = "inaccessible %s" %
MSG_DHCP_FAILED
profile.save(no_notify=True)
# Notify clients
- notify("Network.Link", "stateChanged", (name,
"inaccessible", _(MSG_DHCP_FAILED)))
+ notify("Network.Link", "stateChanged", (name,
"inaccessible", MSG_DHCP_FAILED))
return
# Set nameservers
registerNameServers(profile, iface)
@@ -502,10 +469,10 @@
else:
iface.down()
# Save state to profile database
- profile.info["state"] = "inaccessible %s" %
_(MSG_DHCP_FAILED)
+ profile.info["state"] = "inaccessible %s" % MSG_DHCP_FAILED
profile.save(no_notify=True)
# Notify clients
- notify("Network.Link", "stateChanged", (name,
"inaccessible", _(MSG_DHCP_FAILED)))
+ notify("Network.Link", "stateChanged", (name,
"inaccessible", MSG_DHCP_FAILED))
else:
try:
net_address = profile.info["net_address"]
@@ -516,7 +483,7 @@
iface.setAddress(net_address, net_mask)
# Bring up interface
if iface.up() == None:
- fail(_(MSG_NO_DRIVER))
+ fail(MSG_NO_DRIVER)
# Set default gateway
net_gateway = profile.info.get("net_gateway", "")
if net_gateway:
Index: 2009devel/system/base/openssh/comar/service.py
===================================================================
--- 2009devel/system/base/openssh/comar/service.py (revision 71688)
+++ 2009devel/system/base/openssh/comar/service.py (working copy)
@@ -1,26 +1,29 @@
+# -*- coding: utf-8 -*-
from comar.service import *
+serviceType = "server"
+serviceDesc = _({"en": "Secure Shell Server",
+ "tr": "Güvenli Kabuk Sunucusu"
+ })
+
+MSG_ERR_NEEDCONF = _({"en": "You need /etc/ssh/sshd_config to run sshd.",
+ "tr": "Sshd'yi çalıştırabilmek için
/etc/ssh/sshd_config'e ihtiyaç var.",
+ })
+
def check_config():
import os
if not os.path.exists("/etc/ssh/sshd_config"):
- fail("You need /etc/ssh/sshd_config to run sshd")
-
+ fail(MSG_ERR_NEEDCONF)
if not os.path.exists("/etc/ssh/ssh_host_key"):
run("/usr/bin/ssh-keygen", "-t", "rsa1", "-b", "1024",
"-f", "/etc/ssh/ssh_host_key", "-N", "")
-
if not os.path.exists("/etc/ssh/ssh_host_dsa_key"):
run("/usr/bin/ssh-keygen", "-d", "-f",
"/etc/ssh/ssh_host_dsa_key", "-N", "")
-
if not os.path.exists("/etc/ssh/ssh_host_rsa_key"):
run("/usr/bin/ssh-keygen", "-t", "rsa",
"-f", "/etc/ssh/ssh_host_rsa_key", "-N", "")
-serviceType = "server"
-serviceDesc = _({"en": "Secure Shell Server",
- "tr": "Güvenli Kabuk Sunucusu"})
-
@synchronized
def start():
check_config()
Index: 2009devel/system/base/module-init-tools/comar/bootmodules.py
===================================================================
--- 2009devel/system/base/module-init-tools/comar/bootmodules.py (revision
71688)
+++ 2009devel/system/base/module-init-tools/comar/bootmodules.py (working copy)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
import os
import subprocess
@@ -17,31 +18,22 @@
# l10n
-FAIL_TIMEOUT = _({
- "en": "Request timed out. Try again later.",
- "tr": "Talep zaman aşımına uğradı. Daha sonra tekrar deneyin.",
-})
+FAIL_TIMEOUT = _({"en": "Request timed out. Try again later.",
+ "tr": "Talep zaman aşımına uğradı. Daha sonra
tekrar deneyin.",
+ })
+FAIL_VERSION = _({"en": "Invalid kernel version.",
+ "tr": "Geçersiz çekirdek sürümü.",
+ })
+FAIL_PROBE = _({"en": "Unable to load module %s: %s",
+ "tr": "%s modülü yüklenemedi: %s",
+ })
+FAIL_RMMOD = _({"en": "Unable to unload module %s: %s",
+ "tr": "%s modülü kaldırılamadı: %s",
+ })
+FAIL_UPDATE = _({"en": "Unable to update modprobe.conf: %s",
+ "tr": "modprobe.conf güncellenemedi: %s",
+ })
-FAIL_VERSION = _({
- "en": "Invalid kernel version.",
- "tr": "Geçersiz çekirdek sürümü.",
-})
-
-FAIL_PROBE = _({
- "en": "Unable to load module %s: %s",
- "tr": "%s modülü yüklenemedi: %s",
-})
-
-FAIL_RMMOD = _({
- "en": "Unable to unload module %s: %s",
- "tr": "%s modülü kaldırılamadı: %s",
-})
-
-FAIL_UPDATE = _({
- "en": "Unable to update modprobe.conf: %s",
- "tr": "modprobe.conf güncellenemedi: %s",
-})
-
# Utils
def majorVersion(kernel_version):
Index: 2009devel/system/base/mudur/comar/disk.py
===================================================================
--- 2009devel/system/base/mudur/comar/disk.py (revision 71688)
+++ 2009devel/system/base/mudur/comar/disk.py (working copy)
@@ -7,60 +7,54 @@
FSTAB = '/etc/fstab'
-FAIL_FSTAB = {
- "en": "Unable to read '%s'.",
- "tr": "'%s' okunamadı.",
- "fr": "Impossible de lire '%s' .",
- "es": "No posible leer '%s'.",
- "de": "'%s' konnte nicht gelesen werden.",
-}
+FAIL_FSTAB = _({"en": "Unable to read '%s'.",
+ "tr": "'%s' okunamadı.",
+ "fr": "Impossible de lire '%s' .",
+ "es": "No posible leer '%s'.",
+ "de": "'%s' konnte nicht gelesen werden.",
+ })
-FAIL_PATH = {
- "en": "'%s' is not a valid mount point.",
- "tr": "'%s' geçerli bir bağlama noktası değil.",
- "fr": "'%s' n'est pas un point de montage valide.",
- "es": "'%s' no es un punto de montaje válido.",
- "de": "'%s' ist kein gültiger Mount-Punkt.",
-}
+FAIL_PATH = _({"en": "'%s' is not a valid mount point.",
+ "tr": "'%s' geçerli bir bağlama noktası değil.",
+ "fr": "'%s' n'est pas un point de montage valide.",
+ "es": "'%s' no es un punto de montaje válido.",
+ "de": "'%s' ist kein gültiger Mount-Punkt.",
+ })
-FAIL_ENTRY = {
- "en": "Device '%s' not found in entry list.",
- "tr": "'%s' aygıtı listede bulunamadı.",
- "fr": "Le matériel '%s' n'a pas été trouvé dans la liste.",
- "es": "Dispositivo '%s' no encontrado en lista de entrada.",
- "de": "Gerät '%s' ist nicht in der Liste eingetragen.",
-}
+FAIL_ENTRY = _({"en": "Device '%s' not found in entry list.",
+ "tr": "'%s' aygıtı listede bulunamadı.",
+ "fr": "Le matériel '%s' n'a pas été trouvé dans la liste.",
+ "es": "Dispositivo '%s' no encontrado en lista de entrada.",
+ "de": "Gerät '%s' ist nicht in der Liste eingetragen.",
+ })
-FAIL_ROOT = {
- "en": "'%s' is mounted to root directory, operation cancelled.",
- "tr": "'%s' diski kök dizine bağlı, işlem iptal edildi.",
- "fr": "'%s' est monté sur le répertoire racine, opération annulée.",
- "es": "'%s' está montado com root, operación cancelada.",
- "de": "'%s' ist als Root gemounted, Vorgang abgebrochen.",
-}
+FAIL_ROOT = _({"en": "'%s' is mounted to root directory, operation cancelled.",
+ "tr": "'%s' diski kök dizine bağlı, işlem iptal edildi.",
+ "fr": "'%s' est monté sur le répertoire racine,
opération annulée.",
+ "es": "'%s' está montado com root, operación cancelada.",
+ "de": "'%s' ist als Root gemounted, Vorgang abgebrochen.",
+ })
-FAIL_MOUNTED = {
- "en": "'%s' is mounted to another directory, operation cancelled.",
- "tr": "'%s' başka bir dizine bağlı, işlem iptal edildi.",
- "fr": "'%s' est monté sur un autre répertoire, opération annulée.",
- "es": "'%s' está montado en otro directorio, operación cancelada.",
- "de": "'%s' ist schon auf einem anderen Mount-Punkt gemounted,
Vorgang abgebrochen.",
-}
+FAIL_MOUNTED = _({"en": "'%s' is mounted to another directory,
operation cancelled.",
+ "tr": "'%s' başka bir dizine bağlı, işlem iptal edildi.",
+ "fr": "'%s' est monté sur un autre répertoire,
opération annulée.",
+ "es": "'%s' está montado en otro directorio,
operación cancelada.",
+ "de": "'%s' ist schon auf einem anderen Mount-Punkt
gemounted, Vorgang abgebrochen.",
+ })
-FAIL_OPERATION = {
- "en": "Operation failed:\n\n %s",
- "tr": "İşlem başarısız:\n\n %s",
- "fr": "L'opération a échoué : \n\n %s",
- "es": "Operación fallada:\n\n %s",
- "de": "Vorgang fehlerhaft:\n\n %s",
-}
+FAIL_OPERATION = _({"en": "Operation failed:\n\n %s",
+ "tr": "İşlem başarısız:\n\n %s",
+ "fr": "L'opération a échoué : \n\n %s",
+ "es": "Operación fallada:\n\n %s",
+ "de": "Vorgang fehlerhaft:\n\n %s",
+ })
class DMException(Exception):
pass
def parseFstab(fstab):
if not os.access(fstab, os.R_OK):
- raise DMException, _(FAIL_FSTAB) % fstab
+ raise DMException, FAIL_FSTAB % fstab
entries = []
for line in open(fstab):
line = line.strip()
@@ -97,7 +91,7 @@
proc = subprocess.Popen(cmd, stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
err = proc.communicate()[1].strip()
if len(err):
- fail(_(FAIL_OPERATION) % err)
+ fail(FAIL_OPERATION % err)
# Disk.Manager methods
@@ -140,7 +134,7 @@
device = getDeviceByLabel(device.split("LABEL=")[1])
for dev, path in getMounted():
if dev == device and path == "/":
- fail(_(FAIL_ROOT) % device)
+ fail(FAIL_ROOT % device)
runCommand(['/bin/umount', device])
def listEntries():
@@ -156,7 +150,7 @@
old_path, old_fsType, old_options = getEntry(device)
# Do not change root
if old_path == "/" and old_path != path:
- fail(_(FAIL_ROOT) % device)
+ fail(FAIL_ROOT % device)
# Who has that mount point? me?
if old_path == path:
path_own = True
@@ -165,10 +159,10 @@
if not path_own:
if not createPath(device, path):
# Can't create new path
- fail(_(FAIL_PATH) % path)
+ fail(FAIL_PATH % path)
elif device in [x[0] for x in getMounted()]:
# Device is mounted
- fail(_(FAIL_MOUNTED) % device)
+ fail(FAIL_MOUNTED % device)
# Remove previous one to prevent duplicates
if old_path:
removeEntry(device, silent=True)
@@ -204,11 +198,11 @@
else:
options[part] = ""
return _path, _fsType, options
- fail(_(FAIL_ENTRY) % device)
+ fail(FAIL_ENTRY % device)
def removeEntry(device, silent=False):
if device not in listEntries():
- fail(_(FAIL_ENTRY) % device)
+ fail(FAIL_ENTRY % device)
newlines = []
for line in open(FSTAB):
line = line.strip()
Index: 2009devel/system/base/dnsmasq/comar/stack.py
===================================================================
--- 2009devel/system/base/dnsmasq/comar/stack.py (revision 71688)
+++ 2009devel/system/base/dnsmasq/comar/stack.py (working copy)
@@ -17,6 +17,10 @@
RESOLV_USER = "/etc/resolv.default.conf"
+MSG_ERR_INVLCHRSHSNM = {"en": "Invalid character(s) '%s' found in hostname.",
+ "tr": "Bilgisayar adında geçersiz
karakter(ler) ('%s') bulundu.",
+ }
+
# Network.Stack methods
def getNameServers():
@@ -70,7 +74,7 @@
return
invalid = filter(lambda x: not x in HOST_CHARS, hostname)
if len(invalid) > 0:
- fail("Invalid characters '%s' in hostname" % ("".join(invalid)))
+ fail(_(MSG_ERR_INVLCHRSHSNM) % ("".join(invalid)))
# hostname
if os.path.exists(NAME_PATH):
Index: 2009devel/system/installer/yali4-firstBoot/comar/service.py
===================================================================
--- 2009devel/system/installer/yali4-firstBoot/comar/service.py (revision 71688)
+++ 2009devel/system/installer/yali4-firstBoot/comar/service.py (working copy)
@@ -8,12 +8,16 @@
})
serviceDefault = "off"
+MSG_ERR_ZORGEROR = _({"en": "Couldn't start YALI4 as Zorg returned an error.",
+ "tr": "Zorg bir hata döndürdüğü için YALI4
başlatılmıyor.",
+ })
+
@synchronized
def start(boot=False):
startDependencies("acpid", "hal")
if call("zorg", "Xorg.Display", "ready", (boot,)) == 0:
- fail("zorg bir hata döndürdüğü için başlatılmıyor.")
+ fail(MSG_ERR_ZORGEROR)
loadEnvironment()
os.environ["XAUTHLOCALHOSTNAME"]=os.uname()[1]
Index: 2009devel/network/connection/ppp/comar/link.py
===================================================================
--- 2009devel/network/connection/ppp/comar/link.py (revision 71688)
+++ 2009devel/network/connection/ppp/comar/link.py (working copy)
@@ -11,15 +11,43 @@
# Please read the COPYING file.
#
-name_msg = {
- "en": "Dialup network",
- "tr": "Çevirmeli ağlar"
-}
+name_msg = {"en": "Dialup network",
+ "tr": "Çevirmeli ağ",
+ }
+remote_name_msg = {"en": "Phone number",
+ "tr": "Telefon numarası",
+ }
-remote_name_msg = {
- "en": "Phone number",
- "tr": "Telefon numarası"
-}
+MSG_ERR_OPENLCKF = {"en": "Could not open lockfile.",
+ "tr": "Kilit dosyası açılamadı.",
+ }
+MSG_ERR_STOPPRCS = {"en": "Could not stop the process.",
+ "tr": "Süreç durdurulamadı.",
+ }
+MSG_KILD = {"en": "Killed.",
+ "tr": "Sonlandırıldı.",
+ }
+MSG_ERR_MNGEAUTHFLES = {"en": "Could not manage authentication files.",
+ "tr": "Kimlik doğrulama dosyaları işlenemedi.",
+ }
+MSG_ERR_MNGEPPPDPRMS = {"en": "Could not manage pppd parameters.",
+ "tr": "pppd parametreleri işlenemedi.",
+ }
+MSG_ERR_MNGECHATSCRP = {"en": "Could not manage chat script.",
+ "tr": "Sohbet betiği işlenemedi.",
+ }
+MSG_ERR_NOSUCHCONN = {"en": "No such connection.",
+ "tr": "Böyle bir bağlantı yok.",
+ }
+MSG_ERR_NOTSPRT = {"en": "Not supported.",
+ "tr": "Desteklenmiyor.",
+ }
+MSG_ERR_UNKNSTTE = {"en": "Unknown state.",
+ "tr": "Durum bilinmiyor.",
+ }
+MSG_ERR_DEVCNOTFOUN = {"en": "Device not found.",
+ "tr": "Aygıt bulunamadı.",
+ }
# Silly modem device list :/
# Appearently checking existance of these devices is easiest way to
detect modems
@@ -231,14 +259,14 @@
pid = atoi(f.readline())
f.close()
except:
- return "Could not open lockfile"
+ return _(MSG_ERR_OPENLCKF)
try:
os.kill(pid, SIGTERM)
except OSError:
- return "Could not stop the process"
+ return _(MSG_ERR_STOPPRCS)
- return "Killed"
+ return _(MSG_KILD)
def runPPPD(self, dev):
""" Run the PPP daemon """
@@ -255,13 +283,13 @@
dev = modem.lstrip("/dev/")
if self.createSecrets(user, pwd) is True:
- return "Could not manage authentication files"
+ return _(MSG_ERR_MNGEAUTHFLES)
if self.createOptions(dev, user, speed) is True:
- return "Could not manage pppd parameters"
+ return _(MSG_ERR_MNGEPPPDPRMS)
if self.createChatscript(dev, phone, vol) is True:
- return "Could not manage chat script"
+ return _(MSG_ERR_MNGECHATSCRP)
output = self.runPPPD(dev)
return output
@@ -285,7 +313,7 @@
dict = DB.getDB(name)
if want:
if not dict:
- fail("No such connection")
+ fail(_(MSG_ERR_NOSUCHCONN))
self.uid = _get(dict, "device", None)
self.name = name
self.dev = None
@@ -339,7 +367,7 @@
return iflist
def scanRemote():
- fail("Not supported")
+ fail(_(MSG_ERR_NOTSPRT))
def setConnection(name, device):
d = DB.getDB(name)
@@ -359,7 +387,7 @@
notify("Net.Link", "connectionChanged", ("deleted", name))
def setAddress(name=None, mode=None, address=None, mask=None, gateway=None):
- fail("Not supported")
+ fail(_(MSG_ERR_NOTSPRT))
def setRemote(name, remote, apmac):
d = DB.getDB(name)
@@ -383,10 +411,10 @@
def setState(name, state):
dev = Dev(name)
if state != "up" and state != "down":
- fail("Unknown state")
+ fail(_(MSG_ERR_UNKNSTTE))
if not dev.dev:
- fail("Device not found")
+ fail(_(MSG_ERR_DEVCNOTFOUN))
if state == "up":
dev.up()
Index: 2009devel/network/share/nfs-utils/comar/service.py
===================================================================
--- 2009devel/network/share/nfs-utils/comar/service.py (revision 71688)
+++ 2009devel/network/share/nfs-utils/comar/service.py (working copy)
@@ -4,8 +4,16 @@
serviceType = "server"
serviceDesc = _({"en": "NFS Daemon",
- "tr": "NFS Servisi"})
+ "tr": "NFS Servisi"
+ })
+MSG_ERR_STRTSRVC = {"en": "Unable to start service.",
+ "tr": "Servis başlatılamadı.",
+ }
+MSG_ERR_STOPSRVC = {"en": "Unable to stop service.",
+ "tr": "Servis durdurulamadı.",
+ }
+
def start():
startDependencies("portmap")
ret = run("/sbin/start-stop-daemon --start --quiet --exec
/usr/sbin/rpc.idmapd")
@@ -16,7 +24,7 @@
if ret == 0:
notify("System.Service", "Changed", (script(), "started"))
else:
- fail("Unable to start service")
+ fail(_(MSG_ERR_STRTSRVC))
def stop():
ret = run("/sbin/start-stop-daemon --stop --quiet --oknodo --exec
/usr/sbin/rpc.mountd")
@@ -28,7 +36,7 @@
if ret == 0:
notify("System.Service", "Changed", (script(), "stopped"))
else:
- fail("Unable to stop service")
+ fail(_(MSG_ERR_STOPSRVC))
def status():
return isServiceRunning("/var/run/rpc.statd.pid")
Index: 2009devel/multimedia/sound/timidity/comar/service.py
===================================================================
--- 2009devel/multimedia/sound/timidity/comar/service.py (revision 71688)
+++ 2009devel/multimedia/sound/timidity/comar/service.py (working copy)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
serviceType = "local"
serviceDesc = _({"en": "Timidity Virtual MIDI Sequencer for Alsa",
"tr": "Timidity Sanal MIDI Ardışımlayıcı"})
@@ -2,2 +3,6 @@
+MSG_ERR_TIMDPTCH = _({"en": "Failed to set patchset %s for Timidity.",
+ "tr": "Yama kümesi %s Timidity'ye atanamadı.",
+ })
+
from comar.service import *
@@ -23,7 +28,7 @@
if patchset != currentpatch:
if not os.path.exists("/usr/share/timidity/%s" % patchset)
and not os.path.exists(patchset):
- fail("Failed to set patchset %s for Timidity" % patchset)
+ fail(MSG_ERR_TIMDPTCH % patchset)
else:
if currentpatch:
os.unlink(currentlink)
Index: 2009devel/multimedia/sound/pulseaudio/comar/service.py
===================================================================
--- 2009devel/multimedia/sound/pulseaudio/comar/service.py (revision 71688)
+++ 2009devel/multimedia/sound/pulseaudio/comar/service.py (working copy)
@@ -7,6 +7,19 @@
serviceDefault = "off"
serviceConf = "pulseaudio"
+MSG_ERR_PLSEGRPNOTFOND = _({"en": "No pulse-access group found in
system, exiting.",
+ "tr": "Sistende pulse-access grubu
bulunamadı, çıkılıyor.",
+ })
+MSG_ERR_PLSENOTMEMB = _({"en": "The following users are not a member
of the pulse-access group: %s",
+ "tr": "Şu kullanıcılar pulse-access grubunun
üyesi değil: %s",
+ })
+MSG_ERR_PLSENOTSYSTMODE = _({"en": "Adjust the settings in
/etc/conf.d/pulseaudio for running PulseAudio in system mode.",
+ "tr": "PulseAudio'yu sistem kipinde
çalıştırmak için /etc/conf.d/pulseaudio dosyasında ayar
yapmalısınız.",
+ })
+MSG_ERR_PLSEINPERUSER = _({"en": "PulseAudio is running in per-user
mode, you can't stop it using 'service'.",
+ "tr": "PulseAudio kullanıcı kipinde
çalışıyor, 'service' komutuyla durduramazsınız.",
+ })
+
startup_type = config.get("PULSE_SERVER_TYPE")
def check_credentials():
@@ -41,23 +54,23 @@
try:
users = check_credentials()
except KeyError:
- fail("No pulse-access group found in system, exiting..")
+ fail(MSG_ERR_PLSEGRPNOTFOND)
if users:
- fail("The following users are not a member of the
pulse-access group: %s" % ",".join(users))
+ fail(MSG_ERR_PLSENOTMEMB % ",".join(users))
else:
startService(command="/usr/bin/pulseaudio",
args=config.get("PULSE_SYSTEM_ARGS", ""),
detach=True)
else:
- fail("Adjust the settings in /etc/conf.d/pulseaudio for
running PulseAudio in system mode.")
+ fail(MSG_ERR_PLSENOTSYSTMODE)
@synchronized
def stop():
if startup_type == "system":
pass
elif startup_type == "personal":
- fail("PulseAudio is running in per-user mode, you can't stop
it using 'service'.")
+ fail(MSG_ERR_PLSEINPERUSER)
def status():
return isServiceRunning(command="/usr/bin/pulseaudio")
Index: 2009devel/multimedia/stream/mediatomb/comar/service.py
===================================================================
--- 2009devel/multimedia/stream/mediatomb/comar/service.py (revision 71688)
+++ 2009devel/multimedia/stream/mediatomb/comar/service.py (working copy)
@@ -1,8 +1,9 @@
+# -*- coding: utf-8 -*-
from comar.service import *
serviceType="server"
-serviceDesc = _({"en": "Mediatomb UPnP Media Server",
- "tr": "Mediatomb UPnP Ortam Sunucusu"})
+serviceDesc = _({"en": "Mediatomb uPnP Media Server",
+ "tr": "Mediatomb Tak-kullan (uPnP) Ortam Sunucusu"})
@synchronized
def start():
Index: 2009devel/hardware/irda/irda-utils/comar/service.py
===================================================================
--- 2009devel/hardware/irda/irda-utils/comar/service.py (revision 71688)
+++ 2009devel/hardware/irda/irda-utils/comar/service.py (working copy)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
from comar.service import *
serviceType = "local"
@@ -5,10 +6,13 @@
"tr": "Kızılötesi Aygıt Yöneticisi"})
serviceConf = "irda"
+MSG_ERR_IRDACNFGNOTSET = {"en": "IRDA configuration is not set.",
+ "tr": "IRDA yapılandırılmamış.",
+ }
@synchronized
def start():
if config.get("IRDA", "") != "yes" or config.get("IRDADEV", "") == "":
- fail("IRDA configuration not set")
+ fail(_(MSG_ERR_IRDACNFGNOTSET))
else:
args = []
if "DONGLE" in config:
Index: 2009devel/hardware/cpu/microcode-ctl/comar/service.py
===================================================================
--- 2009devel/hardware/cpu/microcode-ctl/comar/service.py (revision 71688)
+++ 2009devel/hardware/cpu/microcode-ctl/comar/service.py (working copy)
@@ -3,8 +3,16 @@
serviceType = "local"
serviceDefault = "conditional"
serviceDesc = _({"en": "Intel IA32 CPU Microcode Updater",
- "tr": "Intel IA32 İşlemci Mikrokod Güncelleyicisi"})
+ "tr": "Intel IA32 İşlemci Mikrokod Güncelleyicisi"
+ })
+MSG_ERR_STRTSRVC = {"en": "Unable to start service.",
+ "tr": "Servis başlatılamadı.",
+ }
+MSG_ERR_STOPSRVC = {"en": "Unable to stop service.",
+ "tr": "Servis durdurulamadı.",
+ }
+
from comar.service import *
import time, os
@@ -26,7 +34,7 @@
if ret == 0:
notify("System.Service", "Changed", (script(), "started"))
else:
- fail("Unable to start service")
+ fail((MSG_ERR_STRTSRVC))
@synchronized
def stop():
@@ -36,7 +44,7 @@
if ret == 0:
notify("System.Service", "Changed", (script(), "stopped"))
else:
- fail("Unable to stop service")
+ fail(_(MSG_ERR_STOPSRVC))
def ready():
status = is_on()
@@ -45,4 +53,3 @@
def status():
return os.access(devicenode, os.F_OK)
-
Index: 2009devel/hardware/powermanagement/apmd/comar/service.py
===================================================================
--- 2009devel/hardware/powermanagement/apmd/comar/service.py (revision 71688)
+++ 2009devel/hardware/powermanagement/apmd/comar/service.py (working copy)
@@ -5,11 +5,15 @@
from comar.service import *
+MSG_ERR_APMNOTFOND = {"en": "APM not found.",
+ "tr": "APM bulunamadı.",
+ }
+
@synchronized
def start():
import os
if not os.path.exists("/proc/apm"):
- fail("APM not found")
+ fail(_(MSG_ERR_APMNOTFOND))
startService(command="/usr/sbin/apmd",
args=config.get("APMD_OPTS", ""),
Index: 2009devel/hardware/powermanagement/nut/comar/service.py
===================================================================
--- 2009devel/hardware/powermanagement/nut/comar/service.py (revision 71688)
+++ 2009devel/hardware/powermanagement/nut/comar/service.py (working copy)
@@ -7,6 +7,15 @@
serviceDesc = _({"en": "Network UPS Tools",
"tr": "Ağ Kesintisiz Güç Kaynağı Araçları"})
+MSG_ERR_STRTMODL = _({"en": "Could not start model %s.",
+ "tr": "Model %s başlatılamadı.",
+ })
+MSG_ERR_STRTUPSD = _({"en": "Could not start UPSD server.",
+ "tr": "UPSD sunucu başlatılamadı.",
+ })
+MSG_ERR_STOPUPSM = _({"en": "Could not stop upsmon.",
+ "tr": "Upsmon durdurulamadı.",
+ })
piddir = "/var/lib/nut"
model = config.get("MODEL", "upsdrvctl")
@@ -27,7 +36,7 @@
config.get("DEVICE", "")))
if error:
- fail("Could not start model %s" % model)
+ fail(MSG_ERR_STRTMODL % model)
else:
error = startService(command="/usr/sbin/upsd",
args=config.get("UPSD_OPTIONS", ""),
@@ -35,7 +44,7 @@
donotify=False)
if error:
- fail("Could not start UPSD server")
+ fail(MSG_ERR_STRTUPSD)
else:
startService(command="/usr/sbin/upsmon",
pidfile="%s/upsmon.pid" % piddir,
@@ -48,7 +57,7 @@
if server == "yes":
if error:
- fail("Could not stop upsmon")
+ fail(MSG_ERR_STOPUPSM)
else:
error = stopService(command="/usr/sbin/upsd",
pidfile="%s/upsd.pid" % piddir,
Index: 2009devel/hardware/misc/fnfx/comar/service.py
===================================================================
--- 2009devel/hardware/misc/fnfx/comar/service.py (revision 71688)
+++ 2009devel/hardware/misc/fnfx/comar/service.py (working copy)
@@ -5,11 +5,15 @@
serviceDesc = _({"en": "fnfx Daemon",
"tr": "fnfx Servisi"})
+MSG_ERR_LOADTOSHACPI = _({"en": "Couldn't load Toshiba ACPI module.",
+ "tr": "Toshiba ACPI modülü yüklenemedi.",
+ })
+
@synchronized
def start():
reply = run("/sbin/modprobe toshiba_acpi")
if reply != 0:
- fail("cannot load toshiba acpi module")
+ fail(MSG_ERR_LOADTOSHACPI)
startService(command="/usr/sbin/fnfxd",
pidfile="/var/run/fnfxd.pid",
Index: 2009devel/hardware/misc/setserial/comar/service.py
===================================================================
--- 2009devel/hardware/misc/setserial/comar/service.py (revision 71688)
+++ 2009devel/hardware/misc/setserial/comar/service.py (working copy)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
from comar.service import *
serviceType = "script"
@@ -4,6 +5,10 @@
serviceDesc = _({"en": "Serial Port Modifier",
"tr": "Seri Port Değiştirici"})
+MSG_ERR_STRTSRVC = {"en": "Couldn't start service.",
+ "tr": "Servis başlatılamadı.",
+ }
+
def start():
try:
f = file("/etc/serial.conf")
@@ -17,7 +22,7 @@
fail("Error setting %s" % k)
notify("System.Service", "Changed", (script(), "started"))
except:
- fail("Unable to start service")
+ fail(_(MSG_ERR_STRTSRVC))
def stop():
notify("System.Service", "Changed", (script(), "stopped"))
Index: 2009devel/hardware/info/hal/comar/service.py
===================================================================
--- 2009devel/hardware/info/hal/comar/service.py (revision 71688)
+++ 2009devel/hardware/info/hal/comar/service.py (working copy)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
from comar.service import *
import os
@@ -7,11 +8,15 @@
serviceDefault = "on"
serviceConf = "hal"
+MSG_ERR_DBUS = _({"en": "Couldn't start HAL, please ensure DBus is running.",
+ "tr": "HAL başlatılamadı, lütfen DBus'un çalışıp
çalışmadığını kontrol edin",
+ })
+
@synchronized
def start():
# Check DBus socket
if not os.path.exists("/var/run/dbus/system_bus_socket"):
- fail("Can't start HAL - please ensure dbus is running")
+ fail(MSG_ERR_DBUS)
# Ensure that acpid is launched before HAL for avoiding /proc/acpi/event
# race conditions.
Index: 2009devel/server/ptsp/ptsp-client/comar/service.py
===================================================================
--- 2009devel/server/ptsp/ptsp-client/comar/service.py (revision 71688)
+++ 2009devel/server/ptsp/ptsp-client/comar/service.py (working copy)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
from comar.service import *
import os
import ConfigParser
@@ -7,6 +8,16 @@
serviceDefault = "on"
configFile = "/etc/pts-client.conf"
+MSG_ERR_FILENOTEXIST = _({"en": "File %s does not exist.",
+ "tr": "%s dosyası mevcut değil.",
+ })
+MSG_ERR_PLAUNOTSTRT = _({"en": "PulseAudio is not starting.",
+ "tr": "PulseAudio başlamıyor.",
+ })
+MSG_ERR_NOTTHIN = _({"en": "Not thin setup.",
+ "tr": "İnce kurulum değil.",
+ })
+
def configure():
if run("/usr/bin/zorg --probe") != 0:
fail("Not starting as zorg returned an error")
@@ -16,7 +27,7 @@
def get_xserver():
if not os.path.exists(configFile):
- fail("%s file does not exist" % configFile)
+ fail(MSG_ERR_FILENOTEXIST % configFile)
cp = ConfigParser.ConfigParser()
cp.read(configFile)
@@ -28,11 +39,11 @@
def start_pulse():
if run("/usr/bin/pulseaudio --system -D") != 0:
- fail("not starting pulseaudio")
+ fail(MSG_ERR_PLAUNOTSTRT)
def start():
if not has_thin():
- fail("Not thin setup.")
+ fail(MSG_ERR_NOTTHIN)
startDependencies("acpid")
configure()
@@ -47,7 +58,7 @@
def stop():
if not has_thin():
- fail("Not thin setup.")
+ fail(MSG_ERR_NOTTHIN)
if 0 == run("/usr/bin/killall X"):
notify("System.Service.changed", "stopped")
Index: 2009devel/server/database/postgresql/comar/service.py
===================================================================
--- 2009devel/server/database/postgresql/comar/service.py (revision 71688)
+++ 2009devel/server/database/postgresql/comar/service.py (working copy)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
serviceType="server"
serviceDesc = _({"en": "PostgreSQL Database Server",
"tr": "PostgreSQL Veritabanı Sunucusu"})
@@ -3,10 +4,14 @@
serviceConf = "postgresql"
+MSG_ERR_PGSQLNOTINST = _({"en": "PostgreSQL is not installed.",
+ "tr": "PostgreSQL kurulu değil.",
+ })
+
from comar.service import *
def check_postgresql():
import os
if not os.path.exists(config.get("PGDATA", "/var/lib/postgresql/data")):
- fail("PostgreSQL is not installed")
+ fail(MSG_ERR_PGSQLNOTINST)
pidfile = "%s/postmaster.pid" % config.get("PGDATA",
"/var/lib/postgresql/data")
Index: 2009devel/server/database/mysql/comar/service.py
===================================================================
--- 2009devel/server/database/mysql/comar/service.py (revision 71688)
+++ 2009devel/server/database/mysql/comar/service.py (working copy)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
from comar.service import *
serviceType="server"
@@ -4,10 +5,13 @@
serviceDesc = _({"en": "MySQL Database Server",
"tr": "MySQL Veritabanı Sunucusu"})
+MSG_ERR_MYSQLNOTINST = _({"en": "MySQL is not installed.",
+ "tr": "MySQL kurulu değil.",
+ })
def check_mysql():
import os.path
if not os.path.exists("/var/lib/mysql"):
- fail("MySQL is not installed")
+ fail(MSG_ERR_MYSQLNOTINST)
@synchronized
def start():
Index: 2009devel/server/zemberek-server/comar/service.py
===================================================================
--- 2009devel/server/zemberek-server/comar/service.py (revision 71688)
+++ 2009devel/server/zemberek-server/comar/service.py (working copy)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
from comar.service import *
import os
@@ -3,13 +4,16 @@
serviceType = "local"
serviceDesc = _({"en": "Zemberek Spell Checker",
- "tr": "Zemberek Yazım Denetimi"})
+ "tr": "Zemberek Yazım Denetleyicisi"})
serviceDefault = "conditional"
+MSG_ERR_JAVAHOMENOTSET = _({"en": "JAVA_HOME is not set.",
+ "tr": "JAVA_HOME atanmamış.",
+ })
@synchronized
def start():
loadEnvironment()
if not os.environ.has_key("JAVA_HOME"):
- fail("JAVA_HOME is not set")
+ fail(MSG_ERR_JAVAHOMENOTSET)
javapath = os.environ["JAVA_HOME"]
Index: 2009devel/desktop/kde3/base/kdebase3/comar/service.py
===================================================================
--- 2009devel/desktop/kde3/base/kdebase3/comar/service.py (revision 71688)
+++ 2009devel/desktop/kde3/base/kdebase3/comar/service.py (working copy)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
from comar.service import *
import os
@@ -2,8 +3,11 @@
serviceType = "local"
-serviceDesc = _({
- "en": "KDE Desktop Environment",
- "tr": "KDE Masaüstü Ortamı",
-})
+serviceDesc = _({"en": "KDE Desktop Environment",
+ "tr": "KDE Masaüstü Ortamı",
+ })
serviceDefault = "on"
+MSG_ERR_ZORGRTRN = _({"en": "Not starting as zorg returned an error.",
+ "tr": "Zorg hata döndürdüğü için başlatılmıyor.",
+ })
+
def setLang():
@@ -25,7 +29,7 @@
return
if call("zorg", "Xorg.Display", "ready", (boot,), 5 * 60) == 0:
- fail("Not starting as zorg returned an error")
+ fail(MSG_ERR_ZORGRTRN)
startDependencies("acpid", "hal")
loadEnvironment()
Index: 2009devel/util/admin/dazuko/comar/service.py
===================================================================
--- 2009devel/util/admin/dazuko/comar/service.py (revision 71688)
+++ 2009devel/util/admin/dazuko/comar/service.py (working copy)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
from comar.service import *
import os
@@ -5,17 +6,27 @@
serviceDesc = _({"en": "Dazuko kernel module",
"tr": "Dazuko çekirdek modülü"})
+MSG_ERR_LOADDAZU = _({"en": "Couldn't load Dazuko module.",
+ "tr": "Dazuko modülü yüklenemedi.",
+ })
+MSG_ERR_LOADCAPA = _({"en": "Couldn't load Capability module.",
+ "tr": "Capability modülü yüklenemedi.",
+ })
+MSG_ERR_REMODAZU = _({"en": "Couldn't remove Dazuko module.",
+ "tr": "Dazuko modülü kaldırılamadı.",
+ })
+
dazuko_dev = '/dev/dazuko'
def start():
if run("/sbin/modprobe dazuko") != 0:
- fail("cannot load dazuko module")
+ fail(MSG_ERR_LOADDAZU)
if run("/sbin/modprobe capability") != 0:
- fail("cannot load capability module")
+ fail(MSG_ERR_LOADCAPA)
def stop():
if run("/sbin/modprobe -r dazuko") != 0:
- fail("cannot remove dazuko module")
+ fail(MSG_ERR_REMODAZU)
def status():
return os.access(dazuko_dev, os.F_OK)
Index: 2009devel/util/admin/sysstat/comar/service.py
===================================================================
--- 2009devel/util/admin/sysstat/comar/service.py (revision 71688)
+++ 2009devel/util/admin/sysstat/comar/service.py (working copy)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
from comar.service import *
import os
@@ -5,6 +6,10 @@
serviceDesc = _({"en": "System activity data collector",
"tr": "Sistem etkinliği veri toplayıcısı"})
+MSG_ERR_FAILSYST = _({"en": "Sysstat failed.",
+ "tr": "Sysstat başarısız oldu.",
+ })
+
cron_file = '/etc/cron.d/sysstat'
def check_log():
@@ -19,14 +24,14 @@
run("ln -sf /etc/sysstat/sysstat.cron /etc/cron.d/sysstat")
notify("System.Service.changed", "started")
else:
- fail("sysstat failed!")
+ fail(MSG_ERR_FAILSYST)
@synchronized
def stop():
if run("rm -f /etc/cron.d/sysstat") == 0:
notify("System.Service.changed", "stopped")
else:
- fail("sysstat failed!")
+ fail(MSG_ERR_FAILSYST)
@synchronized
def status():
Gelistirici mesaj listesiyle ilgili
daha fazla bilgi