web/modules
by Jan Pazdziora
web/modules/rhn/RHN/Utils.pm | 30 ------------------------------
1 file changed, 30 deletions(-)
New commits:
commit 3bfb8cdf62733e428110fd6c6aa5aa6e9a8c0784
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Feb 7 10:46:55 2011 +0100
The RHN::Utils::parametrize is not used anywhere, removing.
diff --git a/web/modules/rhn/RHN/Utils.pm b/web/modules/rhn/RHN/Utils.pm
index cacd501..6e8d6a6 100644
--- a/web/modules/rhn/RHN/Utils.pm
+++ b/web/modules/rhn/RHN/Utils.pm
@@ -27,36 +27,6 @@ use Socket;
# similar to PXT::Utils, but for RHN specific stuff...
-#takes an ref to an array of arrayrefs, and a list of parameters -
-#traverses the array, and assigns elements of each array to named
-#parameters in a hashref... - example -
-
-# my @channels = ( [1, 'Red Hat Linux 7.0'], [2, 'Red Hat Linux 7.1'], [3, 'Red Hat Linux 7.3'] );
-# my @p_channels = parameterize(\@channels, 'id', 'name');
-
-# foreach my $chan (@p_channels) {
-# $html =~ s/\{channel_name\}/$chan->{name}/ge;
-# $html =~ s/\{channel_id\}/$chan->{id}/ge;
-# }
-
-sub parameterize {
- my $class = shift;
- my $data = shift;
- my @params = @_;
-
- my @return;
-
- foreach my $datum (@{$data}) {
-
- my $x = { };
- @{$x}{@params} = @{$datum}[0 .. $#params]; #slice. allows $x->{name}, etc
-
- push @return, $x;
- }
-
- return @return;
-}
-
sub sets_differ {
my ($first, $second) = @_;
13 years, 4 months
backend/server
by Michael Mraka
backend/server/configFilesHandler.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 71504cda14cd9d6c9f81434dbed7871d3842dad2
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Feb 7 10:10:11 2011 +0100
675359 - modified attribute is not always present
diff --git a/backend/server/configFilesHandler.py b/backend/server/configFilesHandler.py
index 3781bb7..557556c 100644
--- a/backend/server/configFilesHandler.py
+++ b/backend/server/configFilesHandler.py
@@ -532,7 +532,7 @@ def format_file_results(row, server=None):
if client_caps and client_caps.has_key('configfiles.base64_enc'):
encoding = 'base64'
contents = base64.encodestring(contents)
- if row['modified']:
+ if row.has_key('modified') and row['modified']:
m_date = xmlrpclib.DateTime(str(row['modified']))
else:
m_date = ''
13 years, 4 months
spacewalk/admin
by Jan Pazdziora
spacewalk/admin/spacewalk-admin.spec | 1 +
spacewalk/admin/spacewalk-service | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit b1927976d4c9e5e2c3381a87c317cedfab6b377f
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Feb 7 09:17:17 2011 +0100
Explicitly require lsof in spacewalk-admin (for spacewalk-service).
diff --git a/spacewalk/admin/spacewalk-admin.spec b/spacewalk/admin/spacewalk-admin.spec
index def09bf..61c9832 100644
--- a/spacewalk/admin/spacewalk-admin.spec
+++ b/spacewalk/admin/spacewalk-admin.spec
@@ -12,6 +12,7 @@ Requires: spacewalk-base
Requires: perl-URI, perl(MIME::Base64)
Requires: sudo
Requires: /sbin/restorecon
+Requires: /usr/sbin/lsof
Obsoletes: satellite-utils < 5.3.0
Provides: satellite-utils = 5.3.0
Obsoletes: rhn-satellite-admin < 5.3.0
diff --git a/spacewalk/admin/spacewalk-service b/spacewalk/admin/spacewalk-service
index 6af0b38..f5e823c 100755
--- a/spacewalk/admin/spacewalk-service
+++ b/spacewalk/admin/spacewalk-service
@@ -49,10 +49,10 @@ forward_services() {
if [ "$service" == "$TOMCAT" \
-a "$ACTION" == "start" \
-a "$WAIT_FOR_TOMCAT" == "1" ] ; then
- if lsof /proc > /dev/null ; then
+ if /usr/sbin/lsof /proc > /dev/null ; then
echo "Waiting for tomcat to be ready ..."
while [ -f "/var/run/$TOMCAT.pid" ] ; do
- lsof -t -i @localhost:8009 -p $(cat /var/run/$TOMCAT.pid) > /dev/null && break
+ /usr/sbin/lsof -t -i @localhost:8009 -p $(cat /var/run/$TOMCAT.pid) > /dev/null && break
sleep 1
done
else
13 years, 4 months
client/rhel
by Transifex System User
client/rhel/rhn-client-tools/po/de.po | 119 ++++++++++++++--------------------
1 file changed, 50 insertions(+), 69 deletions(-)
New commits:
commit 1b30d9b460128821e8141343f789c8ebe32141e4
Author: delouw <delouw(a)fedoraproject.org>
Date: Sat Feb 5 14:56:58 2011 +0000
l10n: Updates to German (de) translation
Transmitted-via: Transifex (translate.fedoraproject.org)
diff --git a/client/rhel/rhn-client-tools/po/de.po b/client/rhel/rhn-client-tools/po/de.po
index d685e43..563ce73 100644
--- a/client/rhel/rhn-client-tools/po/de.po
+++ b/client/rhel/rhn-client-tools/po/de.po
@@ -5,18 +5,20 @@
# Bernd Groh <bgroh(a)redhat.com>, 2003.
# Verena <vfuehrer(a)redhat.com>, 2004, 2005.
# sknirT omiT <moc.tahder@sknirtt>, 2010.
+# Luc de Louw <luc(a)delouw.ch>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: spacewalk.rhn-client-tools\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-01-20 05:57-0500\n"
-"PO-Revision-Date: 2010-08-31 09:51+1000\n"
-"Last-Translator: T²\n"
-"Language-Team: <de(a)li.org>\n"
+"PO-Revision-Date: 2011-02-05 15:39+0100\n"
+"Last-Translator: Luc de Louw <luc(a)delouw.ch>\n"
+"Language-Team: German <trans-de(a)lists.fedoraproject.org"
+">\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 1.1\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: ../src/up2date_client/capabilities.py:88
@@ -95,7 +97,7 @@ msgstr "SystemId kann nicht lokalisiert werden"
#: ../src/up2date_client/rhnChannel.py:114
msgid "This system may not be updated until it is associated with a channel."
msgstr ""
-"Das System kann nicht aktualisiert werden, wenn es keinem Kanal zugeordnet "
+"Das System kann nicht aktualisiert werden, wenn es keinem Channel zugeordnet "
"ist."
#: ../src/up2date_client/rhncli.py:47
@@ -159,7 +161,7 @@ msgid ""
"the time on this system is correct.\n"
msgstr ""
"Eine häufige Ursache dieses Fehlers ist es, dass die Systemzeit falsch "
-"eingestellt ist. Überprüfen Sie, dass die Zeit auf diesem System richtig "
+"eingestellt ist. Überprüfen Sie dass die Zeit auf diesem System richtig "
"ist.\n"
#: ../src/up2date_client/rhncli.py:98
@@ -208,12 +210,12 @@ msgstr "Copyright © 2006--2010 Red Hat, Inc. All rights reserved."
#. Connect Window
#: ../src/up2date_client/rhnreg_constants.py:16
msgid "Attempting to contact the Red Hat Network server."
-msgstr "Versuche, den Red Hat Network Server zu kontaktieren."
+msgstr "Versuche den Red Hat Network Server zu kontaktieren."
#: ../src/up2date_client/rhnreg_constants.py:17
#, python-format
msgid "We are attempting to contact the Red Hat Network server at %s."
-msgstr "Versuche, den Red Hat Network Server unter %s zu kontaktieren."
+msgstr "Versuche den Red Hat Network Server unter %s zu kontaktieren."
#: ../src/up2date_client/rhnreg_constants.py:19
#, python-format
@@ -267,11 +269,11 @@ msgstr ""
#: ../src/up2date_client/rhnreg_constants.py:40
msgid "Security & Updates:"
-msgstr "Sicherheit & Updates:"
+msgstr "Sicherheit und Updates:"
#: ../src/up2date_client/rhnreg_constants.py:41
msgid "Downloads & Upgrades:"
-msgstr "Downloads & Upgrades:"
+msgstr "Downloads und Upgrades:"
#: ../src/up2date_client/rhnreg_constants.py:42
msgid "Support:"
@@ -648,7 +650,7 @@ msgid ""
"there were insufficient subscriptions available in your account:"
msgstr ""
"Folgende Software-Kanäle konnten nicht abonniert werden, da zu wenig "
-"Abonnements für Ihren Account zur Verfügung standen:"
+"Abonnements für Ihren Account zur Verfügung stehen:"
#: ../src/up2date_client/rhnreg_constants.py:183
msgid ""
@@ -811,7 +813,7 @@ msgstr ""
"Universeller Standard-Aktivierungsschlüssel gefunden\n"
"Ein universeller Standard-Aktivierungsschlüssel wurde in Ihrer RHN-"
"Organisation gefunden. Dies bedeutet, dass eine Reihe von Einstellungen "
-"(Software-Kanal-Abonnements, Red Hat Network Dienst, Paketinstallationen, "
+"(Software-Channel-Abonnements, Red Hat Network Dienst, Paketinstallationen, "
"Systemgruppen-Mitgliedschaften, etc.) für die Verbindung Ihres Systems mit "
"Red Hat Network anhand des Aktivierungsschlüssels und nicht der "
"Installationsnummer bestimmt wurde. Siehe auch RHN Referenzhandbuch, "
@@ -1391,11 +1393,10 @@ msgid "You specified an invalid protocol."
msgstr "Sie haben ein ungültiges Protokoll angegeben."
#: ../src/up2date_client/tui.py:1058
-#, fuzzy
msgid "Only https and http are allowed."
msgstr ""
-"Sie haben ein ungültiges Protokoll angegeben. Lediglich https und http sind "
-"erlaubt."
+"Sie haben ein ungültiges Protokoll angegeben. Es sind lediglich https und "
+"http erlaubt."
#: ../src/up2date_client/tui.py:1096
msgid ""
@@ -1671,92 +1672,84 @@ msgstr ""
"die entsprechenden Angaben."
#: ../src/bin/spacewalk-channel.py:42
-#, fuzzy
msgid "ERROR: must be root to execute\n"
-msgstr "Sie müssen Root sein, um %s auszuführen"
+msgstr "FEHLER: Sie müssen Root sein um auszuführen\n"
#: ../src/bin/spacewalk-channel.py:56
msgid "name of channel you want to (un)subscribe"
-msgstr ""
+msgstr "Name des Channels den Sie abonnieren oder entfernen wollen"
#: ../src/bin/spacewalk-channel.py:58
msgid "subscribe to channel"
-msgstr ""
+msgstr "Channel abonnieren"
#: ../src/bin/spacewalk-channel.py:60
msgid "unsubscribe from channel"
-msgstr ""
+msgstr "Channel entfernen"
#: ../src/bin/spacewalk-channel.py:62
msgid "list channels"
-msgstr ""
+msgstr "Channels anzeigen"
#: ../src/bin/spacewalk-channel.py:64
-#, fuzzy
msgid "list all available child channels"
-msgstr "Alle verfügbaren Updates"
+msgstr "Alle verfügbaren Sub-Channels anzeigen"
#: ../src/bin/spacewalk-channel.py:66
msgid "verbose output"
msgstr ""
#: ../src/bin/spacewalk-channel.py:68
-#, fuzzy
msgid "your user name"
-msgstr "Einen Benutzernamen angeben"
+msgstr "Ihr Benutzernamen"
#: ../src/bin/spacewalk-channel.py:70
-#, fuzzy
msgid "your password"
-msgstr "Geben Sie ein Passwort an"
+msgstr "Ihr Passwort"
#: ../src/bin/spacewalk-channel.py:78
msgid "ERROR: these arguments make no sense in this context (try --help)"
msgstr ""
#: ../src/bin/spacewalk-channel.py:80
-#, fuzzy
msgid "Username: "
-msgstr "Rechnername: "
+msgstr "Benutzername: "
#: ../src/bin/spacewalk-channel.py:104
msgid "ERROR: you have to specify at least one channel"
-msgstr ""
+msgstr "FEHLER: Sie müssen mindestens einen Channel angeben"
#: ../src/bin/spacewalk-channel.py:112
#, python-format
msgid "Channel(s): %s successfully added"
-msgstr ""
+msgstr "Channel(s): %s Erfolgreich hinzugefügt"
#: ../src/bin/spacewalk-channel.py:114
#, python-format
msgid "Error during adding channel(s) %s"
-msgstr ""
+msgstr "Fehler beim Hinzufügen des/der Channel(s) %s"
#: ../src/bin/spacewalk-channel.py:122
#, python-format
msgid "Channel(s): %s successfully removed"
-msgstr ""
+msgstr "Channel(s): %s erfolgreich entfernt"
#: ../src/bin/spacewalk-channel.py:124
#, python-format
msgid "Error during removal of channel(s) %s"
-msgstr ""
+msgstr "Fehler beim Entfernen des/der Channel(s) %s"
#: ../src/bin/spacewalk-channel.py:131
-#, fuzzy
msgid "This system is not associated with any channel."
-msgstr ""
-"Das System kann nicht aktualisiert werden, wenn es keinem Kanal zugeordnet "
-"ist."
+msgstr "Dieses System ist keinem Channel zugeordnet."
#: ../src/bin/spacewalk-channel.py:139
msgid "ERROR: you may want to specify --add, --remove or --list"
-msgstr ""
+msgstr "FEHLER: Sie müssen --add, --remove oder --list angeben"
#: ../src/bin/spacewalk-channel.py:145
msgid "User interrupted process."
-msgstr ""
+msgstr "Vorgang durch Benutzer abgebrochen."
#: ../data/gui.glade.h:1
msgid "Choose an update location"
@@ -1787,13 +1780,12 @@ msgid "Progress Dialog"
msgstr "Fortschritts-Dialog"
#: ../data/progress.glade.h:2
-#, fuzzy
msgid "progress bar"
-msgstr "Fortschritts-Dialog"
+msgstr "Fortschrittsanzeige"
#: ../data/progress.glade.h:3
msgid "progress status"
-msgstr ""
+msgstr "Fortschritts-Status"
#: ../data/rh_register.glade.h:1
msgid ""
@@ -1982,9 +1974,8 @@ msgid "Advanced Network Configuration"
msgstr "Erweiterte Netzwerkkonfiguration"
#: ../data/rh_register.glade.h:36
-#, fuzzy
msgid "Advanced Network Configuration button"
-msgstr "Erweiterte Netzwerkkonfiguration"
+msgstr "Knopf für Erweiterte Netzwerkkonfiguration"
#: ../data/rh_register.glade.h:37
msgid "Advanced _Network Configuration ..."
@@ -2020,14 +2011,12 @@ msgid "Choose Channel"
msgstr "Channel auswählen"
#: ../data/rh_register.glade.h:47
-#, fuzzy
msgid "Choose minor release"
-msgstr "_Zwischen-Release:"
+msgstr "Wählen Sie ein Minor-Release"
#: ../data/rh_register.glade.h:48
-#, fuzzy
msgid "Close"
-msgstr "S_chliessen"
+msgstr "Schliessen"
#: ../data/rh_register.glade.h:49
msgid "Confirm operation system release selection"
@@ -2107,9 +2096,8 @@ msgid "Installation _Number:"
msgstr "Installations_nummer:"
#: ../data/rh_register.glade.h:67
-#, fuzzy
msgid "Limited updates"
-msgstr "Nur eingeschränkte Updates"
+msgstr "Eingeschränkte Updates"
#: ../data/rh_register.glade.h:68
msgid "Link To Subscription"
@@ -2129,9 +2117,8 @@ msgid "Memory:"
msgstr "Speicher:"
#: ../data/rh_register.glade.h:71
-#, fuzzy
msgid "No thanks, I'll connect later."
-msgstr "_Nein danke. Später registrieren."
+msgstr "Nein danke. Später registrieren."
#: ../data/rh_register.glade.h:73
msgid "Package Information"
@@ -2171,11 +2158,11 @@ msgstr ""
#: ../data/rh_register.glade.h:81
msgid "RHN login field"
-msgstr ""
+msgstr "RHN Loginfeld"
#: ../data/rh_register.glade.h:82
msgid "RHN password field"
-msgstr ""
+msgstr "RHN Passwortfeld"
#: ../data/rh_register.glade.h:83
msgid ""
@@ -2234,9 +2221,8 @@ msgid "System _Name:"
msgstr "System_name:"
#: ../data/rh_register.glade.h:97
-#, fuzzy
msgid "Take me back to the registration"
-msgstr "Zurück zur Regis_trierung"
+msgstr "Zurück zur Registrierung"
#: ../data/rh_register.glade.h:99
msgid ""
@@ -2276,23 +2262,20 @@ msgid "Use Au_thentication with HTTP Proxy:"
msgstr "Benutze Au_thentifizierung mit HTTP-Proxy:"
#: ../data/rh_register.glade.h:107
-#, fuzzy
msgid "Use Authentication with HTTP Proxy"
-msgstr "Benutze Au_thentifizierung mit HTTP-Proxy:"
+msgstr "Benutze Authentifizierung mit HTTP-Proxy:"
#: ../data/rh_register.glade.h:108
msgid "V_iew Package Profile ..."
msgstr "Paket-Prof_il betrachten ..."
#: ../data/rh_register.glade.h:109
-#, fuzzy
msgid "View Hardware Profile"
-msgstr "Hardware-Profil _betrachten ..."
+msgstr "Hardware-Profil ansehen"
#: ../data/rh_register.glade.h:110
-#, fuzzy
msgid "View Package Profile"
-msgstr "Paket-Prof_il betrachten ..."
+msgstr "Paket-Profil ansehen"
#: ../data/rh_register.glade.h:111
msgid "Why Register"
@@ -2487,9 +2470,8 @@ msgid "icon of aplet"
msgstr ""
#: ../data/rh_register.glade.h:149
-#, fuzzy
msgid "installation number field"
-msgstr "Die Installationsnummer ist ungültig"
+msgstr "Installationsnummer-Feld"
#: ../data/rh_register.glade.h:150
msgid "label"
@@ -2498,12 +2480,12 @@ msgstr "Kennung"
#: ../data/rh_register.glade.h:151
#, fuzzy
msgid "proxy location"
-msgstr "_Proxy Ort:"
+msgstr "Proxy Ort:"
#: ../data/rh_register.glade.h:152
#, fuzzy
msgid "proxy password field"
-msgstr "Proxy-P_asswort:"
+msgstr "Proxy-Passwort"
#: ../data/rh_register.glade.h:153
msgid "proxy user field"
@@ -2514,9 +2496,8 @@ msgid "satellite server location"
msgstr ""
#: ../data/rh_register.glade.h:155
-#, fuzzy
msgid "system name"
-msgstr "System_name:"
+msgstr "Systemname"
#: ../data/rh_register.glade.h:156
msgid "•"
13 years, 4 months
backend/po
by Transifex System User
backend/po/de.po | 102 +++++++++++++++++++++++++++++++++++++------------------
1 file changed, 69 insertions(+), 33 deletions(-)
New commits:
commit 3fc76d71a489cbab8ed3f0a15deae715d9cb0655
Author: delouw <delouw(a)fedoraproject.org>
Date: Sat Feb 5 14:04:45 2011 +0000
l10n: Updates to German (de) translation
Transmitted-via: Transifex (translate.fedoraproject.org)
diff --git a/backend/po/de.po b/backend/po/de.po
index c6c02a3..005cba6 100644
--- a/backend/po/de.po
+++ b/backend/po/de.po
@@ -4,13 +4,13 @@
# german translation of spacewalk-server
#
# Gerd Koenig <gkoenig(a)fedoraproject.org>, 2010.
-# Luc de Louw <luc(a)delouw.ch>, 2010.
+# Luc de Louw <luc(a)delouw.ch>, 2010, 2011.
msgid ""
msgstr ""
"Project-Id-Version: spacewalk.spacewalk-server.de\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-11-02 11:19+0100\n"
-"PO-Revision-Date: 2010-11-15 23:36+0100\n"
+"PO-Revision-Date: 2011-02-05 14:47+0100\n"
"Last-Translator: Luc de Louw <luc(a)delouw.ch>\n"
"Language-Team: German <trans-de(a)lists.fedoraproject.org\" \">\n"
"MIME-Version: 1.0\n"
@@ -97,6 +97,9 @@ msgid ""
" %s Account has been deactivated on this server.\n"
" Please contact your Org administrator for more help."
msgstr ""
+"\n"
+" %s Benutzer wurde auf diesem Server deaktiviert.\n"
+" Bitte kontaktieren Sie Ihren Org-Administrator für Hilfe."
#: ../server/handlers/xmlrpc/registration.py:875
msgid "Invalid system release version requested"
@@ -123,7 +126,7 @@ msgstr "Kein gültiges Land: %s"
#: ../server/handlers/xmlrpc/registration.py:1407
#, python-format
msgid "Insufficient subscription permissions for release, arch (%s, %s)"
-msgstr ""
+msgstr "Ungenügende Berechtigung für Release, Arch (%s, %s)"
#: ../server/handlers/xmlrpc/registration.py:1424
#, python-format
@@ -161,7 +164,7 @@ msgstr ""
#: ../server/rhnChannel.py:1801
#, python-format
msgid "Insufficient subscription permissions for release (%s, %s"
-msgstr ""
+msgstr "Ungenügende Berechtigung für Release (%s, %s"
#. Various messages that can be reused
#.
@@ -189,7 +192,7 @@ msgstr ""
"Ungültige Kombination aus Architektur und Betriebssystemversion (%s, %s).\n"
"Ihr System wurde registriert, wird aber keine Updates erhalten, da es "
"keinen\n"
-"Kanal abonniert hat. Falls Sie Ihr System bislang nicht aktiviert haben,\n"
+"Channel abonniert hat. Falls Sie Ihr System bislang nicht aktiviert haben,\n"
"besuchen Sie bitte unsere Webseite unter:\n"
" \n"
" http://www.redhat.com/apps/activate/\n"
@@ -207,10 +210,9 @@ msgid ""
msgstr ""
"\n"
"Ungültige Kombination aus Architektur und Betriebssystemversion (%s, %s).\n"
-"Ihr System wurde registriert wird aber keine Updates erhalten, da es keinen\n"
-"Basiskanal abonnieren konnte.\n"
-"Bitte kontaktieren Sie zwecks Unterstützung den Administrator\n"
-"Ihres Unternehmens.\n"
+"Ihr System wurde registriert, wird aber keine Updates erhalten da es keinen\n"
+"Basis-Channel abonnieren konnte.\n"
+"Bitte kontaktieren Sie zwecks Unterstützung den Org-Administrator.\n"
#: ../server/rhnChannel.py:2092
#, python-format
@@ -278,11 +280,11 @@ msgstr "abgewiesene Proxyauthentisierung"
#: ../server/rhnServer/server_token.py:78
#, python-format
msgid "Token `%s' has more than one base channel assigned"
-msgstr "Kennung '%s' hat mehr als einen zugewiesenen Kanal"
+msgstr "Kennung '%s' hat mehr als einen zugewiesenen Channel"
#: ../server/rhnServer/server_token.py:80
msgid "Conflicting base channels"
-msgstr "Konflikt zwischen Basiskanälen"
+msgstr "Konflikt zwischen Basis-Channels"
#: ../server/rhnServer/server_token.py:204
#, python-format
@@ -345,7 +347,7 @@ msgstr "Paket nicht gefunden"
#: ../server/apacheRequest.py:46
#, python-format
msgid "Invalid request received (%s)."
-msgstr "ungültige Anfrage erhalten (%s)."
+msgstr "Ungültige Anfrage erhalten (%s)."
#: ../server/apacheRequest.py:104
#, python-format
@@ -366,7 +368,7 @@ msgstr ""
#: ../server/apacheRequest.py:555
#, python-format
msgid "Invalid URI %s"
-msgstr "ungültige URI %s"
+msgstr "Ungültige URI %s"
#: ../server/rhnHandler.py:58
msgid ""
@@ -385,7 +387,7 @@ msgstr "Der Dienst ist für das Systemprofil: \"%s\" nicht aktiviert"
#: ../server/rhnUser.py:381 ../server/rhnUser.py:384
msgid "Invalid username/password combination"
-msgstr "ungültige Benutzername/Passwort Kombination"
+msgstr "Ungültige Kombination von Benutzername und Passwort"
#. nope, not reserved either
#: ../server/rhnUser.py:536
@@ -465,7 +467,7 @@ msgstr "Dies scheint kein gültiger Benutzername zu sein."
#: ../common/rhnException.py:46
msgid "Invalid username and password combination."
-msgstr "Ungültige Benutzername-/Passwort-Kombination."
+msgstr "Ungültige Kombination von Benutzername und Passwort"
#: ../common/rhnException.py:47
msgid "This login is already taken, or the password is incorrect."
@@ -497,7 +499,7 @@ msgstr "Ungültige System-Berechtigungsnachweise."
#: ../common/rhnException.py:54
msgid "Could not retrieve user data from database."
-msgstr "Konnte Benutzerdaten nicht von Datenbank abrufen."
+msgstr "Benutzerdaten konnten nicht von Datenbank abrufen werden."
#: ../common/rhnException.py:55
msgid "Valid username required."
@@ -509,11 +511,11 @@ msgstr "Gültiges Passwort erforderlich."
#: ../common/rhnException.py:57
msgid "Minimum username length violation."
-msgstr "Minimale Länge des Benutzernamen nicht erfüllt."
+msgstr "Minimallänge des Benutzernamen nicht erfüllt."
#: ../common/rhnException.py:58
msgid "Minimum password length violation."
-msgstr "Minimale Länge des Passworts nicht erfüllt."
+msgstr "Minimallänge des Passworts nicht erfüllt."
#: ../common/rhnException.py:59
msgid "The username contains invalid characters."
@@ -538,7 +540,7 @@ msgstr ""
#: ../common/rhnException.py:64
msgid "Could not retrieve system data from database."
-msgstr "Systemdaten konnten in dern Datenbank nicht gefunden werden."
+msgstr "Systemdaten konnten in der Datenbank nicht gefunden werden."
#: ../common/rhnException.py:65
msgid "Invalid arguments passed to function."
@@ -546,7 +548,7 @@ msgstr ""
#: ../common/rhnException.py:66
msgid "Unable to retrieve requested entry."
-msgstr ""
+msgstr "Eintrag konnte nicht abgerufen werden."
#: ../common/rhnException.py:67
msgid "Could not update database entry."
@@ -625,11 +627,11 @@ msgstr "Ungültige Aktion"
#: ../common/rhnException.py:95
msgid "You are not allowed to perform administrative tasks on this system."
-msgstr "Sie sind für diese Administative Tätigkeit nicht freigegeben."
+msgstr "Sie sind für Administative Tätigkeiten nicht freigegeben."
#: ../common/rhnException.py:97
msgid "The system is already subscribed to the specified channel."
-msgstr "Dieses System ist bereits in diesem Channel registriert."
+msgstr "Dieses System ist bereits bei diesem Channel registriert."
#: ../common/rhnException.py:98
msgid "The system is not currently subscribed to the specified channel."
@@ -683,6 +685,12 @@ msgid ""
" The architecture of the package is not supported by Red Hat Network\n"
" "
msgstr ""
+"\n"
+" Ungültige Architektur.\n"
+"\n"
+" Die Architektur dieses Paketes ist vom Red Hat Network nicht "
+"unterstützt\n"
+" "
#: ../common/rhnException.py:123
msgid ""
@@ -693,6 +701,12 @@ msgid ""
" compatible with the channel architecture.\n"
" "
msgstr ""
+"\n"
+" Inkompatible Architekturen.\n"
+"\n"
+" Die Architektur des Paketes welches Sie hochladen wollten ist nicht\n"
+" kompatibel mit der Architektur des Channels.\n"
+" "
#: ../common/rhnException.py:129
msgid "Invalid RPM header"
@@ -706,6 +720,11 @@ msgid ""
" The channel you have specified does not exist.\n"
" "
msgstr ""
+"\n"
+" Ungültiger Channel.\n"
+"\n"
+" Der angegebene Channel existiert nicht.\n"
+" "
#: ../common/rhnException.py:135
#, python-format
@@ -767,6 +786,11 @@ msgid ""
" does not already exists on the server\n"
" "
msgstr ""
+"\n"
+" Hochladen des Paketes fehlgeschlagen. \n"
+" Bitte prüfen Sie ob das Paket keine doppelten Abhängigkeiten besitzt\n"
+" und nicht schon bereits auf dem Server vorhanden ist\n"
+" "
#: ../common/rhnException.py:170
msgid ""
@@ -775,6 +799,10 @@ msgid ""
" Please contact your Satellite administrator for more help.\n"
" "
msgstr ""
+"\n"
+" Die Option --force für rhnpush wurde auf diesem Server deaktiviert. \n"
+" Bitte kontaktieren Sie den Satellite Administrator für Hilfestellung.\n"
+" "
#. 60-70: token errors
#: ../common/rhnException.py:176
@@ -825,12 +853,12 @@ msgstr "Sie können sich von diesem Base-Channel nicht abmelden."
#. 80-90: server group errors
#: ../common/rhnException.py:197
msgid "There was an error while trying to join the system to its groups"
-msgstr ""
+msgstr "Fehler beim Hinzufügen des Systems in die entsprechenden Gruppen"
#. 90-100: entitlement errors
#: ../common/rhnException.py:200
msgid "Unable to entitle system"
-msgstr ""
+msgstr "System kann nicht berechtigt werden"
#: ../common/rhnException.py:201
msgid ""
@@ -880,7 +908,7 @@ msgstr ""
#. 160-179: OSAD errors
#: ../common/rhnException.py:222
msgid "Required argument is missing"
-msgstr ""
+msgstr "Benötigte Angabe fehlt"
#. 500-599: Package Uploader errors
#: ../common/rhnException.py:225
@@ -890,10 +918,12 @@ msgstr "Benötigte HTTP Header Informationen konnten nicht gefunden werden"
#: ../common/rhnException.py:226
msgid "The package's checksum signature does not match the header one"
msgstr ""
+"Die Prüfsumme der Signatur des Paketes stimmt nicht mir derjenigen aus dem "
+"Header überein"
#: ../common/rhnException.py:227
msgid "Header information does not match package metainformation"
-msgstr ""
+msgstr "Header-Information stimmen nicht mit den Metadaten überein"
#: ../common/rhnException.py:228
msgid "Package with a different signature already uploaded"
@@ -909,7 +939,7 @@ msgstr "Unsigniertes RPM Paket"
#: ../common/rhnException.py:231
msgid "Incompatible package and channel architectures"
-msgstr ""
+msgstr "Paket und Channel Architekturen sind nicht kompatibel"
#: ../common/rhnException.py:232
msgid "Incompatible checksum type"
@@ -918,7 +948,7 @@ msgstr "Typ der Prüfsumme nicht kompatibel"
#. 600-699: RHEL5+ EN errors
#: ../common/rhnException.py:235
msgid "Invalid Entitlement Number"
-msgstr ""
+msgstr "Falsche Berechtigungsnummer"
#: ../common/rhnException.py:236
msgid "No entitlement information tied to hardware"
@@ -961,11 +991,11 @@ msgstr ""
#: ../common/rhnException.py:255
msgid "RHN Proxy session token is invalid."
-msgstr ""
+msgstr "RHN Proxy Session-Token ist ungültig."
#: ../common/rhnException.py:256
msgid "RHN Proxy session token has expired."
-msgstr ""
+msgstr "RHN Proxy Session Token abgelaufen."
#. 2000-2999: RHN Satellite specific errors:
#: ../common/rhnException.py:260
@@ -1002,6 +1032,10 @@ msgid ""
"this satellite\n"
" "
msgstr ""
+"\n"
+" Diesem Satellite Server fehlt die Berechtigung für Inter Satellite Sync "
+"auf diesem Satellite\n"
+" "
#: ../common/rhnException.py:278
msgid ""
@@ -1009,6 +1043,9 @@ msgid ""
" Inter Satellite Sync is disabled on this satellite.\n"
" "
msgstr ""
+"\n"
+" Inter Satellite Sync ist auf diesem Satellite deaktiviert.\n"
+" "
#. Kickstart errors
#: ../common/rhnException.py:283
@@ -1119,7 +1156,7 @@ msgstr "Zugriff nicht erlaubt"
#: ../common/rhnException.py:315
msgid "Content missing for configuration file"
-msgstr ""
+msgstr "Kein Inhalt für Konfigurationsdatei"
#: ../common/rhnException.py:316
msgid "Template delimiters not specified"
@@ -1154,9 +1191,8 @@ msgid "Full path of file must be specified"
msgstr "Der vollständige Datei-Pfad muss angegeben werden"
#: ../common/rhnException.py:324
-#, fuzzy
msgid "Invalid revision number"
-msgstr "Ungültiger Sitzungsschlüssel"
+msgstr "Ungültige Revisionsnummer"
#: ../common/rhnException.py:325
msgid "Cannot compare files of different file type"
13 years, 4 months
Branch 'debian' - client/apt-spacewalk
by Šimon Lukašík
client/apt-spacewalk/spacewalk.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 940025d9ff141db8fc84033f79cbeeaa5e8980bb
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Fri Feb 4 20:38:32 2011 +0100
Remove stupid dependency on machine architecture
diff --git a/client/apt-spacewalk/spacewalk.py b/client/apt-spacewalk/spacewalk.py
index 989fed3..f1a38e9 100644
--- a/client/apt-spacewalk/spacewalk.py
+++ b/client/apt-spacewalk/spacewalk.py
@@ -9,6 +9,7 @@
#
import sys
+import re
import hashlib
import warnings
@@ -144,7 +145,6 @@ class spacewalk_method(pkg_acquire_method):
def __init_channels(self):
if self.svr_channels == None:
self.svr_channels = rhnChannel.getChannelDetails() # TODO: catch exceptions
- # TODO: some conduit magic here (or rather not)
# TODO CHANNELS
# sslcacert = get_ssl_ca_cert(self.up2date_cfg) # TODO: to remove or not to remove
for channel in self.svr_channels:
@@ -179,7 +179,7 @@ class spacewalk_method(pkg_acquire_method):
"""Transform url given by apt to real spacewalk url"""
document = document.replace('dists/channels:/main/',
'dists/channels:/' + self.base_channel + '/', 1)
- document = document.replace('binary-i386', 'repodata', 1) # TODO
+ document = re.sub('/binary-[\d\w]*/', '/repodata/', document, 1)
document = document.replace('dists/channels:/', '/XMLRPC/GET-REQ/', 1)
return document
13 years, 4 months
Changes to 'refs/tags/spacewalk-backend-1.4.3-1'
by Michael Mraka
Tag 'spacewalk-backend-1.4.3-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-02-04 14:15 +0000
Tagging package [spacewalk-backend] version [1.4.3-1] in directory [backend/].
Changes since spacewalk-backend-1.4.2-1:
Jan Pazdziora (5):
With _lookup_last_modified gone, _lookup_last_modified_packages and _lookup_last_modified_ks_trees are dead code, removing.
The getKickstartTree is dead code by now (after the ISO dumper removal).
The listChannelPackages is dead code by now (after the ISO dumper removal).
The listChannelErrata is dead code by now (after the ISO dumper removal).
With previous removals, getChannelAttribute is not used anymore, removing.
Michael Mraka (3):
674528 - don't read signatures when there is no rpm (--no-rpms)
674510 - fixed procedure call (PG)
Automatic commit of package [spacewalk-backend] release [1.4.3-1].
Miroslav Suchý (3):
671032 - disable rhnplugin by default and enable it only after successful registration
671032 - specify RHN as "RHN Satellite or RHN Classic"
671041 - substitute RHN with "RHN Satellite or RHN Classic"
---
backend/satellite_exporter/handlers/non_auth_dumper.py | 34 ----
backend/satellite_tools/diskImportLib.py | 73 ----------
backend/satellite_tools/spacewalk-remove-channel | 6
backend/server/importlib/packageImport.py | 11 -
backend/spacewalk-backend.spec | 12 +
client/rhel/rhn-client-tools/man/en/rhn_register.8 | 14 +
client/rhel/rhn-client-tools/man/en/rhnreg_ks.8 | 25 +--
client/rhel/rhn-client-tools/src/bin/rhnreg_ks.py | 11 +
client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py | 69 +++++++++
client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py | 60 +++++++-
client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py | 6
client/rhel/rhn-client-tools/src/up2date_client/tui.py | 45 +++++-
client/rhel/yum-rhn-plugin/rhnplugin.conf | 2
client/rhel/yum-rhn-plugin/rhnplugin.py | 2
rel-eng/packages/spacewalk-backend | 2
15 files changed, 230 insertions(+), 142 deletions(-)
---
13 years, 4 months
backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka
backend/spacewalk-backend.spec | 12 +++++++++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 12 insertions(+), 2 deletions(-)
New commits:
commit 24d363030922cd0656b56bf2dd5dea35e3c0af23
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Feb 4 15:15:49 2011 +0100
Automatic commit of package [spacewalk-backend] release [1.4.3-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 2ce5473..ecff0b4 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -11,7 +11,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2 and Python
-Version: 1.4.2
+Version: 1.4.3
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -684,6 +684,16 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Fri Feb 04 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.4.3-1
+- 674510 - fixed procedure call (PG)
+- 674528 - don't read signatures when there is no rpm (--no-rpms)
+- With previous removals, getChannelAttribute is not used anymore, removing.
+- The listChannelErrata is dead code by now (after the ISO dumper removal).
+- The listChannelPackages is dead code by now (after the ISO dumper removal).
+- The getKickstartTree is dead code by now (after the ISO dumper removal).
+- With _lookup_last_modified gone, _lookup_last_modified_packages and
+ _lookup_last_modified_ks_trees are dead code, removing.
+
* Fri Feb 04 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.4.2-1
- fixed postgresql failure on RHEL6
- 590608 - nullify jabber_ids from previous registrations
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 8aebc6c..0742ac1 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.4.2-1 backend/
+1.4.3-1 backend/
13 years, 4 months
backend/satellite_tools
by Michael Mraka
backend/satellite_tools/spacewalk-remove-channel | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit a941d18d25b8748a1f23c9016c5ab26307b10522
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Feb 4 15:06:45 2011 +0100
674510 - fixed procedure call (PG)
diff --git a/backend/satellite_tools/spacewalk-remove-channel b/backend/satellite_tools/spacewalk-remove-channel
index 65a2280..233e680 100755
--- a/backend/satellite_tools/spacewalk-remove-channel
+++ b/backend/satellite_tools/spacewalk-remove-channel
@@ -221,9 +221,11 @@ def __unsubscribeServers(labels):
def __unbsubscribeServer(server_id, channel_id):
sql = """
- call rhn_channel.unsubscribe_server(:server_id, :channel_id)
+ begin
+ /*pg perform*/ rhn_channel.unsubscribe_server(:server_id, :channel_id);
+ end;
"""
- h = rhnSQL.prepare(sql)
+ h = rhnSQL.prepare(sql, params=('server_id numeric', 'channel_id numeric'))
h.execute(server_id=server_id, channel_id=channel_id)
13 years, 4 months
backend/server
by Michael Mraka
backend/server/importlib/packageImport.py | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
New commits:
commit 2905144fee9eaf79ad17c40767c652e836245614
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Feb 4 14:25:30 2011 +0100
674528 - don't read signatures when there is no rpm (--no-rpms)
diff --git a/backend/server/importlib/packageImport.py b/backend/server/importlib/packageImport.py
index f57fd30..b1b675b 100644
--- a/backend/server/importlib/packageImport.py
+++ b/backend/server/importlib/packageImport.py
@@ -480,11 +480,12 @@ class PackageImport(ChannelPackageSubscription):
def _import_signatures(self):
for package in self.batch:
- full_path = os.path.join(CFG.MOUNT_POINT, package['path'])
- if os.path.exists(full_path):
- header = rhn_rpm.get_package_header(filename=full_path)
- server_packages.processPackageKeyAssociations(header,
- package['checksum_type'], package['checksum'])
+ if package['path']:
+ full_path = os.path.join(CFG.MOUNT_POINT, package['path'])
+ if os.path.exists(full_path):
+ header = rhn_rpm.get_package_header(filename=full_path)
+ server_packages.processPackageKeyAssociations(header,
+ package['checksum_type'], package['checksum'])
class SourcePackageImport(Import):
def __init__(self, batch, backend, caller=None, update_last_modified=0):
13 years, 4 months