po/Changelog po/pl.po
by Transifex System User
po/Changelog | 4
po/pl.po | 346 +++++++++++++++++++++++++++++------------------------------
2 files changed, 178 insertions(+), 172 deletions(-)
New commits:
commit 97250a7bdf1ae01cbb035bc5f21a75d613928a81
Author: Piotr Drąg <piotrdrag(a)gmail.com>
Date: Fri Dec 12 20:08:36 2008 +0000
Updated Polish translation
Transmitted-via: Transifex (translate.fedoraproject.org)
diff --git a/po/Changelog b/po/Changelog
index 65fb1ca..5f35af3 100644
--- a/po/Changelog
+++ b/po/Changelog
@@ -1,4 +1,6 @@
-Updated German translation
+Updated Polish translation
+
+Transmitted-via: Transifex (translate.fedoraproject.org)Updated German translation
Transmitted-via: Transifex (translate.fedoraproject.org)Updatet brazilian portuguese translation
diff --git a/po/pl.po b/po/pl.po
index 02e4b8c..a5edc56 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: pl\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 03:39+0100\n"
-"PO-Revision-Date: 2008-12-01 03:43+0100\n"
+"POT-Creation-Date: 2008-12-12 21:05+0100\n"
+"PO-Revision-Date: 2008-12-12 21:07+0100\n"
"Last-Translator: Piotr Drąg <piotrdrag(a)gmail.com>\n"
"Language-Team: Polish <pl(a)li.org>\n"
"MIME-Version: 1.0\n"
@@ -1233,45 +1233,49 @@ msgstr "Witaj w Revisorze, programie od Fedora Unity"
msgid "Cannot find anaconda-runtime in /usr/lib/anaconda-runtime"
msgstr "Nie można znaleźć anaconda-runtime w /usr/lib/anaconda-runtime"
-#: ../revisor/base.py:104
+#: ../revisor/base.py:103
msgid "Running Revisor in CLI mode..."
msgstr "Uruchamianie Revisora w trybie CLI..."
-#: ../revisor/base.py:110
+#: ../revisor/base.py:112
+msgid "Running Revisor in Hub mode..."
+msgstr "Uruchamianie Revisora w trybie huba..."
+
+#: ../revisor/base.py:117
msgid "Running Revisor in RPC Server mode..."
msgstr "Uruchamianie Revisora w trybie serwera RPC..."
-#: ../revisor/base.py:114 ../revisor/base.py:119
+#: ../revisor/base.py:121 ../revisor/base.py:127
msgid "Running Revisor in GUI mode..."
msgstr "Uruchamianie Revisora w trybie GUI..."
-#: ../revisor/base.py:174
+#: ../revisor/base.py:182
#, python-format
msgid "Opening up /usr/bin/htmlview %s%s"
msgstr "Otwieranie /usr/bin/htmlview %s%s"
#. self.mode.base_buttons_xml.get_widget("button_information").set_sensitive(True)
-#: ../revisor/base.py:178
+#: ../revisor/base.py:186
#, python-format
msgid "Cannot fork process showing help, please use %s%s"
msgstr "Nie można rozdzielić procesu wyświetlania pomocy, użyj %s%s"
-#: ../revisor/base.py:180
+#: ../revisor/base.py:188
#, python-format
msgid "Cannot show Help in CLI mode, use %s%s"
msgstr "Nie można wyświetlić pomocy w trybie CLI, użyj %s%s"
-#: ../revisor/base.py:188
+#: ../revisor/base.py:196
msgid "Loading Repositories"
msgstr "Wczytywanie repozytoriów"
-#: ../revisor/base.py:190
+#: ../revisor/base.py:198
#, python-format
msgid "Getting configuration from %s"
msgstr "Pobieranie konfiguracji z %s"
-#: ../revisor/base.py:197 ../revisor/base.py:258 ../revisor/base.py:265
-#: ../revisor/base.py:275 ../revisor/base.py:285 ../revisor/cfg.py:473
+#: ../revisor/base.py:205 ../revisor/base.py:266 ../revisor/base.py:273
+#: ../revisor/base.py:283 ../revisor/base.py:293 ../revisor/cfg.py:473
#: ../revisor/cfg.py:484 ../revisor/cfg.py:497 ../revisor/pkgorder.py:178
#: ../revisor/pkgorder.py:183 ../revisor/pkgorder.py:194
#: ../revisor/pkgorder.py:197 ../revisor/pkgorder.py:206
@@ -1280,7 +1284,7 @@ msgstr "Pobieranie konfiguracji z %s"
msgid "Using deprecated YUM function: %s()"
msgstr "Używanie przestarzałej funkcji yuma: %s()"
-#: ../revisor/base.py:199
+#: ../revisor/base.py:207
#, python-format
msgid ""
"yum.YumBase.doConfigSetup failed, probably an invalid configuration file %s"
@@ -1288,33 +1292,33 @@ msgstr ""
"yum.YumBase.doConfigSetup nie powiodło się, prawdopodobnie plik konfiguracji "
"%s jest nieprawidłowy"
-#: ../revisor/base.py:202
+#: ../revisor/base.py:210
#, python-format
msgid "Bumping YUMs debuglevel (%d) to our debuglevel (%d)"
msgstr "Podnoszenie poziomu raportowania błędów yuma (%d) na nasz poziom (%d)"
-#: ../revisor/base.py:204
+#: ../revisor/base.py:212
#, python-format
msgid "YUMs debuglevel now %d"
msgstr "Poziom raportowania błędów yuma wynosi teraz %d"
-#: ../revisor/base.py:239
+#: ../revisor/base.py:247
msgid "Another application is running which is accessing software information."
msgstr "Inna uruchomiona aplikacja ma dostęp do informacji o oprogramowaniu."
-#: ../revisor/base.py:244
+#: ../revisor/base.py:252
msgid "Fatal Error: Unable to retrieve software information.\n"
msgstr "Fatalny błąd: nie można pobierać informacji o oprogramowaniu.\n"
-#: ../revisor/base.py:254
+#: ../revisor/base.py:262
msgid "Setting up a Transaction Set"
msgstr "Ustawianie zestawu transakcji"
-#: ../revisor/base.py:261
+#: ../revisor/base.py:269
msgid "Getting myself a piece of the RPMDB"
msgstr "Pobieranie fragmentu RPMDB"
-#: ../revisor/base.py:268
+#: ../revisor/base.py:276
msgid ""
"Apparently we're running on an Enterprise Linux system (we can tell from the "
"way yum sets up the RPM Database)"
@@ -1322,38 +1326,38 @@ msgstr ""
"Działamy na systemie Enterprise Linux (możemy tak wywnioskować ze sposobu, w "
"jaki yum ustawia bazę danych RPM)"
-#: ../revisor/base.py:271
+#: ../revisor/base.py:279
msgid "Getting Repository Information"
msgstr "Pobieranie informacji o repozytoriach"
-#: ../revisor/base.py:278
+#: ../revisor/base.py:286
#, python-format
msgid "Arch list = %s"
msgstr "Lista architektur = %s"
-#: ../revisor/base.py:280
+#: ../revisor/base.py:288
msgid "Getting the Package Sacks"
msgstr "Pobieranie zestawów pakietów"
-#: ../revisor/base.py:290
+#: ../revisor/base.py:298
#, python-format
msgid "All OK so far, %d packages in the Package Sack"
msgstr "Jak na razie wszystko w porządku, %d pakietów w zestawie"
-#: ../revisor/base.py:303
+#: ../revisor/base.py:311
msgid ""
"Building a nice package list from ksdata, and adding it to the transaction"
msgstr "Budowanie ładnej listy pakietów z ksdata i dodawanie jej do transakcji"
-#: ../revisor/base.py:308
+#: ../revisor/base.py:316
msgid "Kickstart mode: respin"
msgstr "Tryb kickstart: ponowne komponowanie"
-#: ../revisor/base.py:311
+#: ../revisor/base.py:319
msgid "Kickstart mode: normal"
msgstr "Tryb kickstart: normalny"
-#: ../revisor/base.py:319
+#: ../revisor/base.py:327
#, python-format
msgid ""
"What we're getting from pykickstart is: %d groups, %d packages and %d "
@@ -1362,120 +1366,120 @@ msgstr ""
"Od pykickstart pobrano: %d grup, %d pakietów i %d wyłączonych pakietów. %d "
"pakietów zostało całkowicie zignorowanych."
-#: ../revisor/base.py:329 ../revisor/base.py:625
+#: ../revisor/base.py:337 ../revisor/base.py:633
msgid "Select kickstart packages"
msgstr "Wybierz pakiety kickstart"
-#: ../revisor/base.py:337
+#: ../revisor/base.py:345
#, python-format
msgid "Using pkgsack excludes, the list of packages to exclude is now: %r"
msgstr ""
"Używanie wykluczania pkgsack, lista pakietów do wykluczenia to teraz: %r"
-#: ../revisor/base.py:354 ../revisor/base.py:653
+#: ../revisor/base.py:362 ../revisor/base.py:661
msgid "Appending group @core"
msgstr "Dołączanie grupy @core"
-#: ../revisor/base.py:369 ../revisor/base.py:668
+#: ../revisor/base.py:377 ../revisor/base.py:676
msgid "Appending group @base"
msgstr "Dołączanie grupy @base"
-#: ../revisor/base.py:388 ../revisor/base.py:679
+#: ../revisor/base.py:396 ../revisor/base.py:687
#, python-format
msgid "Found group: %s"
msgstr "Znaleziono grupę: %s"
-#: ../revisor/base.py:394
+#: ../revisor/base.py:402
#, python-format
msgid "Repository metadata cannot be found: %s: %s"
msgstr "Nie można znaleźć metadanych repozytorium: %s: %s"
-#: ../revisor/base.py:397
+#: ../revisor/base.py:405
#, python-format
msgid "Group not found: %s"
msgstr "Nie znaleziono grupy: %s"
-#: ../revisor/base.py:409
+#: ../revisor/base.py:417
#, python-format
msgid "Selecting required packages for group %s"
msgstr "Wybieranie wymaganych pakietów dla grupy %s"
-#: ../revisor/base.py:413 ../revisor/base.py:434 ../revisor/base.py:455
-#: ../revisor/base.py:474
+#: ../revisor/base.py:421 ../revisor/base.py:442 ../revisor/base.py:463
+#: ../revisor/base.py:482
#, python-format
msgid "Including %s"
msgstr "Dołączanie %s"
-#: ../revisor/base.py:423
+#: ../revisor/base.py:431
#, python-format
msgid "From Groups (required): Adding %s-%s:%s-%s.%s to transaction"
msgstr "Z grup (wymagane): dodawanie %s-%s:%s-%s.%s do transakcji"
-#: ../revisor/base.py:430
+#: ../revisor/base.py:438
#, python-format
msgid "Selecting default packages for group %s"
msgstr "Wybieranie domyślnych pakietów dla grupy %s"
-#: ../revisor/base.py:443
+#: ../revisor/base.py:451
#, python-format
msgid "From Groups (default): Adding %s-%s:%s-%s.%s to transaction"
msgstr "Z grup (domyślne): dodawanie %s-%s:%s-%s.%s do transakcji"
-#: ../revisor/base.py:450
+#: ../revisor/base.py:458
#, python-format
msgid "Selecting optional packages for group %s"
msgstr "Wybieranie opcjonalnych pakietów dla grupy %s"
-#: ../revisor/base.py:464 ../revisor/base.py:483
+#: ../revisor/base.py:472 ../revisor/base.py:491
#, python-format
msgid "From Groups (optional): Adding %s-%s:%s-%s.%s to transaction"
msgstr "Z grup (opcjonalne): dodawanie %s-%s:%s-%s.%s do transakcji"
-#: ../revisor/base.py:470
+#: ../revisor/base.py:478
#, python-format
msgid "No include parameter for group %s, using defaults"
msgstr "Brak parametru dołączania dla grupy %s, używanie domyślnych"
-#: ../revisor/base.py:492 ../revisor/base.py:696
+#: ../revisor/base.py:500 ../revisor/base.py:704
#, python-format
msgid "Testing condition: %s / %s"
msgstr "Testowanie warunków: %s/%s"
-#: ../revisor/base.py:506
+#: ../revisor/base.py:514
#, python-format
msgid "From package list, including: %s"
msgstr "Z listy pakietów, dołączanie: %s"
-#: ../revisor/base.py:509
+#: ../revisor/base.py:517
#, python-format
msgid "Package %s is in excludeList, continuing"
msgstr "Pakiet %s znajduje się na liście wyłączonych, kontynuowanie"
-#: ../revisor/base.py:517
+#: ../revisor/base.py:525
msgid "No packages found!"
msgstr "Nie znaleziono pakietów!"
-#: ../revisor/base.py:522 ../revisor/base.py:551
+#: ../revisor/base.py:530 ../revisor/base.py:559
#, python-format
msgid "From Packages: Adding %s-%s:%s-%s.%s to transaction"
msgstr "Z pakietów: dodawanie %s-%s:%s-%s.%s do transakcji"
-#: ../revisor/base.py:529
+#: ../revisor/base.py:537
#, python-format
msgid "Could not find package '%s', searching..."
msgstr "Nie można znaleźć pakietu \"%s\", wyszukiwanie..."
-#: ../revisor/base.py:542
+#: ../revisor/base.py:550
#, python-format
msgid "Found packages matching '%s': %s"
msgstr "Znaleziono pakiety pasujące do \"%s\": %s"
-#: ../revisor/base.py:553
+#: ../revisor/base.py:561
#, python-format
msgid "From Packages: Not adding %s now because it is in the ignore list"
msgstr "Z pakietów: nie dodano teraz %s, ponieważ jest na liście ignorowanych"
-#: ../revisor/base.py:564
+#: ../revisor/base.py:572
#, python-format
msgid ""
"More then one package found for %s-%s-%s.%s - going to add them all to the "
@@ -1484,22 +1488,22 @@ msgstr ""
"Znaleziono więcej niż jeden pakiet dla %s-%s-%s.%s - wszystkie zostaną "
"dodane do transakcji"
-#: ../revisor/base.py:566
+#: ../revisor/base.py:574
#, python-format
msgid "Could not find package %s-%s-%s.%s"
msgstr "Nie można znaleźć pakietu %s-%s-%s.%s"
-#: ../revisor/base.py:569
+#: ../revisor/base.py:577
#, python-format
msgid "From Packages (exact string %s-%s-%s.%s), selecting %s-%s-%s.%s"
msgstr "Z pakietów: (dokładny łańcuch %s-%s-%s.%s), wybieranie %s-%s-%s.%s"
-#: ../revisor/base.py:589 ../revisor/base.py:744
+#: ../revisor/base.py:597 ../revisor/base.py:752
#, python-format
msgid "From Excludes: Removing %s-%s:%s-%s.%s from transaction"
msgstr "Z wykluczonych: usuwanie %s-%s:%s-%s.%s z transakcji"
-#: ../revisor/base.py:592 ../revisor/base.py:747
+#: ../revisor/base.py:600 ../revisor/base.py:755
#, python-format
msgid ""
"Apparently trying to exclude a package that is not available in the "
@@ -1508,7 +1512,7 @@ msgstr ""
"Próbujesz wykluczyć pakiet, który nie jest dostępny we wczytanych "
"repozytoriach lub nie został dodany do transakcji: %s"
-#: ../revisor/base.py:598
+#: ../revisor/base.py:606
#, python-format
msgid ""
"\n"
@@ -1528,11 +1532,11 @@ msgstr ""
"Można kontynuować z tymi małymi błędami, ale wynik może zdecydowanie różnić "
"się od oczekiwanego."
-#: ../revisor/base.py:604
+#: ../revisor/base.py:612
msgid "This is what was selected to be installed:"
msgstr "Wybrane do zainstalowania:"
-#: ../revisor/base.py:617
+#: ../revisor/base.py:625
#, python-format
msgid ""
"What we're getting from pykickstart is: %d groups, %d packages and %d "
@@ -1540,54 +1544,54 @@ msgid ""
msgstr ""
"Od pykickstart pobrano: %d grup, %d pakietów i %d wyłączonych pakietów."
-#: ../revisor/base.py:636
+#: ../revisor/base.py:644
#, python-format
msgid "Using pkgsack excludes, excluded packages is now: %r"
msgstr "Używanie wykluczania pkgsack, wykluczone pakiety to teraz: %r"
-#: ../revisor/base.py:676
+#: ../revisor/base.py:684
#, python-format
msgid "No such group %s"
msgstr "Brak grupy %s"
-#: ../revisor/base.py:733
+#: ../revisor/base.py:741
#, python-format
msgid "Adding %s-%s:%s-%s.%s"
msgstr "Dodawanie %s-%s:%s-%s.%s"
-#: ../revisor/base.py:765
+#: ../revisor/base.py:773
msgid "Initting progress bar for "
msgstr "Rozpoczynanie paska postępu dla "
-#: ../revisor/base.py:772
+#: ../revisor/base.py:780
msgid "Apparently we have not yet entered the Build Media stage"
msgstr "Najwyraźniej nie przeszliśmy jeszcze do etapu budowania nośnika"
-#: ../revisor/base.py:801 ../revisor/misc.py:156
+#: ../revisor/base.py:809 ../revisor/misc.py:158
#, python-format
msgid "Checking dependencies for %s.%s"
msgstr "Sprawdzanie zależności %s.%s"
#. pbar.cur_task += 1.0
-#: ../revisor/base.py:823 ../revisor/misc.py:183
+#: ../revisor/base.py:831 ../revisor/misc.py:185
#, python-format
msgid "Unresolvable dependency %s %s %s in %s.%s"
msgstr "Nie można rozwiązać zależności %s %s %s w %s.%s"
-#: ../revisor/base.py:830 ../revisor/misc.py:190
+#: ../revisor/base.py:838 ../revisor/misc.py:192
#, python-format
msgid "Added %s-%s:%s-%s.%s for %s-%s:%s-%s.%s (requiring %s %s %s)"
msgstr "Dodano %s-%s:%s-%s.%s dla %s-%s:%s-%s.%s (wymaga %s %s %s)"
-#: ../revisor/base.py:833 ../revisor/misc.py:196
+#: ../revisor/base.py:841 ../revisor/misc.py:198
msgid "Checking dependencies - allowing conflicts within the package set"
msgstr "Sprawdzanie zależności - pozwalanie na konflikty w zestawie pakietów"
-#: ../revisor/base.py:834 ../revisor/base.py:863
+#: ../revisor/base.py:842 ../revisor/base.py:871
msgid "Resolving Dependencies"
msgstr "Rozwiązywanie zależności"
-#: ../revisor/base.py:856
+#: ../revisor/base.py:864
#, python-format
msgid ""
"The following packages were excluded using the kickstart package manifest, "
@@ -1598,13 +1602,13 @@ msgstr ""
"kickstart, ale zostały dołączone, aby rozwiązać zależności:\n"
" - %s"
-#: ../revisor/base.py:862
+#: ../revisor/base.py:870
msgid ""
"Checking dependencies - not allowing any conflicts within the package set"
msgstr ""
"Sprawdzanie zależności - nie pozwalanie na konflikty w zestawie pakietów"
-#: ../revisor/base.py:890
+#: ../revisor/base.py:898
#, python-format
msgid ""
"Unable to resolve dependencies for some packages selected:\n"
@@ -1616,16 +1620,16 @@ msgstr ""
"%s"
#. End of dependency resolving
-#: ../revisor/base.py:894 ../revisor/image.py:97
+#: ../revisor/base.py:902 ../revisor/image.py:97
msgid "Unable to build transaction"
msgstr "Nie można zbudować transakcji"
-#: ../revisor/base.py:899 ../revisor/image.py:102
+#: ../revisor/base.py:907 ../revisor/image.py:102
#, python-format
msgid "Succesfully built transaction: ret %s, msg %s"
msgstr "Pomyślnie zbudowano transakcję: ret %s, komunikat %s"
-#: ../revisor/base.py:905
+#: ../revisor/base.py:913
#, python-format
msgid ""
"Errors where encountered while downloading package headers:\n"
@@ -1636,7 +1640,7 @@ msgstr ""
"\n"
"%s"
-#: ../revisor/base.py:914
+#: ../revisor/base.py:922
msgid ""
"The package set after dependency resolving does not match the packages "
"selected in the kickstart manifest"
@@ -1644,203 +1648,203 @@ msgstr ""
"Zestaw pakietów po rozwiązaniu zależności nie zgadza się z pakietami "
"wybranymi w manifeście kickstart"
-#: ../revisor/base.py:941
+#: ../revisor/base.py:949
#, python-format
msgid "No such repository: %s"
msgstr "Brak repozytorium: %s"
-#: ../revisor/base.py:943
+#: ../revisor/base.py:951
#, python-format
msgid "Enabling %s repository"
msgstr "Włączanie repozytorium %s"
-#: ../revisor/base.py:962
+#: ../revisor/base.py:970
#, python-format
msgid "Disabling %s repository"
msgstr "Wyłączanie repozytorium %s"
-#: ../revisor/base.py:969
+#: ../revisor/base.py:977
msgid "Creating a list of SRPMs"
msgstr "Tworzenie listy źródłowych pakietów RPM"
-#: ../revisor/base.py:984
+#: ../revisor/base.py:992
msgid "Source RPM PO already in the list"
msgstr "PO źródłowego pakietu RPM jest już na liście"
-#: ../revisor/base.py:986
+#: ../revisor/base.py:994
#, python-format
msgid "Source RPM found in non-source repository %s"
msgstr "Źródłowy pakiet RPM znaleziono w repozytorium nieźródłowym %s"
-#: ../revisor/base.py:988
+#: ../revisor/base.py:996
#, python-format
msgid "Error: Cannot find a source rpm for %s"
msgstr "Błąd: nie można znaleźć źródłowego RPM-a dla %s"
-#: ../revisor/base.py:990 ../revisor/modgui/build_media.py:106
+#: ../revisor/base.py:998 ../revisor/modgui/build_media.py:106
#: ../revisor/modgui/build_media.py:142 ../revisor/modgui/build_media.py:219
msgid "Downloading Source Packages"
msgstr "Pobieranie pakietów źródłowych"
-#: ../revisor/base.py:1019 ../revisor/progress.py:441
+#: ../revisor/base.py:1027 ../revisor/progress.py:441
#, python-format
msgid "Downloading %s"
msgstr "Pobieranie %s"
-#: ../revisor/base.py:1049 ../revisor/modgui/build_media.py:101
+#: ../revisor/base.py:1057 ../revisor/modgui/build_media.py:101
#: ../revisor/modgui/build_media.py:214
msgid "Downloading Packages"
msgstr "Pobieranie pakietów"
-#: ../revisor/base.py:1058
+#: ../revisor/base.py:1066
msgid "Unable to find a suitable mirror."
msgstr "Nie można znaleźć odpowiedniego serwera lustrzanego."
-#: ../revisor/base.py:1070
+#: ../revisor/base.py:1078
#, python-format
msgid "Errors were encountered while downloading packages: %s"
msgstr "Podczas pobierania pakietów pakietów wystąpiły błędy: %s"
-#: ../revisor/base.py:1111
+#: ../revisor/base.py:1119
#, python-format
msgid "Overriding auto package selection with user package selection for %s..."
msgstr ""
"Zastępowanie automatycznego wyboru pakietów pakietami wybranymi przez "
"użytkownika dla %s..."
-#: ../revisor/base.py:1124
+#: ../revisor/base.py:1132
#, python-format
msgid "Adding required package %s-%s:%s-%s.%s"
msgstr "Dodawanie wymaganego pakietu %s-%s:%s-%s.%s"
#. This list has already been resolved
-#: ../revisor/base.py:1127
+#: ../revisor/base.py:1135
#, python-format
msgid "%s. This is a required package."
msgstr "%s. Ten pakiet jest wymagany."
-#: ../revisor/base.py:1139
+#: ../revisor/base.py:1147
#, python-format
msgid "Adding suggested package %s-%s:%s-%s.%s"
msgstr "Dodawanie sugerowanego pakietu %s-%s:%s-%s.%s"
-#: ../revisor/base.py:1149
+#: ../revisor/base.py:1157
#, python-format
msgid "Packages that do not need to be on the media: %s"
msgstr "Pakiety, które nie muszą być na nośniku: %s"
-#: ../revisor/base.py:1174 ../revisor/base.py:1200
+#: ../revisor/base.py:1182 ../revisor/base.py:1208
msgid "Did not succeed in adding in all required packages"
msgstr "Dodanie wszystkich wymaganych pakietów nie powiodło się"
-#: ../revisor/base.py:1208
+#: ../revisor/base.py:1216
msgid "Populating statistics"
msgstr "Tworzenie statystyk"
-#: ../revisor/base.py:1224
+#: ../revisor/base.py:1232
#, python-format
msgid "Package %s-%s:%s-%s.%s does not seem to have a archivesize header"
msgstr ""
"Wydaje się, że pakiet %s-%s:%s-%s.%s nie posiada nagłówka rozmiaru archiwum"
-#: ../revisor/base.py:1232
+#: ../revisor/base.py:1240
#, python-format
msgid "Package %s-%s:%s-%s.%s does not seem to have a installedsize header"
msgstr ""
"Wydaje się, że pakiet %s-%s:%s-%s.%s nie posiada nagłówka rozmiaru po "
"zainstalowaniu"
-#: ../revisor/base.py:1240
+#: ../revisor/base.py:1248
#, python-format
msgid "Package %s-%s:%s-%s.%s does not seem to have a packagesize header"
msgstr ""
"Wydaje się, że pakiet %s-%s:%s-%s.%s nie posiada nagłówka rozmiaru pakietu"
-#: ../revisor/base.py:1250
+#: ../revisor/base.py:1258
#, python-format
msgid "Total size of all packages (archivesize): %s %s"
msgstr "Całkowity rozmiar wszystkich pakietów (rozmiar archiwum): %s %s"
-#: ../revisor/base.py:1251
+#: ../revisor/base.py:1259
#, python-format
msgid "Total size of all packages, (installedsize): %s %s"
msgstr ""
"Całkowity rozmiar wszystkich pakietów (rozmiar po zainstalowaniu): %s %s"
-#: ../revisor/base.py:1252
+#: ../revisor/base.py:1260
#, python-format
msgid "Total size of all packages, (packagesize): %s %s"
msgstr "Całkowity rozmiar wszystkich pakietów (rozmiar pakietu): %s %s"
-#: ../revisor/base.py:1287
+#: ../revisor/base.py:1295
#, python-format
msgid "Report of the %d most space consuming packages"
msgstr "Zgłoś %d pakietów zajmujących najwięcej miejsca"
-#: ../revisor/base.py:1382 ../revisor/base.py:1396 ../revisor/base.py:2017
+#: ../revisor/base.py:1390 ../revisor/base.py:1404 ../revisor/base.py:2025
#, python-format
msgid "Creating pkgdir: %s"
msgstr "Tworzenie pkgdir: %s"
#. Now for each txmbr in
#. Link the localPkg() result into the build tree
-#: ../revisor/base.py:1405
+#: ../revisor/base.py:1413
msgid "Linking in packages"
msgstr "Dowiązywanie pakietów"
-#: ../revisor/base.py:1424 ../revisor/base.py:2041
+#: ../revisor/base.py:1432 ../revisor/base.py:2049
#, python-format
msgid "Package hard link failed: %s: %s"
msgstr "Twarde dowiązanie pakietów nie powiodło się: %s: %s"
-#: ../revisor/base.py:1429 ../revisor/base.py:2046
+#: ../revisor/base.py:1437 ../revisor/base.py:2054
#, python-format
msgid "Copying: %s to %s"
msgstr "Kopiowanie: %s do %s"
-#: ../revisor/base.py:1432 ../revisor/base.py:2049
+#: ../revisor/base.py:1440 ../revisor/base.py:2057
#, python-format
msgid "Symlinking: %s to %s"
msgstr "Dowiązywanie symboliczne: %s do %s"
-#: ../revisor/base.py:1435 ../revisor/base.py:2052
+#: ../revisor/base.py:1443 ../revisor/base.py:2060
msgid "Package symlink succeeded"
msgstr "Dowiązanie symboliczne pakietów powiodło się"
-#: ../revisor/base.py:1437 ../revisor/base.py:1444 ../revisor/base.py:2054
-#: ../revisor/base.py:2061
+#: ../revisor/base.py:1445 ../revisor/base.py:1452 ../revisor/base.py:2062
+#: ../revisor/base.py:2069
#, python-format
msgid "Package link failed, trying copy: %s: %s"
msgstr "Dowiązanie pakietów nie powiodło się, próbowanie skopiowania: %s: %s"
-#: ../revisor/base.py:1454
+#: ../revisor/base.py:1462
msgid "Creating Repository Information"
msgstr "Tworzenie informacji o repozytoriach"
#. FIXME: Optionally recompose installer images
-#: ../revisor/base.py:1469
+#: ../revisor/base.py:1477
msgid "Building Installation Images"
msgstr "Budowanie obrazów instalacyjnych"
-#: ../revisor/base.py:1475
+#: ../revisor/base.py:1483
msgid "Using already existing installer images"
msgstr "Używanie już istniejących obrazów instalatora"
-#: ../revisor/base.py:1489
+#: ../revisor/base.py:1497
msgid "Linking in release notes"
msgstr "Dowiązywanie informacji o wydaniu"
-#: ../revisor/base.py:1501
+#: ../revisor/base.py:1509
#, python-format
msgid "Copying updates.img from %s to %s"
msgstr "Kopiowanie updates.img z %s do %s"
-#: ../revisor/base.py:1510 ../revisor/pungi.py:414
+#: ../revisor/base.py:1518 ../revisor/pungi.py:414
#, python-format
msgid "copy_dir '%s' not accessible"
msgstr "Nie można uzyskać dostępu do copy_dir \"%s\""
-#: ../revisor/base.py:1521
+#: ../revisor/base.py:1529
#, python-format
msgid "Size of the installation tree is %s MB"
msgstr "Rozmiar drzewa instalacyjnego wynosi %s MB"
@@ -1849,103 +1853,103 @@ msgstr "Rozmiar drzewa instalacyjnego wynosi %s MB"
#. That makes our lives difficult, hihi
#. So, make sure that if we're on el_linux, the repository gets
#. bind mounted and configured appropriately
-#: ../revisor/base.py:1571
+#: ../revisor/base.py:1579
msgid "Running pkgorder"
msgstr "Wykonywanie pkgorder"
-#: ../revisor/base.py:1634
+#: ../revisor/base.py:1642
msgid "Appending group core and base"
msgstr "Dołączanie grup core i base"
-#: ../revisor/base.py:1641
+#: ../revisor/base.py:1649
#, python-format
msgid "Appending default group %s"
msgstr "Dołączanie domyślnej grupy %s"
-#: ../revisor/base.py:1681
+#: ../revisor/base.py:1689
#, python-format
msgid "Appending non-default group %s"
msgstr "Dołączanie nie domyślnej grupy %s"
-#: ../revisor/base.py:1687
+#: ../revisor/base.py:1695
#, python-format
msgid "Appending non-default support group %s"
msgstr "Dołączanie nie domyślnych grup obsługi %s"
-#: ../revisor/base.py:1754
+#: ../revisor/base.py:1762
#, python-format
msgid "Not running package ordering, using file %s instead"
msgstr ""
"Porządkowanie kolejności pakietów nie zostanie wykonane, używanie zamiast "
"tego pliku %s"
-#: ../revisor/base.py:1756
+#: ../revisor/base.py:1764
msgid "Not running package ordering"
msgstr "Porządkowanie kolejności pakietów nie zostanie wykonane"
-#: ../revisor/base.py:1788
+#: ../revisor/base.py:1796
msgid "^Install using kickstart"
msgstr "^Zainstaluj używając kickstart"
#. Split Tree
-#: ../revisor/base.py:1811
+#: ../revisor/base.py:1819
#, python-format
msgid "Splitting Build Tree (%s)"
msgstr "Rozdzielanie drzewa budowania (%s)"
#. Split repo
-#: ../revisor/base.py:1817
+#: ../revisor/base.py:1825
#, python-format
msgid "Splitting Repository (%s)"
msgstr "Rozdzielanie repozytorium (%s)"
-#: ../revisor/base.py:1831 ../revisor/modgui/build_media.py:244
+#: ../revisor/base.py:1839 ../revisor/modgui/build_media.py:244
#, python-format
msgid "Creating %s ISO Image #%d"
msgstr "Tworzenie %s obrazu ISO #%d"
-#: ../revisor/base.py:1836 ../revisor/modgui/build_media.py:248
+#: ../revisor/base.py:1844 ../revisor/modgui/build_media.py:248
#, python-format
msgid "Creating %s ISO Image"
msgstr "Tworzenie %s obrazu ISO"
#. For all images but source images; implant the md5 into the ISO for the media check
#. FIXME: Well, it seems we don't deal with source images here.
-#: ../revisor/base.py:1850
+#: ../revisor/base.py:1858
msgid "Implanting MD5 into ISO Images"
msgstr "Wprowadzanie MD5 do obrazów ISO"
#. mediatype = built_image["mediatype"]
#. if not mediatype == 'source':
-#: ../revisor/base.py:1858
+#: ../revisor/base.py:1866
#, python-format
msgid "Implanting md5 into ISO Image: %s"
msgstr "Wprowadzanie MD5 do obrazu ISO: %s"
-#: ../revisor/base.py:1864
+#: ../revisor/base.py:1872
msgid "Cannot implant ISO md5sum"
msgstr "Nie można wprowadzić md5sum ISO"
#. Do some SHA1SUMMONING
-#: ../revisor/base.py:1872
+#: ../revisor/base.py:1880
msgid "Creating SHA1SUMs for Images"
msgstr "Tworzenie plików SHA1SUM dla obrazów"
-#: ../revisor/base.py:1888
+#: ../revisor/base.py:1896
msgid "Creating Rescue ISO Image"
msgstr "Tworzenie ratunkowego obrazu ISO"
-#: ../revisor/base.py:1948
+#: ../revisor/base.py:1956
#, python-format
msgid "Copying %s to %s (%d files)"
msgstr "Kopiowanie %s do %s (%d plików)"
-#: ../revisor/base.py:1952
+#: ../revisor/base.py:1960
#, python-format
msgid "Moving %s to %s (%d files)"
msgstr "Przenoszenie %s do %s (%d plików)"
-#: ../revisor/base.py:1955
+#: ../revisor/base.py:1963
#, python-format
msgid ""
"Moving of the source tree failed (trying copy):\n"
@@ -1956,7 +1960,7 @@ msgstr ""
"\n"
"%s"
-#: ../revisor/base.py:1958
+#: ../revisor/base.py:1966
#, python-format
msgid ""
"Copying of the source tree failed:\n"
@@ -1967,12 +1971,12 @@ msgstr ""
"\n"
"%s"
-#: ../revisor/base.py:1963 ../revisor/pungi.py:410
+#: ../revisor/base.py:1971 ../revisor/pungi.py:410
#, python-format
msgid "Copying %s to %s"
msgstr "Kopiowanie %s do %s"
-#: ../revisor/base.py:1967
+#: ../revisor/base.py:1975
#, python-format
msgid ""
"Copying of the installation tree failed:\n"
@@ -1983,41 +1987,41 @@ msgstr ""
"\n"
"%s"
-#: ../revisor/base.py:1973
+#: ../revisor/base.py:1981
msgid "Creating ext3 filesystem"
msgstr "Tworzenie systemu plików ext3"
-#: ../revisor/base.py:1980
+#: ../revisor/base.py:1988
msgid "Configuring System"
msgstr "Konfigurowanie systemu"
#. Now for each txmbr in
#. Link the localPkg() result into the build tree
-#: ../revisor/base.py:2026
+#: ../revisor/base.py:2034
msgid "Linking in Source packages"
msgstr "Dowiązywanie pakietów źródłowych"
-#: ../revisor/base.py:2081
+#: ../revisor/base.py:2089
#, python-format
msgid "Setting rundir to %s"
msgstr "Ustawianie rundir na %s"
-#: ../revisor/base.py:2087
+#: ../revisor/base.py:2095
#, python-format
msgid "Directory %s could not be created. Aborting"
msgstr "Nie można utworzyć folderu %s. Przerywanie"
-#: ../revisor/base.py:2089
+#: ../revisor/base.py:2097
#, python-format
msgid "Running command: %s"
msgstr "Wykonywanie polecenia: %s"
-#: ../revisor/base.py:2090
+#: ../revisor/base.py:2098
#, python-format
msgid "Extra information: %s %s %s"
msgstr "Dodatkowe informacje: %s %s %s"
-#: ../revisor/base.py:2118
+#: ../revisor/base.py:2126
#, python-format
msgid "Got an error from %s (return code %s)"
msgstr "Otrzymano błąd z %s (kod zwrotny %s)"
@@ -2367,11 +2371,11 @@ msgstr "wybieranie self.packages_list[%r][%r][%r][%r]"
msgid "returning pkg_list: %r"
msgstr "zwracanie pkg_list: %r"
-#: ../revisor/cfg.py:1087
+#: ../revisor/cfg.py:1088
msgid "Run from image"
msgstr "Uruchom z obrazu"
-#: ../revisor/cfg.py:1088
+#: ../revisor/cfg.py:1089
msgid "Run from RAM - requires 1 GB+"
msgstr "Uruchom z pamięci RAM - wymaga 1 GB+"
@@ -2698,11 +2702,11 @@ msgstr "Ustaw preferowane jądro: normal, PAE, xen lub debug."
msgid " %s - No Description"
msgstr "%s - brak opisu"
-#: ../revisor/__init__.py.in:442
+#: ../revisor/__init__.py.in:448
msgid "Interrupted by user"
msgstr "Przerwano przez użytkownika"
-#: ../revisor/__init__.py.in:449
+#: ../revisor/__init__.py.in:454
msgid ""
"Traceback occurred, please report a bug at http://fedorahosted.org/revisor"
msgstr "Wystąpił błąd, proszę zgłosić błąd na http://fedorahosted.org/revisor"
@@ -2723,12 +2727,12 @@ msgstr "Czy chcesz kontynuować? [Y/n]"
msgid "Abort! Abort! Abort!"
msgstr "Przerwij!"
-#: ../revisor/misc.py:36
+#: ../revisor/misc.py:38
msgid "This tool has to run with root privileges. Aborting"
msgstr "To narzędzie musi być uruchamiane z uprawnieniami roota. Przerywanie"
#. SELinux in enforcing mode
-#: ../revisor/misc.py:47
+#: ../revisor/misc.py:49
msgid ""
"SELinux is in enforcing mode on this host. Composing media will fail. Please "
"set SELinux to permissive mode."
@@ -2736,7 +2740,7 @@ msgstr ""
"SElinux jest ustawiony w trybie wymuszania na tym komputerze. Skomponowanie "
"nośnika nie powiedzie się. Ustaw SELinuksa na tryb zezwalania."
-#: ../revisor/misc.py:52
+#: ../revisor/misc.py:54
msgid ""
"SELinux on this host is disabled. Composed media will not have SELinux, and "
"as a result the system you install from the composed media will not have "
@@ -2746,12 +2750,12 @@ msgstr ""
"posiadały SELinuksa, a w rezultacie system zainstalowany z tego nośnika "
"również nie będzie posiadał SELinuksa."
-#: ../revisor/misc.py:134 ../revisor/misc.py:141
+#: ../revisor/misc.py:136 ../revisor/misc.py:143
#, python-format
msgid "Resolved %s"
msgstr "Rozwiązano %s"
-#: ../revisor/misc.py:144
+#: ../revisor/misc.py:146
#, python-format
msgid ""
"Looking to resolve package %s to a Provides, but we still can't find it."
@@ -2780,73 +2784,73 @@ msgstr ""
msgid "-> package %s"
msgstr "-> pakiet %s"
-#: ../revisor/plugins.py:57 ../revisor/plugins.py:74
+#: ../revisor/plugins.py:58 ../revisor/plugins.py:75
#, python-format
msgid "Plugin %s failed to load (%s: %s)"
msgstr "Wczytanie wtyczki %s nie powiodło się (%s: %s)"
-#: ../revisor/plugins.py:68
+#: ../revisor/plugins.py:69
#, python-format
msgid "ImportError for plugin %s: %s"
msgstr "Błąd importowania wtyczki %s: %s"
-#: ../revisor/plugins.py:71
+#: ../revisor/plugins.py:72
#, python-format
msgid "RuntimeError for plugin %s: %s"
msgstr "Błąd wykonywania wtyczki %s: %s"
-#: ../revisor/plugins.py:91 ../revisor/plugins.py:93
+#: ../revisor/plugins.py:92 ../revisor/plugins.py:94
#, python-format
msgid "Cannot set defaults for plugin %s: %s"
msgstr "Nie można ustawić domyślnych dla wtyczki %s: %s"
-#: ../revisor/plugins.py:95
+#: ../revisor/plugins.py:96
#, python-format
msgid "Cannot set defaults for plugin %s: Unknown Error"
msgstr "Nie można ustawić domyślnych dla wtyczki %s: nieznany błąd"
-#: ../revisor/plugins.py:98
+#: ../revisor/plugins.py:99
#, python-format
msgid "Not setting defaults for plugin %s: No function 'set_defaults()'"
msgstr ""
"Domyślne nie zostaną ustawione dla wtyczki %s: brak funkcji \"set_defaults()"
"\""
-#: ../revisor/plugins.py:115
+#: ../revisor/plugins.py:116
#, python-format
msgid "Cannot set runtime for plugin %s: %s"
msgstr "Nie można ustawić środowiska wykonawczego dla wtyczki %s: %s"
-#: ../revisor/plugins.py:117
+#: ../revisor/plugins.py:118
#, python-format
msgid "Not setting runtime for plugin %s: No function 'set_runtime()'"
msgstr ""
"Środowisko wykonawcze nie zostanie ustawione dla wtyczki %s: brak funkcji "
"\"set_runtime()\""
-#: ../revisor/plugins.py:134
+#: ../revisor/plugins.py:135
#, python-format
msgid "Cannot add options for plugin %s: %s"
msgstr "Nie można dodać opcji dla wtyczki %s: %s"
-#: ../revisor/plugins.py:136
+#: ../revisor/plugins.py:137
#, python-format
msgid "Not adding options for plugin %s: No function 'add_options()'"
msgstr ""
"Opcje nie zostaną ustawione dla wtyczki %s: brak funkcji \"add_options()\""
-#: ../revisor/plugins.py:154
+#: ../revisor/plugins.py:155
#, python-format
msgid "Cannot check options for plugin %s: %s"
msgstr "Nie można sprawdzić opcji dla wtyczki %s: %s"
-#: ../revisor/plugins.py:156
+#: ../revisor/plugins.py:157
#, python-format
msgid "Not checking options for plugin %s: No function 'check_options()'"
msgstr ""
"Opcje nie zostaną sprawdzone dla wtyczki %s: brak funkcji \"check_options()\""
-#: ../revisor/plugins.py:192
+#: ../revisor/plugins.py:193
#, python-format
msgid "Cannot execute hook %s for plugin %s: %s"
msgstr "Nie można wykonać haka %s dla wtyczki %s: %s"
15 years, 5 months
- 1
- 0
4 commits - conf/conf.d revisor/base.py scripts/find-default-groups.py
by Jeroen van Meeuwen
conf/conf.d/sample-ks.cfg | 7 -------
revisor/base.py | 2 +-
scripts/find-default-groups.py | 9 +++++++++
3 files changed, 10 insertions(+), 8 deletions(-)
New commits:
commit 67ea9d1bfe91a5cf73258f0118c6c7b8fefb206e
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Fri Dec 12 16:42:28 2008 +0100
Fix typo
diff --git a/revisor/base.py b/revisor/base.py
index 6c7e0fb..027fed8 100644
--- a/revisor/base.py
+++ b/revisor/base.py
@@ -104,7 +104,7 @@ class RevisorBase:
import revisor.cli
self.cli = revisor.cli.RevisorCLI(self)
self.cli.run()
- elif hasattr(self.cfg,"server_mode") or hasattr(self.cfg."hub_mode"):
+ elif hasattr(self.cfg,"server_mode") or hasattr(self.cfg,"hub_mode"):
# Check hub_mode,
# Then check server_mode,
# If we have both attributes, but none is set, fall back to GUI mode
commit edd62d1a25034a16d1b91652f734ac15ee6c3c40
Merge: 3a4b3d1... 2698976...
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Fri Dec 12 16:41:51 2008 +0100
Merge branch 'master' of ssh://git.fedorahosted.org/git/revisor
commit 3a4b3d1116f899a2b346a3fe3d921f8b2037ab1f
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Thu Dec 11 16:43:06 2008 +0100
In verbose mode, spit out the names of the packages
diff --git a/scripts/find-default-groups.py b/scripts/find-default-groups.py
index 941b79b..154fddd 100755
--- a/scripts/find-default-groups.py
+++ b/scripts/find-default-groups.py
@@ -132,5 +132,14 @@ def main():
print "%d mandatory packages, %d default packages, %d packages in total (after depsolving)" % (ayum.total_mandatory,ayum.total_default,len(ayum.tsInfo.getMembers()))
+ if cli_options.verbose:
+ pkg_names = []
+ for pkg in ayum.tsInfo.getMembers():
+ pkg_names.append(pkg.name)
+ pkg_names.sort()
+
+ for name in pkg_names:
+ print name
+
if __name__ == '__main__':
main()
commit a111c64f35f74990bd72c05e072c9a83b32f73d2
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Thu Dec 11 16:42:51 2008 +0100
Remove packages from sample-ks.cfg
diff --git a/conf/conf.d/sample-ks.cfg b/conf/conf.d/sample-ks.cfg
index 5cc91b7..4dfeb7e 100644
--- a/conf/conf.d/sample-ks.cfg
+++ b/conf/conf.d/sample-ks.cfg
@@ -37,11 +37,4 @@ install
xconfig --defaultdesktop=GNOME --startxonboot
%packages
-# Let's put something a little more interesting here
-# just to show off some of the power of kickstart
-kernel
-kernel-devel
-vim-enhanced
-yum
--yum-updatesd
%end
15 years, 5 months
- 1
- 0
Branch 'EL-5' - revisor/base.py
by Jeroen van Meeuwen
revisor/base.py | 27 +++++++++++++++++++--------
1 file changed, 19 insertions(+), 8 deletions(-)
New commits:
commit fbf6ff3d25bf2382a93673fc8219cf0ce7eb317c
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Thu Dec 11 16:58:10 2008 +0100
Fix the ksgroup.name vs. ksgroup being a name issue
diff --git a/revisor/base.py b/revisor/base.py
index 0848e04..00df975 100644
--- a/revisor/base.py
+++ b/revisor/base.py
@@ -474,22 +474,33 @@ class RevisorBase:
## Add packages from Groups in ksdata
##
for ksgroup in groupList:
- if not self.cfg.yumobj.comps.has_group(ksgroup.name):
- self.log.warning(_("No such group %s") % ksgroup.name )
+ if hasattr(ksgroup,"name"):
+ group_name = ksgroup.name
+ else:
+ group_name = ksgroup
+
+ if not self.cfg.yumobj.comps.has_group(group_name):
+ self.log.warning(_("No such group %s") % group_name )
continue
else:
- self.log.debug(_("Found group: %s") % ksgroup.name)
+ self.log.debug(_("Found group: %s") % group_name)
# Get group object from comps
- grp = self.cfg.yumobj.comps.return_group(ksgroup.name)
+ grp = self.cfg.yumobj.comps.return_group(group_name)
txmbrs_used = self.cfg.yumobj.selectGroup(grp.name)
- if ksgroup.include >= kickstart.constants.GROUP_REQUIRED:
+ try:
+ if ksgroup.include >= kickstart.constants.GROUP_REQUIRED:
+ pkglist.extend(grp.mandatory_packages.keys())
+ if ksgroup.include >= kickstart.constants.GROUP_DEFAULT:
+ pkglist.extend(grp.default_packages.keys())
+ if ksgroup.include >= kickstart.constants.GROUP_ALL:
+ pkglist.extend(grp.optional_packages.keys())
+ except:
+ # If such fails, just include the mandatory and defaults
pkglist.extend(grp.mandatory_packages.keys())
- if ksgroup.include >= kickstart.constants.GROUP_DEFAULT:
pkglist.extend(grp.default_packages.keys())
- if ksgroup.include >= kickstart.constants.GROUP_ALL:
- pkglist.extend(grp.optional_packages.keys())
+
##
## Pull the conditional packages in
15 years, 5 months
- 1
- 0
revisor/pkgorder.py
by Jeroen van Meeuwen
revisor/pkgorder.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2698976be397f7733403873beb87ab80e784349a
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Fri Dec 12 16:41:27 2008 +0100
Pass on the resolved_deps and final_pkg_objs
diff --git a/revisor/pkgorder.py b/revisor/pkgorder.py
index 05611de..92c3186 100644
--- a/revisor/pkgorder.py
+++ b/revisor/pkgorder.py
@@ -83,7 +83,7 @@ class PackageOrderer(yum.YumBase):
self.resolveDeps()
else:
print "%r" % self.resolved_deps
- (self.resolved_deps, self.final_pkgobjs) = revisor.misc.resolve_dependencies_inclusive(self.cfg.yumobj, self.cfg.log)
+ (self.resolved_deps, self.final_pkgobjs) = revisor.misc.resolve_dependencies_inclusive(self.cfg.yumobj, self.cfg.log, resolved_deps=self.resolved_deps, final_pkgobjs=self.final_pkgobjs)
self.processTransaction()
15 years, 5 months
- 1
- 0
3 commits - revisor/base.py revisor/misc.py revisor/pkgorder.py scripts/find-default-groups.py scripts/repoclosure.py
by Jeroen van Meeuwen
revisor/base.py | 43 ++-----------------
revisor/misc.py | 90 ++++++++++++++++++++++++++++++++++++++++-
revisor/pkgorder.py | 4 -
scripts/find-default-groups.py | 2
scripts/repoclosure.py | 4 -
5 files changed, 99 insertions(+), 44 deletions(-)
New commits:
commit 3620539408a58623d2c4bca609ed67e4dde2392c
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Fri Dec 12 16:30:16 2008 +0100
Use the renamed resolve_dependencies_inclusive function
diff --git a/revisor/pkgorder.py b/revisor/pkgorder.py
index da3d5b9..05611de 100644
--- a/revisor/pkgorder.py
+++ b/revisor/pkgorder.py
@@ -83,7 +83,7 @@ class PackageOrderer(yum.YumBase):
self.resolveDeps()
else:
print "%r" % self.resolved_deps
- (self.resolved_deps, self.final_pkgobjs) = revisor.misc.resolve_dependencies_ugly(self.cfg.yumobj, self.cfg.log)
+ (self.resolved_deps, self.final_pkgobjs) = revisor.misc.resolve_dependencies_inclusive(self.cfg.yumobj, self.cfg.log)
self.processTransaction()
@@ -100,7 +100,7 @@ class PackageOrderer(yum.YumBase):
if self.cfg.pkgorder_style == "yum":
self.resolveDeps()
else:
- (self.resolved_deps, self.final_pkgobjs) = revisor.misc.resolve_dependencies_ugly(self.cfg.yumobj, self.cfg.log, resolved_deps=self.resolved_deps, final_pkgobjs=self.final_pkgobjs)
+ (self.resolved_deps, self.final_pkgobjs) = revisor.misc.resolve_dependencies_inclusive(self.cfg.yumobj, self.cfg.log, resolved_deps=self.resolved_deps, final_pkgobjs=self.final_pkgobjs)
self.processTransaction()
diff --git a/scripts/find-default-groups.py b/scripts/find-default-groups.py
index 941b79b..f478dc0 100755
--- a/scripts/find-default-groups.py
+++ b/scripts/find-default-groups.py
@@ -87,7 +87,7 @@ class Yum(yum.YumBase):
if self.cli_options.depsolve_exclusive:
self.resolveDeps()
else:
- (self.resolved_deps,self.final_pkgobjs) = revisor.misc.resolve_dependencies_ugly(self, resolved_deps=self.resolved_deps, final_pkgobjs=self.final_pkgobjs)
+ (self.resolved_deps,self.final_pkgobjs) = revisor.misc.resolve_dependencies_inclusive(self, resolved_deps=self.resolved_deps, final_pkgobjs=self.final_pkgobjs)
def size_me(val):
ret_val = float(val)
diff --git a/scripts/repoclosure.py b/scripts/repoclosure.py
index 33d6933..9e6afee 100644
--- a/scripts/repoclosure.py
+++ b/scripts/repoclosure.py
@@ -45,13 +45,13 @@ class Yum(yum.YumBase):
self.tsInfo.addInstall(po)
except yum.Errors.PackageSackError, e:
pass
-
+
def resolve_dependencies(self):
return
#if self.cli_options.depsolve_exclusive:
#self.resolveDeps()
#else:
- #(self.resolved_deps,self.final_pkgobjs) = revisor.misc.resolve_dependencies_ugly(self, resolved_deps=self.resolved_deps, final_pkgobjs=self.final_pkgobjs)
+ #(self.resolved_deps,self.final_pkgobjs) = revisor.misc.resolve_dependencies_inclusive(self, resolved_deps=self.resolved_deps, final_pkgobjs=self.final_pkgobjs)
def exec_transaction(self, callback=None):
if not callback:
commit b2e4e62cc7857f3ac32931d89d3b5247d3766d60
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Fri Dec 12 16:29:35 2008 +0100
Use the new revisor.misc.return_pkg_tuple() function
Use the renamed resolve_dependencies_inclusive function
diff --git a/revisor/base.py b/revisor/base.py
index 2c11ddb..6c7e0fb 100644
--- a/revisor/base.py
+++ b/revisor/base.py
@@ -96,7 +96,7 @@ class RevisorBase:
self.cfg.setup_yum()
self.cfg.setup_ks()
-
+
def run(self):
"""Split into either running CLI, Server, Hub or GUI"""
if self.cfg.cli_mode:
@@ -564,43 +564,10 @@ class RevisorBase:
if self.cfg.ksobj._get("packages","handleMissing") != kickstart.constants.KS_MISSING_IGNORE:
warnings.append(e.value)
# Here's where we try and see if this is a rpm -qa list
- elif re.match('.*-.*-.*\..*', pkg):
- # This format can have two forms:
- # name-ver-release.arch
- # name-ver-release
-
- # The first thing we need to get is the name and ver.
- # This is relatively easy
- (name, ver, relarch) = pkg.rsplit('-', 2)
-
- # For the latter part however (release.arch or release)...
- try:
- # Try splitting rel.disttag.arch
- (rel, dist, arch) = relarch.rsplit('.', 2)
- except ValueError:
- # Failed... :/
- # So, is this rel.arch? or rel.disttag?
-
- # Let's try and split on .
- # If it errors, we only have the release
- # If it's OK, we either have rel, arch, or rel, disttag
-
- try:
- (foo, bar) = relarch.split('.', 2)
- # Now that we've split, see if bar is an arch or a disttag
- if rpmUtils.arch.arches.has_key(bar):
- arch = bar
- else:
- arch = None
- # If we didn't find a valid architecture, then
- # bar is part of the release (e.g. disttag)
- rel = "%s.%s" % (foo, bar)
-
- except ValueError:
- # Apparently our string only holds the release
- rel = relarch
+ elif re.match('.*-.*-.*', pkg):
+ (name, epoch, ver, rel, arch) = revisor.misc.return_pkg_tuple(pkg)
- pkgs = self.cfg.yumobj.pkgSack.searchNevra(name=name, ver=ver, rel=rel, arch=arch)
+ pkgs = self.cfg.yumobj.pkgSack.searchNevra(name=name, epoch=epoch, ver=ver, rel=rel, arch=arch)
if len(pkgs) > 1:
warnings.append(_("More then one package found for %s-%s-%s.%s - going to add them all to the transaction") % (name,ver,rel,arch))
elif len(pkgs) < 1:
@@ -878,7 +845,7 @@ class RevisorBase:
# Hook in modrebrand to replace fedora-logos
self.cfg.plugins.exec_hook("pre_resolve_dependencies")
- revisor.misc.resolve_dependencies_ugly(self.cfg.yumobj, logger=self.log, pbar=pbar)
+ revisor.misc.resolve_dependencies_inclusive(self.cfg.yumobj, logger=self.log, pbar=pbar)
# Hook in modrebrand to replace fedora-logos
self.cfg.plugins.exec_hook("post_resolve_dependencies")
commit 481acf340bd9a341c3ea91fce8715fa7f5b5149c
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Fri Dec 12 16:28:28 2008 +0100
Rename resolve_dependencies_ugly to resolve_dependencies_inclusive
Add return_pkg_tuple which parses a string and returns a (n, e, v, r, a) tuple
diff --git a/revisor/misc.py b/revisor/misc.py
index f2b7045..38b9834 100644
--- a/revisor/misc.py
+++ b/revisor/misc.py
@@ -19,7 +19,9 @@
import logging
import os
+import re
import revisor
+import rpmUtils.arch
import socket
import sys
import urlgrabber
@@ -145,7 +147,7 @@ def resolve_pkgs(yumobj, package_list, log=None):
return final_package_list
-def resolve_dependencies_ugly(yumobj, logger=None, pbar=None, resolved_deps={}, final_pkgobjs={}):
+def resolve_dependencies_inclusive(yumobj, logger=None, pbar=None, resolved_deps={}, final_pkgobjs={}):
def get_package_deps(po, logger=None):
"""Add the dependencies for a given package to the
transaction info"""
@@ -213,6 +215,12 @@ def resolve_dependencies_ugly(yumobj, logger=None, pbar=None, resolved_deps={},
#yumobj.tsInfo.makelists()
def get_repourls(yumobj):
+ """
+ From a yum object, extract the repository URLs for repositories
+ that are enabled.
+
+ Returns a tuple of lists, baseurls and mirrorlists
+ """
repository_baseurls = []
repository_mirrorlists = []
for repo in yumobj.repos.listEnabled():
@@ -244,7 +252,87 @@ def get_repourls(yumobj):
return (repository_baseurls,repository_mirrorlists)
+def return_pkg_tuple(pkg):
+ """
+ Given a package name (string), resolve the following forms to a package tuple:
+ - name-version-release.disttag.arch
+ - name-version-release.disttag
+ - name-version-release.arch
+ - name-version-release
+
+ Returns a (name, epoch, version, release, arch) tuple
+ """
+
+ name = None
+ epoch = None
+ version = None
+ release = None
+ arch = None
+
+ # We only accept strings
+ if not isinstance(pkg, str):
+ return
+
+ print "Input: %s" % pkg
+
+ # First of all, the package must match the following regexp:
+ # FIXME: Tweak this regexp
+ if re.match('.*-.*-.*', pkg):
+
+ # The first thing we need to get is the name and ver.
+ # This is relatively easy
+ (name, version, reldistarch) = pkg.rsplit('-', 2)
+
+ # version can still hold the epoch, as can name
+ try:
+ (epoch, version) = version.split(':', 1)
+ except ValueError:
+ try:
+ (epoch, name) = name.split(':', 1)
+ except ValueError:
+ epoch = None
+
+
+ # Now, for the reldistarch part,
+ try:
+ # Try splitting rel.disttag.arch
+ (rel, dist, arch) = reldistarch.rsplit('.', 2)
+ if rpmUtils.arch.arches.has_key(arch) or arch == "noarch":
+ # We have a winner!
+ release = "%s.%s" % (rel, dist)
+ else:
+ # Apparently there's a dot in the release :/
+ release = reldistarch
+ arch = None
+
+ except ValueError:
+ # Failed, so..., is this rel.arch? or rel.disttag?
+ # Let's try and split on .
+ # If it errors, we only have the release
+ # If it's OK, we either have rel, arch, or rel, disttag
+
+ try:
+ (foo, bar) = reldistarch.rsplit('.', 2)
+ # Now that we've split, see if bar is an arch or a disttag
+ if rpmUtils.arch.arches.has_key(bar) or arch == "noarch":
+ arch = bar
+ else:
+ arch = None
+ # If we didn't find a valid architecture, then
+ # bar is part of the release (e.g. disttag)
+ release = "%s.%s" % (foo, bar)
+
+ except ValueError:
+ # Apparently our string only holds the release
+ release = reldistarch
+
+ return (name, epoch, version, release, arch)
+
def size_me(val):
+ """
+ Given a value, convert it to a humanly readible format
+ Returns a tuple of (quantity, unit), e.g. (0, "KB")
+ """
ret_val = int(val)
units = [ "B", "kB", "MB", "GB", "TB" ]
while ret_val > 1024:
15 years, 5 months
- 1
- 0
5 commits - revisor/base.py revisor/__init__.py.in revisor/modhub revisor.spec.in
by Jeroen van Meeuwen
revisor.spec.in | 30 +++++++++
revisor/__init__.py.in | 11 ++-
revisor/base.py | 60 ++++++++++++++----
revisor/modhub/__init__.py | 144 +++++++++++++++++++++------------------------
4 files changed, 154 insertions(+), 91 deletions(-)
New commits:
commit af900dff2640b595948c4c9d7d365a0edd99c047
Merge: c5cfa1d... e708908...
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Fri Dec 12 15:47:26 2008 +0100
Merge branch 'master' of ssh://git.fedorahosted.org/git/revisor
Conflicts:
revisor/base.py
revisor/modhub/__init__.py
diff --cc revisor/base.py
index 34adcbd,e797c9b..2c11ddb
--- a/revisor/base.py
+++ b/revisor/base.py
@@@ -96,24 -96,27 +96,24 @@@ class RevisorBase
self.cfg.setup_yum()
self.cfg.setup_ks()
-
- def run(self):
- """Split into either running CLI, Server or GUI"""
+
+ def run(self):
+ """Split into either running CLI, Server, Hub or GUI"""
if self.cfg.cli_mode:
- import revisor.cli
self.log.debug(_("Running Revisor in CLI mode..."), level=1)
+ import revisor.cli
self.cli = revisor.cli.RevisorCLI(self)
self.cli.run()
- #not optimal yet
- # TODO: remove redundant code
- elif hasattr(self.cfg,"hub_mode"):
+ elif hasattr(self.cfg,"server_mode") or hasattr(self.cfg."hub_mode"):
+ # Check hub_mode,
+ # Then check server_mode,
+ # If we have both attributes, but none is set, fall back to GUI mode
if self.cfg.hub_mode:
self.log.debug(_("Running Revisor in Hub mode..."), level=1)
- self.server = self.plugins.modhub
- self.server.run(base=self)
- elif self.cfg.gui_mode:
- self.log.debug(_("Running Revisor in GUI mode..."), level=1)
- self.gui = self.plugins.modgui
- self.gui.run(base=self)
- elif hasattr(self.cfg,"server_mode"):
- if self.cfg.server_mode:
+ self.hub = self.plugins.modhub
+ self.cfg.gui_mode = False #hack!
+ self.hub.run(base=self)
+ elif self.cfg.server_mode:
self.log.debug(_("Running Revisor in RPC Server mode..."), level=1)
self.server = self.plugins.modserver
self.server.run(base=self)
diff --cc revisor/modhub/__init__.py
index 85d8937,7b20883..24abc51
--- a/revisor/modhub/__init__.py
+++ b/revisor/modhub/__init__.py
@@@ -90,17 -89,24 +90,19 @@@ class RevisorHub()
class RevisorXMLRPCInterface(object):
""" Functionality to expose to the XML-RPC interface. """
- def __init__(self, cfg):
- try:
- if cfg:
- self.cfg = cfg
- else:
- # FIXME: Initialize ConfigStore or return Error
- pass
- except NameError:
- pass
-
- self.sessions = dict()
- #self.next_session = 0
- pass
-
- def session_set_status(self, id, status):
- self.sessions[sid].set_status(id, status)
- return 1
+ def __init__(self, cfg=None):
- #if cfg == None:
- # FIXME: Initialize ConfigStore or return Error
- #pass
- #else:
- #self.cfg = cfg
-
- #self.sessions = dict()
- #self.next_session = 0
- pass
++ try:
++ if cfg:
++ self.cfg = cfg
++ else:
++ # FIXME: Initialize ConfigStore or return Error
++ pass
++ except NameError:
++ pass
++ self.sessions = dict()
++ self.next_session = 0
++ pass
class Session(object):
def __init__(self, id):
commit c5cfa1d3881e0359f4f9a629cd83f85f7ad416b1
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Fri Dec 12 15:43:39 2008 +0100
Add a stuff for packaging modhub
diff --git a/revisor.spec.in b/revisor.spec.in
index acf87f2..12f0901 100644
--- a/revisor.spec.in
+++ b/revisor.spec.in
@@ -3,6 +3,7 @@
%define pkg_cobbler 1
%define pkg_comps 1
%define pkg_delta 0
+%define pkg_hub 0
%define pkg_isolinux 1
%define pkg_jigdo 0
%define pkg_rebrand 0
@@ -71,6 +72,9 @@ Obsoletes: revisor-cobbler
%if ! %{pkg_delta}
Obsoletes: revisor-delta
%endif
+%if ! %{pkg_hub}
+Obsoletes: revisor-hub
+%endif
%if ! %{pkg_isolinux}
Obsoletes: revisor-isolinux
%endif
@@ -156,6 +160,19 @@ Requires: system-config-kickstart
This is the Revisor GUI package
##
+## Revisor HUB plugin
+##
+%if %{pkg_hub}
+%package hub
+Summary: Revisor Hub for build farms
+Group: Applications/System
+Requires: revisor-cli = %{version}-%{release}
+
+%description hub
+Revisor build farms need a hub. This is it.
+%endif
+
+##
## Revisor customize isolinux.cfg
##
%if %{pkg_isolinux}
@@ -288,6 +305,10 @@ make install DESTDIR=$RPM_BUILD_ROOT
rm -rf %{buildroot}/%{python_sitelib}/revisor/moddelta
%endif
+%if ! %{pkg_hub}
+ rm -rf %{buildroot}/%{python_sitelib}/revisor/modhub
+%endif
+
%if ! %{pkg_isolinux}
rm -rf %{buildroot}/%{python_sitelib}/revisor/modisolinux
%endif
@@ -392,6 +413,15 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/pixmaps/*
%{_datadir}/applications/*.desktop
+%if %{pkg_hub}
+%files hub
+%defattr(-,root,root,-)
+%dir %{python_sitelib}/revisor/modhub
+%{python_sitelib}/revisor/modhub/*.py
+%{python_sitelib}/revisor/modhub/*.pyc
+%{python_sitelib}/revisor/modhub/*.pyo
+%endif
+
%if %{pkg_isolinux}
%files isolinux
%defattr(-,root,root,-)
commit 8163c9544889e17f6ef53cd55c173e07b50100b6
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Fri Dec 12 15:42:29 2008 +0100
Enhance the package nevr/nevra resolution by determining whether we have complete nevr(a)
in the following forms:
- name-version-release.disttag.arch
- name-version-release.arch
- name-version-release.disttag
- name-version-release
diff --git a/revisor/base.py b/revisor/base.py
index 1bc9efe..34adcbd 100644
--- a/revisor/base.py
+++ b/revisor/base.py
@@ -27,7 +27,7 @@ import time
import math
import re
import revisor
-import rpmUtils.miscutils
+import rpmUtils.arch
import shutil
import fnmatch
import yum
@@ -563,10 +563,43 @@ class RevisorBase:
except yum.Errors.PackageSackError, e:
if self.cfg.ksobj._get("packages","handleMissing") != kickstart.constants.KS_MISSING_IGNORE:
warnings.append(e.value)
- # Here's where we try and see if this is a rpm -qa list
+ # Here's where we try and see if this is a rpm -qa list
elif re.match('.*-.*-.*\..*', pkg):
+ # This format can have two forms:
+ # name-ver-release.arch
+ # name-ver-release
+
+ # The first thing we need to get is the name and ver.
+ # This is relatively easy
(name, ver, relarch) = pkg.rsplit('-', 2)
- (rel, arch) = relarch.rsplit('.', 1)
+
+ # For the latter part however (release.arch or release)...
+ try:
+ # Try splitting rel.disttag.arch
+ (rel, dist, arch) = relarch.rsplit('.', 2)
+ except ValueError:
+ # Failed... :/
+ # So, is this rel.arch? or rel.disttag?
+
+ # Let's try and split on .
+ # If it errors, we only have the release
+ # If it's OK, we either have rel, arch, or rel, disttag
+
+ try:
+ (foo, bar) = relarch.split('.', 2)
+ # Now that we've split, see if bar is an arch or a disttag
+ if rpmUtils.arch.arches.has_key(bar):
+ arch = bar
+ else:
+ arch = None
+ # If we didn't find a valid architecture, then
+ # bar is part of the release (e.g. disttag)
+ rel = "%s.%s" % (foo, bar)
+
+ except ValueError:
+ # Apparently our string only holds the release
+ rel = relarch
+
pkgs = self.cfg.yumobj.pkgSack.searchNevra(name=name, ver=ver, rel=rel, arch=arch)
if len(pkgs) > 1:
warnings.append(_("More then one package found for %s-%s-%s.%s - going to add them all to the transaction") % (name,ver,rel,arch))
commit 6b8094429e077ddca46a9a872ea148fdf564dc7a
Author: Mads Kiilerich <mads(a)kiilerich.com>
Date: Fri Dec 12 14:43:54 2008 +0100
Return non-zero error code in case of error
diff --git a/revisor/__init__.py.in b/revisor/__init__.py.in
index 13ad690..73fe257 100644
--- a/revisor/__init__.py.in
+++ b/revisor/__init__.py.in
@@ -436,15 +436,20 @@ class Revisor:
def run(self):
"""Run Forest, RUN!"""
+
+ exitcode = 0
+
try:
self.base.run()
+ except SystemExit:
+ pass
except KeyboardInterrupt:
+ exitcode = 1
self.base.log.info(_("Interrupted by user"))
# except TypeError, e:
# self.log.error(_("Type Error: %s") % e)
- except SystemExit:
- pass
except:
+ exitcode = 2
traceback.print_exc()
print >> sys.stderr, _("Traceback occurred, please report a bug at http://fedorahosted.org/revisor")
finally:
@@ -462,3 +467,5 @@ class Revisor:
for dir in ["revisor-yumcache"]:
if os.access(os.path.join(self.base.cfg.working_directory, dir), os.R_OK):
shutil.rmtree(os.path.join(self.base.cfg.working_directory, dir))
+
+ sys.exit(exitcode)
\ No newline at end of file
commit efe46471a01aedd2c1bd8ae4f93e8c08ef1af001
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Fri Dec 12 14:17:13 2008 +0100
Fix the indentation. Use 4 spaces to a tab
diff --git a/revisor/base.py b/revisor/base.py
index 0348035..1bc9efe 100644
--- a/revisor/base.py
+++ b/revisor/base.py
@@ -104,21 +104,29 @@ class RevisorBase:
self.log.debug(_("Running Revisor in CLI mode..."), level=1)
self.cli = revisor.cli.RevisorCLI(self)
self.cli.run()
- elif hasattr(self.cfg,"server_mode"):
- # added hubmode
- if self.cfg.hub_mode:
- self.log.debug(_("Running Revisor in Hub mode..."), level=1)
- self.server = self.plugins.modhub
- self.cfg.gui_mode = False #hack!
- self.server.run(base=self)
- elif self.cfg.server_mode:
- self.log.debug(_("Running Revisor in RPC Server mode..."), level=1)
- self.server = self.plugins.modserver
- self.server.run(base=self)
- elif self.cfg.gui_mode:
- self.log.debug(_("Running Revisor in GUI mode..."), level=1)
- self.gui = self.plugins.modgui
- self.gui.run(base=self)
+ elif hasattr(self.cfg,"server_mode") or hasattr(self.cfg."hub_mode"):
+ # Check hub_mode,
+ # Then check server_mode,
+ # If we have both attributes, but none is set, fall back to GUI mode
+ if self.cfg.hub_mode:
+ self.log.debug(_("Running Revisor in Hub mode..."), level=1)
+ self.hub = self.plugins.modhub
+ self.cfg.gui_mode = False #hack!
+ self.hub.run(base=self)
+ elif self.cfg.server_mode:
+ self.log.debug(_("Running Revisor in RPC Server mode..."), level=1)
+ self.server = self.plugins.modserver
+ self.server.run(base=self)
+ elif self.cfg.gui_mode:
+ self.log.debug(_("Running Revisor in GUI mode..."), level=1)
+ self.gui = self.plugins.modgui
+ self.gui.run(base=self)
+
+ # And, finally, fall back to GUI mode
+ elif self.cfg.gui_mode:
+ self.log.debug(_("Running Revisor in GUI mode..."), level=1)
+ self.gui = self.plugins.modgui
+ self.gui.run(base=self)
def create_logger(self):
"""Create a logger instance using cli_options.debuglevel"""
diff --git a/revisor/modhub/__init__.py b/revisor/modhub/__init__.py
index 4af145c..85d8937 100644
--- a/revisor/modhub/__init__.py
+++ b/revisor/modhub/__init__.py
@@ -12,94 +12,94 @@ import os
#import logger.Logger
class RevisorHub():
- """ Hub Mode """
-
- def __init__(self):
- # blaat
- print "HELLO HUB!!!!!!!"
-
- def do_xmlrpc(self, cfg):
- """ Get our xmlrpc hub running. """
- xinterface = RevisorXMLRPCInterface(cfg)
- hub = RevisorXMLRPCServer(('', int(cfg.hub_port)))
- hub.register_introspection_functions()
- cfg.log.info("XMLRPC Server running on port %s" % cfg.hub_port)
- hub.register_instance(xinterface)
- while True:
- try:
- hub.serve_forever()
- except IOError:
- # interrupted? try to serve again
- time.sleep(0.5)
-
- def run(self, base):
- print "HUB mode started!"
- if base.cfg.fork_mode:
- pid = os.fork()
- self.do_xmlrpc(base.cfg)
- else:
- try:
- self.do_xmlrpc(base.cfg)
- pass
- except KeyboardInterrupt:
+ """ Hub Mode """
+
+ def __init__(self):
+ # blaat
+ print "HELLO HUB!!!!!!!"
+
+ def do_xmlrpc(self, cfg):
+ """ Get our xmlrpc hub running. """
+ xinterface = RevisorXMLRPCInterface(cfg)
+ hub = RevisorXMLRPCServer(('', int(cfg.hub_port)))
+ hub.register_introspection_functions()
+ cfg.log.info("XMLRPC Server running on port %s" % cfg.hub_port)
+ hub.register_instance(xinterface)
+ while True:
+ try:
+ hub.serve_forever()
+ except IOError:
+ # interrupted? try to serve again
+ time.sleep(0.5)
+
+ def run(self, base):
+ print "HUB mode started!"
+ if base.cfg.fork_mode:
+ pid = os.fork()
+ self.do_xmlrpc(base.cfg)
+ else:
+ try:
+ self.do_xmlrpc(base.cfg)
+ pass
+ except KeyboardInterrupt:
#base.log.info("Shutting down...")
- pass
-
- def add_options(self, parser):
- modhub_group = parser.add_option_group("Hub Options")
- modhub_group.add_option( "--hub",
+ pass
+
+ def add_options(self, parser):
+ modhub_group = parser.add_option_group("Hub Options")
+ modhub_group.add_option( "--hub",
dest = "hub_mode",
action = "store_true",
default = False,
help = _("Use the Hub mode for distributed composing."))
- modhub_group.add_option( "--hub-port",
+ modhub_group.add_option( "--hub-port",
dest = "hub_port",
action = "store",
default = "9321",
help = _("Port to start Hub mode on."),
metavar = "[hub-port]")
- modhub_group.add_option("--forkhub",
- dest = "forkhub_mode",
- action = "store",
- default = False,
- help = _("Start the Hub mode and fork."),
- metavar = "[boolean]")
-
- #def check_options(self, cfg, cli_options):
+ modhub_group.add_option("--forkhub",
+ dest = "forkhub_mode",
+ action = "store",
+ default = False,
+ help = _("Start the Hub mode and fork."),
+ metavar = "[boolean]")
+
+ #def check_options(self, cfg, cli_options):
# Cheater! Found a cheater!
- #print cli_options.server_mode
+ #print cli_options.server_mode
#if cli_options.server_mode:
- #cfg.server_mode = False
- #cfg.hub_mode = True
+ #cfg.server_mode = False
+ #cfg.hub_mode = True
#cfg.gui_mode = False
#cfg.cli_mode = False
- #print "blaat"
+ #print "blaat"
#pass
-
- def set_defaults(self, defaults):
- #defaults.db_server = x.x.x.x
- #defaults.db_type = mysql #for later development
- #defaults.setport = "3306"
- #defaults.username = "blaat"
- #defaults.password = "pass"
- #defaults.dbname = "revisor-hubdb"
- #defaults.configfile = "blaat"
- pass
+
+ def set_defaults(self, defaults):
+ #defaults.db_server = x.x.x.x
+ #defaults.db_type = mysql #for later development
+ #defaults.setport = "3306"
+ #defaults.username = "blaat"
+ #defaults.password = "pass"
+ #defaults.dbname = "revisor-hubdb"
+ #defaults.configfile = "blaat"
+ pass
class RevisorXMLRPCInterface(object):
""" Functionality to expose to the XML-RPC interface. """
def __init__(self, cfg=None):
- #if cfg == None:
+ #if cfg == None:
# FIXME: Initialize ConfigStore or return Error
#pass
#else:
- #self.cfg = cfg
-
+ #self.cfg = cfg
+
#self.sessions = dict()
#self.next_session = 0
- pass
+ pass
class Session(object):
15 years, 5 months
- 1
- 0
hub-demo.py revisor/base.py revisor/modhub
by Kees Scherpenhuijzen
Rebased ref, commits from common ancestor:
commit e708908e48381cdd114c8d6cf26a295c7af2b481
Author: noik <noik00(a)gmail.com>
Date: Fri Dec 12 15:31:03 2008 +0100
Added hub-demo.py for testing hub functions(not complete)
changed base.py for starting the hubmode
Added some "to-be-implemented"-methods for further programming, and visualizing the concept, and fixed the indentations.
diff --git a/hub-demo.py b/hub-demo.py
new file mode 100755
index 0000000..14208e7
--- /dev/null
+++ b/hub-demo.py
@@ -0,0 +1,23 @@
+#! /usr/bin/python
+
+#This is a demo of the server
+#to use it, run this in interactive mode (python -i)
+# and your environment will have a connection variable
+
+from revisor.client import *
+
+con = Connection("http://localhost:9321")
+
+#print dir(con)
+
+print con.con.system.listMethods()
+
+session = con.con.session_set_status(1, "POEP!!!!")
+
+#con.con.session_set_configuration(session)
+#con.con.session_set_model(session, "f9-i386")
+#con.con.session_set_kickstart(session, "/etc/revisor/conf.d/sample-ks.cfg")
+
+#con.con.session_start_compose(session)
+
+#con.con.session_delete_session(session)
diff --git a/revisor/base.py b/revisor/base.py
index 0348035..e797c9b 100644
--- a/revisor/base.py
+++ b/revisor/base.py
@@ -96,29 +96,40 @@ class RevisorBase:
self.cfg.setup_yum()
self.cfg.setup_ks()
-
- def run(self):
- """Split into either running CLI, Server or GUI"""
+
+ def run(self):
+ """Split into either running CLI, Server, Hub or GUI"""
if self.cfg.cli_mode:
- import revisor.cli
self.log.debug(_("Running Revisor in CLI mode..."), level=1)
+ import revisor.cli
self.cli = revisor.cli.RevisorCLI(self)
self.cli.run()
+ #not optimal yet
+ # TODO: remove redundant code
+ elif hasattr(self.cfg,"hub_mode"):
+ if self.cfg.hub_mode:
+ self.log.debug(_("Running Revisor in Hub mode..."), level=1)
+ self.server = self.plugins.modhub
+ self.server.run(base=self)
+ elif self.cfg.gui_mode:
+ self.log.debug(_("Running Revisor in GUI mode..."), level=1)
+ self.gui = self.plugins.modgui
+ self.gui.run(base=self)
elif hasattr(self.cfg,"server_mode"):
- # added hubmode
- if self.cfg.hub_mode:
- self.log.debug(_("Running Revisor in Hub mode..."), level=1)
- self.server = self.plugins.modhub
- self.cfg.gui_mode = False #hack!
- self.server.run(base=self)
- elif self.cfg.server_mode:
- self.log.debug(_("Running Revisor in RPC Server mode..."), level=1)
- self.server = self.plugins.modserver
- self.server.run(base=self)
- elif self.cfg.gui_mode:
- self.log.debug(_("Running Revisor in GUI mode..."), level=1)
- self.gui = self.plugins.modgui
- self.gui.run(base=self)
+ if self.cfg.server_mode:
+ self.log.debug(_("Running Revisor in RPC Server mode..."), level=1)
+ self.server = self.plugins.modserver
+ self.server.run(base=self)
+ elif self.cfg.gui_mode:
+ self.log.debug(_("Running Revisor in GUI mode..."), level=1)
+ self.gui = self.plugins.modgui
+ self.gui.run(base=self)
+
+ elif self.cfg.gui_mode:
+ self.log.debug(_("Running Revisor in GUI mode..."), level=1)
+ self.gui = self.plugins.modgui
+ self.gui.run(base=self)
+
def create_logger(self):
"""Create a logger instance using cli_options.debuglevel"""
diff --git a/revisor/modhub/__init__.py b/revisor/modhub/__init__.py
index 4af145c..7b20883 100644
--- a/revisor/modhub/__init__.py
+++ b/revisor/modhub/__init__.py
@@ -15,8 +15,7 @@ class RevisorHub():
""" Hub Mode """
def __init__(self):
- # blaat
- print "HELLO HUB!!!!!!!"
+ pass
def do_xmlrpc(self, cfg):
""" Get our xmlrpc hub running. """
@@ -90,22 +89,35 @@ class RevisorHub():
class RevisorXMLRPCInterface(object):
""" Functionality to expose to the XML-RPC interface. """
- def __init__(self, cfg=None):
- #if cfg == None:
- # FIXME: Initialize ConfigStore or return Error
- #pass
- #else:
- #self.cfg = cfg
-
- #self.sessions = dict()
+ def __init__(self, cfg):
+ try:
+ if cfg:
+ self.cfg = cfg
+ else:
+ # FIXME: Initialize ConfigStore or return Error
+ pass
+ except NameError:
+ pass
+
+ self.sessions = dict()
#self.next_session = 0
pass
+
+ def session_set_status(self, id, status):
+ self.sessions[sid].set_status(id, status)
+ return 1
class Session(object):
def __init__(self, id):
self.id = id
- print "Session initted & ended"
+ print "Hub session initted"
+ self.revisor = HubMode()
+
+ def set_status(self, id, status):
+ if id == self.id:
+ self.revisor.set_status(id, status)
+ pass
class RevisorXMLRPCServer(SimpleXMLRPCServer.SimpleXMLRPCServer):
@@ -113,3 +125,25 @@ class RevisorXMLRPCServer(SimpleXMLRPCServer.SimpleXMLRPCServer):
def __init__(self, args):
self.allow_reuse_address = True
SimpleXMLRPCServer.SimpleXMLRPCServer.__init__(self, args)
+
+
+class HubMode():
+ def __init__(self):
+ pass
+
+ def set_status(self, id, status):
+ print id
+ print status
+ pass
+
+ def db_get_ks():
+ pass
+
+ def check_jobs():
+ #check jobs in DB
+ #get KS from DB if any found
+ pass
+
+ def add_composer():
+ #function to add composer for distribution idea
+ pass
15 years, 5 months
- 1
- 0
revisor/__init__.py.in
by Jeroen van Meeuwen
revisor/__init__.py.in | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
New commits:
commit 6b8094429e077ddca46a9a872ea148fdf564dc7a
Author: Mads Kiilerich <mads(a)kiilerich.com>
Date: Fri Dec 12 14:43:54 2008 +0100
Return non-zero error code in case of error
diff --git a/revisor/__init__.py.in b/revisor/__init__.py.in
index 13ad690..73fe257 100644
--- a/revisor/__init__.py.in
+++ b/revisor/__init__.py.in
@@ -436,15 +436,20 @@ class Revisor:
def run(self):
"""Run Forest, RUN!"""
+
+ exitcode = 0
+
try:
self.base.run()
+ except SystemExit:
+ pass
except KeyboardInterrupt:
+ exitcode = 1
self.base.log.info(_("Interrupted by user"))
# except TypeError, e:
# self.log.error(_("Type Error: %s") % e)
- except SystemExit:
- pass
except:
+ exitcode = 2
traceback.print_exc()
print >> sys.stderr, _("Traceback occurred, please report a bug at http://fedorahosted.org/revisor")
finally:
@@ -462,3 +467,5 @@ class Revisor:
for dir in ["revisor-yumcache"]:
if os.access(os.path.join(self.base.cfg.working_directory, dir), os.R_OK):
shutil.rmtree(os.path.join(self.base.cfg.working_directory, dir))
+
+ sys.exit(exitcode)
\ No newline at end of file
15 years, 5 months
- 1
- 0
Re: [revisor-devel] [Revisor-devel] [PATCH] Return non-zero error code in case of error
by Jeroen van Meeuwen
Makes perfect sense to me!
Kind regards,
Jeroen van Meeuwen
Mads Kiilerich wrote:
> # HG changeset patch
> # User mads(a)kiilerich.com
> # Date 1229020265 -3600
> # Node ID 26c4cc86538d7de0a09d15a1e95539e70b53c326
> # Parent 36114bf02705355529b9aaa796eb99ed4d3fdbcb
> Return non-zero error code in case of error
>
> diff --git a/revisor/__init__.py.in b/revisor/__init__.py.in
> --- a/revisor/__init__.py.in
> +++ b/revisor/__init__.py.in
> @@ -436,15 +436,18 @@
>
> def run(self):
> """Run Forest, RUN!"""
> + exitcode = 0
> try:
> self.base.run()
> + except SystemExit:
> + pass
> except KeyboardInterrupt:
> + exitcode = 1
> self.base.log.info(_("Interrupted by user"))
> # except TypeError, e:
> # self.log.error(_("Type Error: %s") % e)
> - except SystemExit:
> - pass
> except:
> + exitcode = 2
> traceback.print_exc()
> print >> sys.stderr, _("Traceback occurred, please report a bug at http://fedorahosted.org/revisor")
> finally:
> @@ -462,3 +465,4 @@
> for dir in ["revisor-yumcache"]:
> if os.access(os.path.join(self.base.cfg.working_directory, dir), os.R_OK):
> shutil.rmtree(os.path.join(self.base.cfg.working_directory, dir))
> + exit(exitcode)
> _______________________________________________
> Revisor-devel mailing list
> Revisor-devel(a)lists.fedoraunity.org
> http://lists.fedoraunity.org/mailman/listinfo/revisor-devel
15 years, 5 months
- 1
- 0
revisor/base.py revisor/modhub
by Jeroen van Meeuwen
revisor/base.py | 38 ++++++++-----
revisor/modhub/__init__.py | 124 ++++++++++++++++++++++-----------------------
2 files changed, 85 insertions(+), 77 deletions(-)
New commits:
commit efe46471a01aedd2c1bd8ae4f93e8c08ef1af001
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Fri Dec 12 14:17:13 2008 +0100
Fix the indentation. Use 4 spaces to a tab
diff --git a/revisor/base.py b/revisor/base.py
index 0348035..1bc9efe 100644
--- a/revisor/base.py
+++ b/revisor/base.py
@@ -104,21 +104,29 @@ class RevisorBase:
self.log.debug(_("Running Revisor in CLI mode..."), level=1)
self.cli = revisor.cli.RevisorCLI(self)
self.cli.run()
- elif hasattr(self.cfg,"server_mode"):
- # added hubmode
- if self.cfg.hub_mode:
- self.log.debug(_("Running Revisor in Hub mode..."), level=1)
- self.server = self.plugins.modhub
- self.cfg.gui_mode = False #hack!
- self.server.run(base=self)
- elif self.cfg.server_mode:
- self.log.debug(_("Running Revisor in RPC Server mode..."), level=1)
- self.server = self.plugins.modserver
- self.server.run(base=self)
- elif self.cfg.gui_mode:
- self.log.debug(_("Running Revisor in GUI mode..."), level=1)
- self.gui = self.plugins.modgui
- self.gui.run(base=self)
+ elif hasattr(self.cfg,"server_mode") or hasattr(self.cfg."hub_mode"):
+ # Check hub_mode,
+ # Then check server_mode,
+ # If we have both attributes, but none is set, fall back to GUI mode
+ if self.cfg.hub_mode:
+ self.log.debug(_("Running Revisor in Hub mode..."), level=1)
+ self.hub = self.plugins.modhub
+ self.cfg.gui_mode = False #hack!
+ self.hub.run(base=self)
+ elif self.cfg.server_mode:
+ self.log.debug(_("Running Revisor in RPC Server mode..."), level=1)
+ self.server = self.plugins.modserver
+ self.server.run(base=self)
+ elif self.cfg.gui_mode:
+ self.log.debug(_("Running Revisor in GUI mode..."), level=1)
+ self.gui = self.plugins.modgui
+ self.gui.run(base=self)
+
+ # And, finally, fall back to GUI mode
+ elif self.cfg.gui_mode:
+ self.log.debug(_("Running Revisor in GUI mode..."), level=1)
+ self.gui = self.plugins.modgui
+ self.gui.run(base=self)
def create_logger(self):
"""Create a logger instance using cli_options.debuglevel"""
diff --git a/revisor/modhub/__init__.py b/revisor/modhub/__init__.py
index 4af145c..85d8937 100644
--- a/revisor/modhub/__init__.py
+++ b/revisor/modhub/__init__.py
@@ -12,94 +12,94 @@ import os
#import logger.Logger
class RevisorHub():
- """ Hub Mode """
-
- def __init__(self):
- # blaat
- print "HELLO HUB!!!!!!!"
-
- def do_xmlrpc(self, cfg):
- """ Get our xmlrpc hub running. """
- xinterface = RevisorXMLRPCInterface(cfg)
- hub = RevisorXMLRPCServer(('', int(cfg.hub_port)))
- hub.register_introspection_functions()
- cfg.log.info("XMLRPC Server running on port %s" % cfg.hub_port)
- hub.register_instance(xinterface)
- while True:
- try:
- hub.serve_forever()
- except IOError:
- # interrupted? try to serve again
- time.sleep(0.5)
-
- def run(self, base):
- print "HUB mode started!"
- if base.cfg.fork_mode:
- pid = os.fork()
- self.do_xmlrpc(base.cfg)
- else:
- try:
- self.do_xmlrpc(base.cfg)
- pass
- except KeyboardInterrupt:
+ """ Hub Mode """
+
+ def __init__(self):
+ # blaat
+ print "HELLO HUB!!!!!!!"
+
+ def do_xmlrpc(self, cfg):
+ """ Get our xmlrpc hub running. """
+ xinterface = RevisorXMLRPCInterface(cfg)
+ hub = RevisorXMLRPCServer(('', int(cfg.hub_port)))
+ hub.register_introspection_functions()
+ cfg.log.info("XMLRPC Server running on port %s" % cfg.hub_port)
+ hub.register_instance(xinterface)
+ while True:
+ try:
+ hub.serve_forever()
+ except IOError:
+ # interrupted? try to serve again
+ time.sleep(0.5)
+
+ def run(self, base):
+ print "HUB mode started!"
+ if base.cfg.fork_mode:
+ pid = os.fork()
+ self.do_xmlrpc(base.cfg)
+ else:
+ try:
+ self.do_xmlrpc(base.cfg)
+ pass
+ except KeyboardInterrupt:
#base.log.info("Shutting down...")
- pass
-
- def add_options(self, parser):
- modhub_group = parser.add_option_group("Hub Options")
- modhub_group.add_option( "--hub",
+ pass
+
+ def add_options(self, parser):
+ modhub_group = parser.add_option_group("Hub Options")
+ modhub_group.add_option( "--hub",
dest = "hub_mode",
action = "store_true",
default = False,
help = _("Use the Hub mode for distributed composing."))
- modhub_group.add_option( "--hub-port",
+ modhub_group.add_option( "--hub-port",
dest = "hub_port",
action = "store",
default = "9321",
help = _("Port to start Hub mode on."),
metavar = "[hub-port]")
- modhub_group.add_option("--forkhub",
- dest = "forkhub_mode",
- action = "store",
- default = False,
- help = _("Start the Hub mode and fork."),
- metavar = "[boolean]")
-
- #def check_options(self, cfg, cli_options):
+ modhub_group.add_option("--forkhub",
+ dest = "forkhub_mode",
+ action = "store",
+ default = False,
+ help = _("Start the Hub mode and fork."),
+ metavar = "[boolean]")
+
+ #def check_options(self, cfg, cli_options):
# Cheater! Found a cheater!
- #print cli_options.server_mode
+ #print cli_options.server_mode
#if cli_options.server_mode:
- #cfg.server_mode = False
- #cfg.hub_mode = True
+ #cfg.server_mode = False
+ #cfg.hub_mode = True
#cfg.gui_mode = False
#cfg.cli_mode = False
- #print "blaat"
+ #print "blaat"
#pass
-
- def set_defaults(self, defaults):
- #defaults.db_server = x.x.x.x
- #defaults.db_type = mysql #for later development
- #defaults.setport = "3306"
- #defaults.username = "blaat"
- #defaults.password = "pass"
- #defaults.dbname = "revisor-hubdb"
- #defaults.configfile = "blaat"
- pass
+
+ def set_defaults(self, defaults):
+ #defaults.db_server = x.x.x.x
+ #defaults.db_type = mysql #for later development
+ #defaults.setport = "3306"
+ #defaults.username = "blaat"
+ #defaults.password = "pass"
+ #defaults.dbname = "revisor-hubdb"
+ #defaults.configfile = "blaat"
+ pass
class RevisorXMLRPCInterface(object):
""" Functionality to expose to the XML-RPC interface. """
def __init__(self, cfg=None):
- #if cfg == None:
+ #if cfg == None:
# FIXME: Initialize ConfigStore or return Error
#pass
#else:
- #self.cfg = cfg
-
+ #self.cfg = cfg
+
#self.sessions = dict()
#self.next_session = 0
- pass
+ pass
class Session(object):
15 years, 5 months
- 1
- 0