unity/scripts
by Jeroen van Meeuwen
unity/scripts/respin.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e3fe62550eef61bcd515f94c0b747c446beb3afa
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Thu Feb 18 12:04:25 2010 +0100
Update the authoritative location for the git repository
diff --git a/unity/scripts/respin.sh b/unity/scripts/respin.sh
index 7f7cd12..b13559c 100755
--- a/unity/scripts/respin.sh
+++ b/unity/scripts/respin.sh
@@ -46,7 +46,7 @@ NOTIFICATION_SUCCESS="test-team(a)lists.fedoraunity.org"
NOTIFICATION_FROMADD="kanarip(a)kanarip.com"
GIT_SPINKICKSTARTS=git://git.fedorahosted.org/spin-kickstarts.git
-GIT_REVISOR=git://git.kanarip.com/revisor
+GIT_REVISOR=git://git.fedorahosted.org/revisor
# The temp directory to use. Defaults to /tmp
#TMPDIR=/tmp
14 years, 2 months
- 1
- 0
unity/conf
by Jeroen van Meeuwen
unity/conf/f11-install-respin.conf | 1 -
unity/conf/f12-install-respin.conf | 1 -
2 files changed, 2 deletions(-)
New commits:
commit d263ac5c040f2b53bd25fb08d75aef6ab95d05a6
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Tue Feb 9 14:13:17 2010 +0100
Remove package sack excludes setting from f11 and f12 respin settings in unity configuration files
diff --git a/unity/conf/f11-install-respin.conf b/unity/conf/f11-install-respin.conf
index 8a321cf..0141fc7 100644
--- a/unity/conf/f11-install-respin.conf
+++ b/unity/conf/f11-install-respin.conf
@@ -17,7 +17,6 @@ dependency_resolve_allow_conflicts = 1
mode_respin = 1
kickstart_manifest = 1
-kickstart_uses_pkgsack_exclude = 1
copy_local = 1
diff --git a/unity/conf/f12-install-respin.conf b/unity/conf/f12-install-respin.conf
index 5cdbed2..a0e4ef4 100644
--- a/unity/conf/f12-install-respin.conf
+++ b/unity/conf/f12-install-respin.conf
@@ -17,7 +17,6 @@ dependency_resolve_allow_conflicts = 1
mode_respin = 1
kickstart_manifest = 1
-kickstart_uses_pkgsack_exclude = 1
copy_local = 1
14 years, 2 months
- 1
- 0
po/de.po
by Transifex System User
po/de.po | 281 +++++++++++++++++++++++++++++++--------------------------------
1 file changed, 142 insertions(+), 139 deletions(-)
New commits:
commit 962818738f1d8b59fca1b17fbdbf6c77fca435b0
Author: kenda <kenda(a)fedoraproject.org>
Date: Thu Feb 4 11:27:33 2010 +0000
Sending translation for German
diff --git a/po/de.po b/po/de.po
index 837a165..3aee925 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,16 +4,16 @@
#
# Fabian Affolter <fab(a)fedoraproject.org>, 2007-2009.
# Daniela Kugelmann <dkugelma(a)redhat.com >, 2008.
-# Marcus Nitzschke <kenda(a)fedoraproject.org>, 2009.
+# Marcus Nitzschke <kenda(a)fedoraproject.org>, 2009-2010.
#
msgid ""
msgstr ""
"Project-Id-Version: revisor.master.de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:20+0000\n"
-"PO-Revision-Date: 2009-11-15 00:48+0100\n"
-"Last-Translator: Fabian Affolter <fab(a)fedoraproject.org>\n"
-"Language-Team: German <i18(a)redhat.com>\n"
+"POT-Creation-Date: 2010-02-04 09:45+0000\n"
+"PO-Revision-Date: 2010-02-04 12:25+0100\n"
+"Last-Translator: Marcus Nitzschke <kenda(a)fedoraproject.org>\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"
@@ -1361,26 +1361,26 @@ msgid "Apparently we have not yet entered the Build Media stage"
msgstr "Offensichtlich wurde noch nicht die Build Media-Plattform geöffnet"
#: ../revisor/base.py:504
-#: ../revisor/misc.py:378
+#: ../revisor/misc.py:369
#, python-format
msgid "Checking dependencies for %s.%s"
msgstr "Abhängigkeiten auflösen für %s.%s"
#. pbar.cur_task += 1.0
#: ../revisor/base.py:526
-#: ../revisor/misc.py:411
+#: ../revisor/misc.py:402
#, python-format
msgid "Unresolvable dependency %s %s %s in %s.%s"
msgstr "Nicht auflösbare Abhängigkeit %s %s %s in %s.%s"
#: ../revisor/base.py:533
-#: ../revisor/misc.py:418
+#: ../revisor/misc.py:409
#, python-format
msgid "Added %s-%s:%s-%s.%s for %s-%s:%s-%s.%s (requiring %s %s %s)"
msgstr "Hinzugefügt %s-%s:%s-%s.%s für %s-%s:%s-%s.%s (benötigt %s %s %s)"
#: ../revisor/base.py:536
-#: ../revisor/misc.py:246
+#: ../revisor/misc.py:237
msgid "Checking dependencies - allowing conflicts within the package set"
msgstr "Prüfe Abhängigkeiten - erlaube Konflikte innerhalb des Paketsets"
@@ -1423,12 +1423,12 @@ msgstr ""
#. End of dependency resolving
#: ../revisor/base.py:612
-#: ../revisor/image.py:101
+#: ../revisor/image.py:109
msgid "Unable to build transaction"
msgstr "Bau-Transaktion konnte nicht erstellt werden."
#: ../revisor/base.py:617
-#: ../revisor/image.py:106
+#: ../revisor/image.py:114
#, python-format
msgid "Succesfully built transaction: ret %s, msg %s"
msgstr "Transaktion erfolgreich zusammengebaut: ret %s, msg %s"
@@ -1568,7 +1568,7 @@ msgstr "Bericht über die %d grössten Pakete"
#. Link the localPkg() result into the build tree
#: ../revisor/base.py:1074
-#: ../revisor/base.py:1781
+#: ../revisor/base.py:1783
msgid "Linking in binary packages"
msgstr "Verkettung in Binär-Paketen"
@@ -1625,25 +1625,25 @@ msgstr "Grösse des Installationsbaum ist %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:1266
+#: ../revisor/base.py:1268
msgid "Running pkgorder"
msgstr "pkgorder durchlaufen"
-#: ../revisor/base.py:1329
+#: ../revisor/base.py:1331
#, python-format
msgid "Running with grouplist: %r"
msgstr "Mit GruppenListe ausführen: %r"
-#: ../revisor/base.py:1332
+#: ../revisor/base.py:1334
#, python-format
msgid "Running with packagelist: %r"
msgstr "Mit Paketliste ausführen: %r"
-#: ../revisor/base.py:1339
+#: ../revisor/base.py:1341
msgid "Appending group core and base"
msgstr "Gruppe core und base hinzufügen"
-#: ../revisor/base.py:1363
+#: ../revisor/base.py:1365
#, python-format
msgid "Appending default groups %r"
msgstr "Standard-Gruppen %s werden hinzugefügt"
@@ -1651,7 +1651,7 @@ msgstr "Standard-Gruppen %s werden hinzugefügt"
#. Do not do this because the installer still has all the groups available
#. if group not in groupList:
#. continue
-#: ../revisor/base.py:1379
+#: ../revisor/base.py:1381
#, python-format
msgid "Appending non-default group %s"
msgstr "Nicht-Standard-Gruppe %s hinzufügen"
@@ -1659,43 +1659,43 @@ msgstr "Nicht-Standard-Gruppe %s hinzufügen"
#. Do not do this because the installer still has all the groups available
#. if group not in groupList:
#. continue
-#: ../revisor/base.py:1389
+#: ../revisor/base.py:1391
#, python-format
msgid "Appending non-default support group %s"
msgstr "Nicht-Standard-Unterstützungsgruppe %s hinzufügen"
-#: ../revisor/base.py:1455
+#: ../revisor/base.py:1457
#, python-format
msgid "Not running package ordering, using file %s instead"
msgstr "Paket-Auflistung nicht durchführen, deshalb Datei %s benutzen"
-#: ../revisor/base.py:1457
+#: ../revisor/base.py:1459
msgid "Not running package ordering"
msgstr "Paketsortierung nicht durchführen"
-#: ../revisor/base.py:1489
+#: ../revisor/base.py:1491
msgid "^Install using kickstart"
msgstr "^Installation mit Kickstart"
#. Split Tree
-#: ../revisor/base.py:1512
+#: ../revisor/base.py:1514
#, python-format
msgid "Splitting Build Tree (%s)"
msgstr "Build-Baum (%s) teilen"
#. Split repo
-#: ../revisor/base.py:1518
+#: ../revisor/base.py:1520
#, python-format
msgid "Splitting Repository (%s)"
msgstr "Repository (%s) teilen"
-#: ../revisor/base.py:1532
+#: ../revisor/base.py:1534
#: ../revisor/modgui/build_media.py:260
#, python-format
msgid "Creating %s ISO Image #%d"
msgstr "%s ISO-Abbild #%d erzeugen"
-#: ../revisor/base.py:1537
+#: ../revisor/base.py:1539
#: ../revisor/modgui/build_media.py:264
#, python-format
msgid "Creating %s ISO Image"
@@ -1703,50 +1703,50 @@ msgstr "%s ISO-Abbild erzeugen"
#. 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:1551
+#: ../revisor/base.py:1553
msgid "Implanting MD5 into ISO Images"
msgstr "MD5 in ISO-Abbildungen erzeugen"
#. mediatype = built_image["mediatype"]
#. if not mediatype == 'source':
-#: ../revisor/base.py:1559
+#: ../revisor/base.py:1561
#, python-format
msgid "Implanting md5 into ISO Image: %s"
msgstr "md5 in ISO-Abbild erzeugen: %s"
-#: ../revisor/base.py:1565
+#: ../revisor/base.py:1567
msgid "Cannot implant ISO md5sum"
msgstr "ISO md5sum kann nicht erzeugt werden"
#. Do some SHA1SUMMONING
-#: ../revisor/base.py:1573
+#: ../revisor/base.py:1575
msgid "Creating SHA1SUMs for Images"
msgstr "SHA1SUMs für Abbild erzeugen"
-#: ../revisor/base.py:1589
+#: ../revisor/base.py:1591
msgid "Creating Rescue ISO Image"
msgstr "Rettungs-ISO-Abbild erzeugen"
-#: ../revisor/base.py:1596
+#: ../revisor/base.py:1598
msgid "Creating USB Key Installer"
msgstr "USB-Stick-Installer erzeugen"
-#: ../revisor/base.py:1653
-#: ../revisor/base.py:1676
-#: ../revisor/base.py:1699
+#: ../revisor/base.py:1655
+#: ../revisor/base.py:1678
+#: ../revisor/base.py:1701
#, python-format
msgid "Copying %s to %s (%d files)"
msgstr "%s nach %s (%d Dateien) kopieren"
-#: ../revisor/base.py:1657
-#: ../revisor/base.py:1680
-#: ../revisor/base.py:1703
+#: ../revisor/base.py:1659
+#: ../revisor/base.py:1682
+#: ../revisor/base.py:1705
#, python-format
msgid "Moving %s to %s (%d files)"
msgstr "%s nach %s (%d Dateien) verschieben"
-#: ../revisor/base.py:1660
-#: ../revisor/base.py:1683
+#: ../revisor/base.py:1662
+#: ../revisor/base.py:1685
#, python-format
msgid ""
"Moving of the source tree failed (trying copy):\n"
@@ -1757,8 +1757,8 @@ msgstr ""
"\n"
"%s"
-#: ../revisor/base.py:1663
-#: ../revisor/base.py:1686
+#: ../revisor/base.py:1665
+#: ../revisor/base.py:1688
#, python-format
msgid ""
"Copying of the source tree failed:\n"
@@ -1769,7 +1769,7 @@ msgstr ""
"\n"
"%s"
-#: ../revisor/base.py:1706
+#: ../revisor/base.py:1708
#, python-format
msgid ""
"Moving of the installation tree failed (trying copy):\n"
@@ -1780,7 +1780,7 @@ msgstr ""
"\n"
"%s"
-#: ../revisor/base.py:1709
+#: ../revisor/base.py:1711
#, python-format
msgid ""
"Copying of the installation tree failed:\n"
@@ -1791,56 +1791,56 @@ msgstr ""
"\n"
"%s"
-#: ../revisor/base.py:1718
+#: ../revisor/base.py:1720
msgid "Creating ext3 filesystem"
msgstr "ext3-Dateisystem erzeugen"
-#: ../revisor/base.py:1725
+#: ../revisor/base.py:1727
msgid "Configuring System"
msgstr "System konfigurieren"
-#: ../revisor/base.py:1760
+#: ../revisor/base.py:1762
#, python-format
msgid "Copying copy_dir %s to install_root %s"
msgstr "copy_dir %s nach install_root %s kopieren"
-#: ../revisor/base.py:1769
+#: ../revisor/base.py:1771
#: ../revisor/pungi.py:404
#, python-format
msgid "Creating %s"
msgstr "%s erzeugen"
-#: ../revisor/base.py:1773
+#: ../revisor/base.py:1775
#: ../revisor/pungi.py:408
#, python-format
msgid "Copying %s to %s"
msgstr "%s zu %s kopieren"
-#: ../revisor/base.py:1792
+#: ../revisor/base.py:1794
msgid "Linking in Source packages"
msgstr "Verkettung in Quellen-Paketen"
-#: ../revisor/base.py:1820
+#: ../revisor/base.py:1822
#, python-format
msgid "Setting rundir to %s"
msgstr "rundir auf %s setzen"
-#: ../revisor/base.py:1826
+#: ../revisor/base.py:1828
#, python-format
msgid "Directory %s could not be created. Aborting"
msgstr "Verzeichnis %s kann nicht erzeugt werden. Abbruch"
-#: ../revisor/base.py:1828
+#: ../revisor/base.py:1830
#, python-format
msgid "Running command: %s"
msgstr "Befehl ausführen: %s"
-#: ../revisor/base.py:1829
+#: ../revisor/base.py:1831
#, python-format
msgid "Extra information: %s %s %s"
msgstr "Extra-Information: %s %s %s"
-#: ../revisor/base.py:1857
+#: ../revisor/base.py:1859
#, python-format
msgid "Got an error from %s (return code %s)"
msgstr "Einen Fehler von %s (return code %s) erhalten"
@@ -2159,45 +2159,47 @@ msgstr "Von Abbild ausführen"
msgid "Run from RAM - requires 1 GB+"
msgstr "Aus RAM laufen lassen - benötigt 1 GB+"
-#: ../revisor/image.py:91
+#: ../revisor/image.py:93
+msgid "Error encountered during installation of "
+msgstr "Es trat ein Fehler auf bei der Installation von "
+
+#: ../revisor/image.py:97
#, python-format
-msgid ""
-"Error encountered during installation of the software you selected:\n"
-"\n"
-"--> %s"
+msgid "An additional error in the error. The value of errs is: %s"
msgstr ""
-"Es trat ein Fehler auf bei der Installation der von Ihnen gewählten Software:\n"
-"\n"
-"--> %s"
-#: ../revisor/image.py:97
+#: ../revisor/image.py:98
+msgid "An error occurred during the installation "
+msgstr "Es trat ein Fehler auf bei der Installation"
+
+#: ../revisor/image.py:105
msgid "Running package installation"
msgstr "Paket-Installation ausführen"
-#: ../revisor/image.py:108
+#: ../revisor/image.py:116
msgid "Installing Software"
msgstr "Software installieren"
-#: ../revisor/image.py:143
+#: ../revisor/image.py:151
msgid "SELinux requested but not enabled on host"
msgstr "SELinux wird benötigt, ist aber nicht aktiviert auf dem Rechner"
-#: ../revisor/image.py:195
+#: ../revisor/image.py:203
#, python-format
msgid "Setting self.cfg.payload_livemedia to %s (from 'part /' command in kickstart, instead of %s)"
msgstr "self.cfg.payload_livemedia auf %s (vom 'part /'-Befehl in Kickstart anstatt von %s) setzen"
-#: ../revisor/image.py:199
+#: ../revisor/image.py:207
#, python-format
msgid "Setting self.cfg.payload_livemedia to %s (from total installed size of RPMs, instead of %s)"
msgstr "self.cfg.payload_livemedia auf %s (von der totalen Installationsgrösse der RPMs anstatt von %s) setzen"
-#: ../revisor/image.py:204
+#: ../revisor/image.py:212
#, python-format
msgid "Setting self.cfg.payload_livemedia to %s (from 'part /' command in kickstart, as per the respin mode)"
msgstr "self.cfg.payload_livemedia auf %s (vom 'part /'-Befehl in Kickstart, wie im respin-Modus) setzen"
-#: ../revisor/image.py:221
+#: ../revisor/image.py:229
#, python-format
msgid "Filesystem type set to: %s"
msgstr "Dateisystem-Typ gesetzt auf: %s"
@@ -2515,21 +2517,21 @@ msgstr "Gruppe nicht gefunden: %s"
#: ../revisor/kickstart.py:302
#: ../revisor/kickstart.py:330
-#: ../revisor/kickstart.py:714
+#: ../revisor/kickstart.py:717
#, python-format
msgid "Adding %s-%s:%s-%s.%s"
msgstr "Hinzu %s-%s:%s-%s.%s fügen"
#: ../revisor/kickstart.py:342
#: ../revisor/kickstart.py:606
-#: ../revisor/kickstart.py:725
+#: ../revisor/kickstart.py:728
#, python-format
msgid "From Excludes: Removing %s-%s:%s-%s.%s from transaction"
msgstr "Von Ausschluss: %s-%s:%s-%s.%s entfernen vor Übertragung"
#: ../revisor/kickstart.py:345
#: ../revisor/kickstart.py:609
-#: ../revisor/kickstart.py:728
+#: ../revisor/kickstart.py:731
#, python-format
msgid "Apparently trying to exclude a package that is not available in the repositories loaded, or hasn't been added to the transaction: %s"
msgstr "Offensichtlich wird gerade ein Paket entfernt das nicht in die Ablage geladen wurde oder nicht in die Transaktion hinzugefügt wurde: %s"
@@ -2602,7 +2604,7 @@ msgid "No include parameter for group %s, using defaults"
msgstr "Keine enthaltenen Parameter für Gruppe %s, beim Verwenden der Standarteinstellung"
#: ../revisor/kickstart.py:508
-#: ../revisor/kickstart.py:677
+#: ../revisor/kickstart.py:680
#: ../revisor/pkgorder.py:111
#, python-format
msgid "Testing condition: %s / %s"
@@ -2634,7 +2636,7 @@ msgid "Could not find package '%s', searching..."
msgstr "Konnte Paket nicht finden %s, suche..."
#: ../revisor/kickstart.py:559
-#: ../revisor/misc.py:210
+#: ../revisor/misc.py:201
#, python-format
msgid "Found packages matching '%s': %s"
msgstr "Fand Paketübereinstimmung '%s': %s"
@@ -2650,13 +2652,13 @@ msgid "More then one package found for %s-%s-%s.%s - going to add them all to th
msgstr "Mehr als ein Paket für %s-%s-%s.%s gefunden- diese werden alle bei der nächsten Transaktion hinzugefügt."
#: ../revisor/kickstart.py:583
-#: ../revisor/misc.py:224
+#: ../revisor/misc.py:215
#, python-format
msgid "Could not find package %s-%s-%s.%s"
msgstr "Konnte Paket nicht finden %s-%s-%s.%s"
#: ../revisor/kickstart.py:586
-#: ../revisor/misc.py:227
+#: ../revisor/misc.py:218
#, python-format
msgid "From Packages (exact string %s-%s-%s.%s), selecting %s-%s-%s.%s"
msgstr "Von den Paketen (extrahiere String %s-%s-%s.%s), wähle %s-%s-%s.%s"
@@ -2688,116 +2690,111 @@ msgstr "Abbruch! Abbruch! Abbruch!"
msgid "This tool has to run with root privileges. Aborting"
msgstr "Dieses Werkzeug muss mit root-Berechtigungen ausgeführt werden. Beende"
-#. SELinux in enforcing mode
-#: ../revisor/misc.py:53
-msgid "SELinux is in enforcing mode on this host. Composing media will fail. Please set SELinux to permissive mode."
-msgstr "SELinux ist im enforcing-Modus auf der Maschine. Das Erzeugen von Medien wird fehlschlagen. Bitte setzen Sie SELinux in den permissive-Modus."
-
-#: ../revisor/misc.py:58
+#: ../revisor/misc.py:49
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 SELinux either."
msgstr "SELinux ist auf diesem Rechner deaktiviert. Die zusammengesetzten Medien werden SELinux nicht enthalten und als Resultat das System, welches vom zusammengesetzen Medium installiert wird, auch nicht."
-#: ../revisor/misc.py:94
+#: ../revisor/misc.py:85
msgid "cfg parameter to revisor.misc.download_packages() "
msgstr "cfg-Parameter zu revisor.misc.download_packages() "
-#: ../revisor/misc.py:107
+#: ../revisor/misc.py:98
#, python-format
msgid "Using local copy of %s-%s-%s.%s at %s"
msgstr "Lokale Kopie von %s-%s-%s.%s unter %s benutzen"
-#: ../revisor/misc.py:117
+#: ../revisor/misc.py:108
msgid "Unable to find a suitable mirror."
msgstr "Es kann kein geeigneter Spiegel gefunden werden. "
-#: ../revisor/misc.py:129
+#: ../revisor/misc.py:120
#, python-format
msgid "Errors were encountered while downloading packages: %s"
msgstr "Beim Herunterladen der Pakete sind Fehler aufgetreten: %s"
-#: ../revisor/misc.py:197
-#: ../revisor/misc.py:235
+#: ../revisor/misc.py:188
+#: ../revisor/misc.py:226
#, python-format
msgid "Resolved %s"
msgstr "Aufgelöst %s"
-#: ../revisor/misc.py:222
+#: ../revisor/misc.py:213
#, python-format
msgid "More then one package found for %s-%s-%s.%s"
msgstr "Mehr als ein Paket für %s-%s-%s.%s gefunden"
-#: ../revisor/misc.py:238
+#: ../revisor/misc.py:229
#, python-format
msgid "Looking to resolve package %s to a Provides, but we still can't find it."
msgstr "Es wird versucht, das Paket %s als Bietet aufzulösen, es ist jedoch weiterhin nicht auffindbar."
-#: ../revisor/misc.py:250
+#: ../revisor/misc.py:241
#, python-format
msgid "Inclusive dependency resolving starts at %s"
msgstr "Abhängigkeitsauflösung eingeschlossen, startete am %s"
-#: ../revisor/misc.py:271
+#: ../revisor/misc.py:262
#, python-format
msgid "Inclusive dependency resolving ends at %s"
msgstr "Abhängigkeitsauflösung eingeschlossen, endete am %s"
-#: ../revisor/misc.py:319
+#: ../revisor/misc.py:310
#, python-format
msgid "Cannot find a source rpm for %s"
msgstr "Kann Quellen-RPM nicht finden für %s"
-#: ../revisor/misc.py:342
+#: ../revisor/misc.py:333
#, python-format
msgid "Disabling %s repository"
msgstr "%s-Repository deaktivieren"
-#: ../revisor/misc.py:357
+#: ../revisor/misc.py:348
#, python-format
msgid "No such repository: %s"
msgstr "Kein solches Repository: %s"
-#: ../revisor/misc.py:359
+#: ../revisor/misc.py:350
#, python-format
msgid "Enabling %s repository"
msgstr "%s-Repository aktivieren"
-#: ../revisor/misc.py:564
-#: ../revisor/misc.py:569
+#: ../revisor/misc.py:555
+#: ../revisor/misc.py:560
#, python-format
msgid "Creating destination directory: %s"
msgstr "Ziel-Verzeichnis erzeugen: %s"
-#: ../revisor/misc.py:567
+#: ../revisor/misc.py:558
#, python-format
msgid "Removing destination directory: %s"
msgstr "Ziel-Verzeichnis entfernen: %s"
-#: ../revisor/misc.py:581
+#: ../revisor/misc.py:572
#, python-format
msgid "Linking %s => %s"
msgstr "%s zu %s wird gelinkt"
-#: ../revisor/misc.py:584
+#: ../revisor/misc.py:575
#, python-format
msgid "Package hard link failed: %s: %s"
msgstr "Paket-Hardlink fehlgeschlagen: %s: %s"
-#: ../revisor/misc.py:589
+#: ../revisor/misc.py:580
#, python-format
msgid "Copying: %s to %s"
msgstr "Kopieren: %s zu %s"
-#: ../revisor/misc.py:592
+#: ../revisor/misc.py:583
#, python-format
msgid "Symlinking: %s to %s"
msgstr "Symlinking: %s zu %s"
-#: ../revisor/misc.py:595
+#: ../revisor/misc.py:586
msgid "Package symlink succeeded"
msgstr "Paket symlink erfolgreich"
-#: ../revisor/misc.py:597
-#: ../revisor/misc.py:604
+#: ../revisor/misc.py:588
+#: ../revisor/misc.py:595
#, python-format
msgid "Package link failed, trying copy: %s: %s"
msgstr "Paket-Link fehlgeschlagen, versuche zu kopieren: %s: %s"
@@ -2908,7 +2905,7 @@ msgstr "Keine Prüfoptionen für Plugin %s: Keine Funktion 'check_options()'"
msgid "Cannot execute hook %s for plugin %s: %s"
msgstr "Kann Hook %s für Plugin %s nicht ausführen: %s"
-#: ../revisor/progress.py:79
+#: ../revisor/progress.py:80
#: ../revisor/modgui/build_media.py:88
#: ../revisor/modgui/build_media.py:94
#: ../revisor/modgui/build_media.py:98
@@ -2964,15 +2961,15 @@ msgstr "Kann Hook %s für Plugin %s nicht ausführen: %s"
msgid "Pending..."
msgstr "Offen ..."
-#: ../revisor/progress.py:80
-#: ../revisor/progress.py:83
+#: ../revisor/progress.py:81
+#: ../revisor/progress.py:84
#: ../revisor/modgui/build_media.py:308
#: ../revisor/modgui/build_media.py:311
msgid "Running..."
msgstr "Läuft ..."
-#: ../revisor/progress.py:84
-#: ../revisor/progress.py:87
+#: ../revisor/progress.py:85
+#: ../revisor/progress.py:88
#: ../revisor/modgui/build_media.py:215
#: ../revisor/modgui/build_media.py:221
#: ../revisor/modgui/build_media.py:225
@@ -2986,52 +2983,52 @@ msgstr "Läuft ..."
msgid "Done"
msgstr "Gemacht"
-#: ../revisor/progress.py:190
+#: ../revisor/progress.py:191
msgid "Preparing transaction"
msgstr "Vorbereitung Transaktion"
-#: ../revisor/progress.py:202
-#: ../revisor/progress.py:366
+#: ../revisor/progress.py:203
+#: ../revisor/progress.py:367
#, python-format
msgid "Unable to open %s: %s"
msgstr "Unfähig %s zu öffnen: %s"
-#: ../revisor/progress.py:203
#: ../revisor/progress.py:204
-#: ../revisor/progress.py:367
+#: ../revisor/progress.py:205
+#: ../revisor/progress.py:368
#, python-format
msgid "Installing %s"
msgstr "Installiere %s"
-#: ../revisor/progress.py:226
-#: ../revisor/progress.py:387
+#: ../revisor/progress.py:227
+#: ../revisor/progress.py:388
#, python-format
msgid "Updated: %s"
msgstr "Aktualisiere: %s"
-#: ../revisor/progress.py:228
-#: ../revisor/progress.py:389
+#: ../revisor/progress.py:229
+#: ../revisor/progress.py:390
#, python-format
msgid "Installed: %s"
msgstr "Installiert: %s"
-#: ../revisor/progress.py:241
+#: ../revisor/progress.py:242
#, python-format
msgid "Cleanup %s"
msgstr "Säubere %s"
-#: ../revisor/progress.py:256
-#: ../revisor/progress.py:415
+#: ../revisor/progress.py:257
+#: ../revisor/progress.py:416
#, python-format
msgid "Erased: %s"
msgstr "Gelöscht: %s"
-#: ../revisor/progress.py:441
+#: ../revisor/progress.py:442
#, python-format
msgid "Downloading %s"
msgstr "Herunterladen %s"
-#: ../revisor/progress.py:541
+#: ../revisor/progress.py:546
#, python-format
msgid "%s: %s"
msgstr "%s: %s"
@@ -3416,40 +3413,40 @@ msgstr "Kann Konfigurationsdatei %s nicht lesen"
msgid "Check current directory."
msgstr "Aktuelles Verzeichnis prüfen."
-#: ../revisor/modgui/__init__.py:121
+#: ../revisor/modgui/__init__.py:122
msgid "GUI Mode didn't get RevisorBase instance, which is fatal."
msgstr "GUI-Modus gibt keine RevisorBase-Instanz zurück, dies ist fatal."
-#: ../revisor/modgui/__init__.py:190
+#: ../revisor/modgui/__init__.py:191
#, python-format
msgid "Opening up /usr/bin/sudo -u %s /usr/bin/xdg-open %s"
msgstr "Öffnen von /usr/bin/sudo -u %s /usr/bin/xdg-open %s"
-#: ../revisor/modgui/__init__.py:323
+#: ../revisor/modgui/__init__.py:324
msgid "Error downloading packages"
msgstr "Fehler beim Herunterladen der Pakete"
-#: ../revisor/modgui/__init__.py:338
+#: ../revisor/modgui/__init__.py:339
msgid "Continue"
msgstr "Weiterfahren"
-#: ../revisor/modgui/__init__.py:339
+#: ../revisor/modgui/__init__.py:340
msgid "Dependencies added"
msgstr "Abhängigkeiten hinzugefügt"
-#: ../revisor/modgui/__init__.py:340
+#: ../revisor/modgui/__init__.py:341
msgid "Updating these packages requires additional package changes for proper operation."
msgstr "Die Aktualisierung dieser Pakete erfordert zusätzliche Paketänderungen für einen einwandfreien Betrieb."
-#: ../revisor/modgui/__init__.py:349
+#: ../revisor/modgui/__init__.py:350
msgid "Adding for dependencies:\n"
msgstr "Hinzufügen für Abhängigkeiten:\n"
-#: ../revisor/modgui/__init__.py:350
+#: ../revisor/modgui/__init__.py:351
msgid "Removing for dependencies:\n"
msgstr "Entfernung für Abhängigkeiten:\n"
-#: ../revisor/modgui/__init__.py:351
+#: ../revisor/modgui/__init__.py:352
msgid "Updating for dependencies:\n"
msgstr "Aktualisierung für Abhängigkeiten:\n"
@@ -3733,22 +3730,22 @@ msgstr "rebrand auf %s setzen"
msgid "The URI to a tree we're supposed to reuse the installer images from."
msgstr "Der URI zu einem Zweig zur Wiederverwendung der Installationsabbilder."
-#: ../revisor/modreuseinstaller/__init__.py:66
+#: ../revisor/modreuseinstaller/__init__.py:68
#, python-format
msgid "Could not access %s/%s, required for reusing a previous tree. Cancelling the reuse of installer images"
msgstr "Konnte auf %s/%s nicht zugreifen, dies wird aber benötigt für die Wiederverwendung des vorherigen Baums. Breche Wiederverwendung von Installer-Abbildern ab"
-#: ../revisor/modreuseinstaller/__init__.py:85
+#: ../revisor/modreuseinstaller/__init__.py:87
#, python-format
msgid "Copying %s/%s to %s/%s"
msgstr "%s/%s zu %s/%s kopieren"
-#: ../revisor/modreuseinstaller/__init__.py:88
+#: ../revisor/modreuseinstaller/__init__.py:90
#, python-format
msgid "Copying %s/.discinfo to %s/.discinfo"
msgstr "%s/.discinfo zu %s/.discinfo kopieren"
-#: ../revisor/modreuseinstaller/__init__.py:91
+#: ../revisor/modreuseinstaller/__init__.py:93
#, python-format
msgid "Copying %s/.treeinfo to %s/.treeinfo"
msgstr "%s/.treeinfo zu %s/.treeinfo kopieren"
@@ -3840,6 +3837,12 @@ msgstr "Übermitteln"
msgid "Revisor, Pimp your distro"
msgstr "Revisor, Pimpe Deine Distro"
+#~ msgid ""
+#~ "SELinux is in enforcing mode on this host. Composing media will fail. "
+#~ "Please set SELinux to permissive mode."
+#~ msgstr ""
+#~ "SELinux ist im enforcing-Modus auf der Maschine. Das Erzeugen von Medien "
+#~ "wird fehlschlagen. Bitte setzen Sie SELinux in den permissive-Modus."
#~ msgid "Adding conditional: %s / %s"
#~ msgstr "Konditionen hinzufügen: %s / %s"
#~ msgid ""
14 years, 3 months
- 1
- 0
po/es.po
by Transifex System User
po/es.po | 282 +++++++++++++++++++++++++++++++--------------------------------
1 file changed, 143 insertions(+), 139 deletions(-)
New commits:
commit f1fead8386c30a2ac5f02a8f3211fe1ca73fc612
Author: logan <logan(a)fedoraproject.org>
Date: Wed Feb 3 13:14:51 2010 +0000
Sending translation for Spanish
diff --git a/po/es.po b/po/es.po
index 50fea88..647758a 100644
--- a/po/es.po
+++ b/po/es.po
@@ -2,20 +2,21 @@
# This file is distributed under the same license as the Revisor package.
#
# Izaac Zavaleta <izaac(a)fedoraproject.org>, 2009.
-# Héctor Daniel Cabrera <h.daniel.cabrera(a)gmail.com>, 2009.
+# Héctor Daniel Cabrera <logan(a)fedoraproject.org>, 2009, 2010.
#
msgid ""
msgstr ""
"Project-Id-Version: revisor\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-09 09:24+0000\n"
-"PO-Revision-Date: 2009-11-09 09:19-0300\n"
-"Last-Translator: Claudio Rodrigo Pereyra Diaz <claudio(a)pereyradiaz.com.ar>\n"
+"POT-Creation-Date: 2010-02-03 09:47+0000\n"
+"PO-Revision-Date: 2010-02-03 10:13-0300\n"
+"Last-Translator: Héctor Daniel Cabrera <logan(a)fedoraproject.org>\n"
"Language-Team: fedora spanish <fedora-trans-es(a)redhat.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-Language: Spanish\n"
+"X-Poedit-Country: ARGENTINA\n"
#: ../revisor/modgui/glade/base_screen.glade.in.h:1
msgid ""
@@ -1361,26 +1362,26 @@ msgid "Apparently we have not yet entered the Build Media stage"
msgstr "Aparentemente todavía no se ha ingresado a la escena de Construcción de Medio"
#: ../revisor/base.py:504
-#: ../revisor/misc.py:378
+#: ../revisor/misc.py:369
#, python-format
msgid "Checking dependencies for %s.%s"
msgstr "Checando dependencias para %s.%s"
#. pbar.cur_task += 1.0
#: ../revisor/base.py:526
-#: ../revisor/misc.py:411
+#: ../revisor/misc.py:402
#, python-format
msgid "Unresolvable dependency %s %s %s in %s.%s"
msgstr "Dependencia no resuelta %s %s %s in %s.%s"
#: ../revisor/base.py:533
-#: ../revisor/misc.py:418
+#: ../revisor/misc.py:409
#, python-format
msgid "Added %s-%s:%s-%s.%s for %s-%s:%s-%s.%s (requiring %s %s %s)"
msgstr "Añadiendo %s-%s:%s-%s.%s para %s-%s:%s-%s.%s (requriendo %s %s %s)"
#: ../revisor/base.py:536
-#: ../revisor/misc.py:246
+#: ../revisor/misc.py:237
msgid "Checking dependencies - allowing conflicts within the package set"
msgstr "Verificando dependencias - permitiendo conflictos entre el conjunto de paquetes"
@@ -1423,12 +1424,12 @@ msgstr ""
#. End of dependency resolving
#: ../revisor/base.py:612
-#: ../revisor/image.py:101
+#: ../revisor/image.py:109
msgid "Unable to build transaction"
msgstr "No se puede construir transacción"
#: ../revisor/base.py:617
-#: ../revisor/image.py:106
+#: ../revisor/image.py:114
#, python-format
msgid "Succesfully built transaction: ret %s, msg %s"
msgstr "Transacción construída exitosamente: ret %s, msg %s"
@@ -1568,7 +1569,7 @@ msgstr "Reporte de los %d paquetes que ocupan más espacio"
#. Link the localPkg() result into the build tree
#: ../revisor/base.py:1074
-#: ../revisor/base.py:1781
+#: ../revisor/base.py:1783
msgid "Linking in binary packages"
msgstr "Enlazando en paquetes binarios"
@@ -1625,25 +1626,25 @@ msgstr "El tamaño del árbol de instalación es %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:1266
+#: ../revisor/base.py:1268
msgid "Running pkgorder"
msgstr "Ejecutando pkgorder"
-#: ../revisor/base.py:1329
+#: ../revisor/base.py:1331
#, python-format
msgid "Running with grouplist: %r"
msgstr "Ejecutando con grouplist: %r"
-#: ../revisor/base.py:1332
+#: ../revisor/base.py:1334
#, python-format
msgid "Running with packagelist: %r"
msgstr "Ejecutando con packagelist: %r"
-#: ../revisor/base.py:1339
+#: ../revisor/base.py:1341
msgid "Appending group core and base"
msgstr "Añadiendo grupo core y base"
-#: ../revisor/base.py:1363
+#: ../revisor/base.py:1365
#, python-format
msgid "Appending default groups %r"
msgstr "Agregando grupo predeterminado %r"
@@ -1651,7 +1652,7 @@ msgstr "Agregando grupo predeterminado %r"
#. Do not do this because the installer still has all the groups available
#. if group not in groupList:
#. continue
-#: ../revisor/base.py:1379
+#: ../revisor/base.py:1381
#, python-format
msgid "Appending non-default group %s"
msgstr "Agregando grupo no predeterminado %s"
@@ -1659,43 +1660,43 @@ msgstr "Agregando grupo no predeterminado %s"
#. Do not do this because the installer still has all the groups available
#. if group not in groupList:
#. continue
-#: ../revisor/base.py:1389
+#: ../revisor/base.py:1391
#, python-format
msgid "Appending non-default support group %s"
msgstr "Agregando grupo de soporte no predeterminado %s"
-#: ../revisor/base.py:1455
+#: ../revisor/base.py:1457
#, python-format
msgid "Not running package ordering, using file %s instead"
msgstr "No ejecutando ordenación de paquete, usando archivo %s en su lugar"
-#: ../revisor/base.py:1457
+#: ../revisor/base.py:1459
msgid "Not running package ordering"
msgstr "No ejecutando ordenamiento de paquete"
-#: ../revisor/base.py:1489
+#: ../revisor/base.py:1491
msgid "^Install using kickstart"
msgstr "^Instalar usando kickstart"
#. Split Tree
-#: ../revisor/base.py:1512
+#: ../revisor/base.py:1514
#, python-format
msgid "Splitting Build Tree (%s)"
msgstr "Dividiendo Árbol de Construcción (%s)"
#. Split repo
-#: ../revisor/base.py:1518
+#: ../revisor/base.py:1520
#, python-format
msgid "Splitting Repository (%s)"
msgstr "Dividiendo Repositorio (%s)"
-#: ../revisor/base.py:1532
+#: ../revisor/base.py:1534
#: ../revisor/modgui/build_media.py:260
#, python-format
msgid "Creating %s ISO Image #%d"
msgstr "Creando %s Imagen ISO #%d"
-#: ../revisor/base.py:1537
+#: ../revisor/base.py:1539
#: ../revisor/modgui/build_media.py:264
#, python-format
msgid "Creating %s ISO Image"
@@ -1703,50 +1704,50 @@ msgstr "Creando %s Imagen 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:1551
+#: ../revisor/base.py:1553
msgid "Implanting MD5 into ISO Images"
msgstr "Implantando MD5 en las Imágenes ISO"
#. mediatype = built_image["mediatype"]
#. if not mediatype == 'source':
-#: ../revisor/base.py:1559
+#: ../revisor/base.py:1561
#, python-format
msgid "Implanting md5 into ISO Image: %s"
msgstr "Implantando md5 en la Imágen ISO: %s"
-#: ../revisor/base.py:1565
+#: ../revisor/base.py:1567
msgid "Cannot implant ISO md5sum"
msgstr "No se puede implantar md5sum a ISO"
#. Do some SHA1SUMMONING
-#: ../revisor/base.py:1573
+#: ../revisor/base.py:1575
msgid "Creating SHA1SUMs for Images"
msgstr "Creando SHA1SUMs para Imagenes"
-#: ../revisor/base.py:1589
+#: ../revisor/base.py:1591
msgid "Creating Rescue ISO Image"
msgstr "Creando Imagen ISO de Rescate"
-#: ../revisor/base.py:1596
+#: ../revisor/base.py:1598
msgid "Creating USB Key Installer"
msgstr "Creando Instalador Clave de USB"
-#: ../revisor/base.py:1653
-#: ../revisor/base.py:1676
-#: ../revisor/base.py:1699
+#: ../revisor/base.py:1655
+#: ../revisor/base.py:1678
+#: ../revisor/base.py:1701
#, python-format
msgid "Copying %s to %s (%d files)"
msgstr "Copipando %s a %s (%d archivos)"
-#: ../revisor/base.py:1657
-#: ../revisor/base.py:1680
-#: ../revisor/base.py:1703
+#: ../revisor/base.py:1659
+#: ../revisor/base.py:1682
+#: ../revisor/base.py:1705
#, python-format
msgid "Moving %s to %s (%d files)"
msgstr "Moviendo %s a %s (%d archivos)"
-#: ../revisor/base.py:1660
-#: ../revisor/base.py:1683
+#: ../revisor/base.py:1662
+#: ../revisor/base.py:1685
#, python-format
msgid ""
"Moving of the source tree failed (trying copy):\n"
@@ -1757,8 +1758,8 @@ msgstr ""
"\n"
"%s"
-#: ../revisor/base.py:1663
-#: ../revisor/base.py:1686
+#: ../revisor/base.py:1665
+#: ../revisor/base.py:1688
#, python-format
msgid ""
"Copying of the source tree failed:\n"
@@ -1769,7 +1770,7 @@ msgstr ""
"\n"
"%s"
-#: ../revisor/base.py:1706
+#: ../revisor/base.py:1708
#, python-format
msgid ""
"Moving of the installation tree failed (trying copy):\n"
@@ -1780,7 +1781,7 @@ msgstr ""
"\n"
"%s"
-#: ../revisor/base.py:1709
+#: ../revisor/base.py:1711
#, python-format
msgid ""
"Copying of the installation tree failed:\n"
@@ -1791,56 +1792,56 @@ msgstr ""
"\n"
"%s"
-#: ../revisor/base.py:1718
+#: ../revisor/base.py:1720
msgid "Creating ext3 filesystem"
msgstr "Creando sistema de archivos ext3"
-#: ../revisor/base.py:1725
+#: ../revisor/base.py:1727
msgid "Configuring System"
msgstr "Configurando el Sistema"
-#: ../revisor/base.py:1760
+#: ../revisor/base.py:1762
#, python-format
msgid "Copying copy_dir %s to install_root %s"
msgstr "Copiando copy_dir %s a install_root %s"
-#: ../revisor/base.py:1769
+#: ../revisor/base.py:1771
#: ../revisor/pungi.py:404
#, python-format
msgid "Creating %s"
msgstr "Creando %s"
-#: ../revisor/base.py:1773
+#: ../revisor/base.py:1775
#: ../revisor/pungi.py:408
#, python-format
msgid "Copying %s to %s"
msgstr "Copiando %s a %s"
-#: ../revisor/base.py:1792
+#: ../revisor/base.py:1794
msgid "Linking in Source packages"
msgstr "Enlazando en paquetes Fuente"
-#: ../revisor/base.py:1820
+#: ../revisor/base.py:1822
#, python-format
msgid "Setting rundir to %s"
msgstr "Configurando rundir a %s"
-#: ../revisor/base.py:1826
+#: ../revisor/base.py:1828
#, python-format
msgid "Directory %s could not be created. Aborting"
msgstr "El directorio %s no pudo ser creado. Abortando"
-#: ../revisor/base.py:1828
+#: ../revisor/base.py:1830
#, python-format
msgid "Running command: %s"
msgstr "Comando de ejecución: %s"
-#: ../revisor/base.py:1829
+#: ../revisor/base.py:1831
#, python-format
msgid "Extra information: %s %s %s"
msgstr "Información extra: %s %s %s"
-#: ../revisor/base.py:1857
+#: ../revisor/base.py:1859
#, python-format
msgid "Got an error from %s (return code %s)"
msgstr "Se obtuvo error de %s (código devuelto %s)"
@@ -2159,45 +2160,47 @@ msgstr "Correr desde la imagen"
msgid "Run from RAM - requires 1 GB+"
msgstr "Ejecutar desde la RAM - requiere 1 GB+"
-#: ../revisor/image.py:91
-#, python-format
-msgid ""
-"Error encountered during installation of the software you selected:\n"
-"\n"
-"--> %s"
-msgstr ""
-"Error encontrado durante la instalación del software que seleccionó:\n"
-"\n"
-"--> %s"
+#: ../revisor/image.py:93
+msgid "Error encountered during installation of "
+msgstr "Error encontrado durante la instalación de"
#: ../revisor/image.py:97
+#, python-format
+msgid "An additional error in the error. The value of errs is: %s"
+msgstr "Un error adicional en el error. El valor de los errores es: %s"
+
+#: ../revisor/image.py:98
+msgid "An error occurred during the installation "
+msgstr "Ha ocurrido un error durante la instalación"
+
+#: ../revisor/image.py:105
msgid "Running package installation"
msgstr "Ejecutando paquete de instalación"
-#: ../revisor/image.py:108
+#: ../revisor/image.py:116
msgid "Installing Software"
msgstr "Instalando el Software"
-#: ../revisor/image.py:143
+#: ../revisor/image.py:151
msgid "SELinux requested but not enabled on host"
msgstr "SELinux pedido pero no habilitado en el sistema anfitrión."
-#: ../revisor/image.py:195
+#: ../revisor/image.py:203
#, python-format
msgid "Setting self.cfg.payload_livemedia to %s (from 'part /' command in kickstart, instead of %s)"
msgstr "Poniendo self.cfg.payload_livemedia a %s (desde el comando 'part /' en kickstart, en vez de %s)"
-#: ../revisor/image.py:199
+#: ../revisor/image.py:207
#, python-format
msgid "Setting self.cfg.payload_livemedia to %s (from total installed size of RPMs, instead of %s)"
msgstr "Poniendo self.cfg.payload_livemedia a %s (desde tamaño total de RPMs instalados, en lugar de %s"
-#: ../revisor/image.py:204
+#: ../revisor/image.py:212
#, python-format
msgid "Setting self.cfg.payload_livemedia to %s (from 'part /' command in kickstart, as per the respin mode)"
msgstr "Poniendo self.cfg.payload_livemedia a %s (desde el comando 'part /' en kickstart, como para modo de respin)"
-#: ../revisor/image.py:221
+#: ../revisor/image.py:229
#, python-format
msgid "Filesystem type set to: %s"
msgstr "Tipo de sistema de archivos definido en: %s"
@@ -2515,21 +2518,21 @@ msgstr "Grupo no encontrado: %s"
#: ../revisor/kickstart.py:302
#: ../revisor/kickstart.py:330
-#: ../revisor/kickstart.py:714
+#: ../revisor/kickstart.py:717
#, python-format
msgid "Adding %s-%s:%s-%s.%s"
msgstr "Agregando %s-%s:%s-%s.%s"
#: ../revisor/kickstart.py:342
#: ../revisor/kickstart.py:606
-#: ../revisor/kickstart.py:725
+#: ../revisor/kickstart.py:728
#, python-format
msgid "From Excludes: Removing %s-%s:%s-%s.%s from transaction"
msgstr "Desde Excluídos: Eliminando %s-%s:%s-%s.%s de la transacción"
#: ../revisor/kickstart.py:345
#: ../revisor/kickstart.py:609
-#: ../revisor/kickstart.py:728
+#: ../revisor/kickstart.py:731
#, python-format
msgid "Apparently trying to exclude a package that is not available in the repositories loaded, or hasn't been added to the transaction: %s"
msgstr "Aparentemente se intentó excluir un paquete que no está disponible en los repositosio cargados, o no ha sido añadido a la transacción: %s"
@@ -2602,7 +2605,7 @@ msgid "No include parameter for group %s, using defaults"
msgstr "No se incluye parámetro para el grupo %s, usando los predeterminados"
#: ../revisor/kickstart.py:508
-#: ../revisor/kickstart.py:677
+#: ../revisor/kickstart.py:680
#: ../revisor/pkgorder.py:111
#, python-format
msgid "Testing condition: %s / %s"
@@ -2634,7 +2637,7 @@ msgid "Could not find package '%s', searching..."
msgstr "No se pudo encontrar paquete '%s', buscando..."
#: ../revisor/kickstart.py:559
-#: ../revisor/misc.py:210
+#: ../revisor/misc.py:201
#, python-format
msgid "Found packages matching '%s': %s"
msgstr "Encontrados paquetes similares '%s': %s"
@@ -2650,13 +2653,13 @@ msgid "More then one package found for %s-%s-%s.%s - going to add them all to th
msgstr "Más de un paquete encontrado para %s-%s-%s.%s - se agregarán todos a la transacción"
#: ../revisor/kickstart.py:583
-#: ../revisor/misc.py:224
+#: ../revisor/misc.py:215
#, python-format
msgid "Could not find package %s-%s-%s.%s"
msgstr "No se pudo encontrar paquete %s-%s-%s.%s"
#: ../revisor/kickstart.py:586
-#: ../revisor/misc.py:227
+#: ../revisor/misc.py:218
#, python-format
msgid "From Packages (exact string %s-%s-%s.%s), selecting %s-%s-%s.%s"
msgstr "Desde los Paquetes (string exacto %s-%s-%s.%s), seleccionando %s-%s-%s.%s"
@@ -2688,116 +2691,111 @@ msgstr "¡Abortar! ¡Abortar! ¡Abortar!"
msgid "This tool has to run with root privileges. Aborting"
msgstr "Esta herramienta debe correr con los privilegios de root. Abortando"
-#. SELinux in enforcing mode
-#: ../revisor/misc.py:53
-msgid "SELinux is in enforcing mode on this host. Composing media will fail. Please set SELinux to permissive mode."
-msgstr "SELinux está en modo obligatorio en este equipo. La composición del medio fallará. Por favor configure SELinux en modo permisivo."
-
-#: ../revisor/misc.py:58
+#: ../revisor/misc.py:49
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 SELinux either."
msgstr "SELinux en está desabilitado en este anfitrión. La composición no tendrá SELinux, y como resultado el sistema que instale con esta composición no tampoco tendrá SELinux."
-#: ../revisor/misc.py:94
+#: ../revisor/misc.py:85
msgid "cfg parameter to revisor.misc.download_packages() "
msgstr "parámetro cfg a revisor.misc.download_packages() "
-#: ../revisor/misc.py:107
+#: ../revisor/misc.py:98
#, python-format
msgid "Using local copy of %s-%s-%s.%s at %s"
msgstr "Usando copia local de %s-%s-%s.%s en %s"
-#: ../revisor/misc.py:117
+#: ../revisor/misc.py:108
msgid "Unable to find a suitable mirror."
msgstr "No se pudo encontrar un espejo apropiado."
-#: ../revisor/misc.py:129
+#: ../revisor/misc.py:120
#, python-format
msgid "Errors were encountered while downloading packages: %s"
msgstr "Se encontraron errores durante la descarga de paquetes: %s"
-#: ../revisor/misc.py:197
-#: ../revisor/misc.py:235
+#: ../revisor/misc.py:188
+#: ../revisor/misc.py:226
#, python-format
msgid "Resolved %s"
msgstr "Resuelto %s"
-#: ../revisor/misc.py:222
+#: ../revisor/misc.py:213
#, python-format
msgid "More then one package found for %s-%s-%s.%s"
msgstr "Más de un paquete encontrado para %s-%s-%s.%s"
-#: ../revisor/misc.py:238
+#: ../revisor/misc.py:229
#, python-format
msgid "Looking to resolve package %s to a Provides, but we still can't find it."
msgstr "Buscando resolver paquete %s a Provides, pero aún no se puede encontrar."
-#: ../revisor/misc.py:250
+#: ../revisor/misc.py:241
#, python-format
msgid "Inclusive dependency resolving starts at %s"
msgstr "Resolución inclusiva de dependencias empieza en %s"
-#: ../revisor/misc.py:271
+#: ../revisor/misc.py:262
#, python-format
msgid "Inclusive dependency resolving ends at %s"
msgstr "Resolución inclusiva de dependencias termina en %s"
-#: ../revisor/misc.py:319
+#: ../revisor/misc.py:310
#, python-format
msgid "Cannot find a source rpm for %s"
msgstr "No se pudo encontrar el rpm de fuentes de %s"
-#: ../revisor/misc.py:342
+#: ../revisor/misc.py:333
#, python-format
msgid "Disabling %s repository"
msgstr "Desactivando el Repositorio %s"
-#: ../revisor/misc.py:357
+#: ../revisor/misc.py:348
#, python-format
msgid "No such repository: %s"
msgstr "No hay repositorio: %s"
-#: ../revisor/misc.py:359
+#: ../revisor/misc.py:350
#, python-format
msgid "Enabling %s repository"
msgstr "Activando el Repositorio %s"
-#: ../revisor/misc.py:564
-#: ../revisor/misc.py:569
+#: ../revisor/misc.py:555
+#: ../revisor/misc.py:560
#, python-format
msgid "Creating destination directory: %s"
msgstr "Creando el directorio destino: %s"
-#: ../revisor/misc.py:567
+#: ../revisor/misc.py:558
#, python-format
msgid "Removing destination directory: %s"
msgstr "Eliminando el directorio de destino: %s"
-#: ../revisor/misc.py:581
+#: ../revisor/misc.py:572
#, python-format
msgid "Linking %s => %s"
msgstr "Enlazando %s => %s"
-#: ../revisor/misc.py:584
+#: ../revisor/misc.py:575
#, python-format
msgid "Package hard link failed: %s: %s"
msgstr "El enlace rígido del paquete falló: %s: %s"
-#: ../revisor/misc.py:589
+#: ../revisor/misc.py:580
#, python-format
msgid "Copying: %s to %s"
msgstr "Copiando: %s a %s"
-#: ../revisor/misc.py:592
+#: ../revisor/misc.py:583
#, python-format
msgid "Symlinking: %s to %s"
msgstr "Enlace simbólico: %s a %s"
-#: ../revisor/misc.py:595
+#: ../revisor/misc.py:586
msgid "Package symlink succeeded"
msgstr "Enlazado simbólico de paquete exitoso"
-#: ../revisor/misc.py:597
-#: ../revisor/misc.py:604
+#: ../revisor/misc.py:588
+#: ../revisor/misc.py:595
#, python-format
msgid "Package link failed, trying copy: %s: %s"
msgstr "Falló el enlace del paquete, intentando copiar: %s: %s"
@@ -2908,7 +2906,7 @@ msgstr "No se verifican opciones para plugin %s: No hay funcion 'check_options()
msgid "Cannot execute hook %s for plugin %s: %s"
msgstr "No se puede ejecutar \"el enganche\" %s del complemento %s: %s"
-#: ../revisor/progress.py:79
+#: ../revisor/progress.py:80
#: ../revisor/modgui/build_media.py:88
#: ../revisor/modgui/build_media.py:94
#: ../revisor/modgui/build_media.py:98
@@ -2964,15 +2962,15 @@ msgstr "No se puede ejecutar \"el enganche\" %s del complemento %s: %s"
msgid "Pending..."
msgstr "Pendiente"
-#: ../revisor/progress.py:80
-#: ../revisor/progress.py:83
+#: ../revisor/progress.py:81
+#: ../revisor/progress.py:84
#: ../revisor/modgui/build_media.py:308
#: ../revisor/modgui/build_media.py:311
msgid "Running..."
msgstr "Ejecutando..."
-#: ../revisor/progress.py:84
-#: ../revisor/progress.py:87
+#: ../revisor/progress.py:85
+#: ../revisor/progress.py:88
#: ../revisor/modgui/build_media.py:215
#: ../revisor/modgui/build_media.py:221
#: ../revisor/modgui/build_media.py:225
@@ -2986,52 +2984,52 @@ msgstr "Ejecutando..."
msgid "Done"
msgstr "Hecho"
-#: ../revisor/progress.py:190
+#: ../revisor/progress.py:191
msgid "Preparing transaction"
msgstr "Preparación la transacción"
-#: ../revisor/progress.py:202
-#: ../revisor/progress.py:366
+#: ../revisor/progress.py:203
+#: ../revisor/progress.py:367
#, python-format
msgid "Unable to open %s: %s"
msgstr "No se puede abrir %s: %s"
-#: ../revisor/progress.py:203
#: ../revisor/progress.py:204
-#: ../revisor/progress.py:367
+#: ../revisor/progress.py:205
+#: ../revisor/progress.py:368
#, python-format
msgid "Installing %s"
msgstr "Instalando %s"
-#: ../revisor/progress.py:226
-#: ../revisor/progress.py:387
+#: ../revisor/progress.py:227
+#: ../revisor/progress.py:388
#, python-format
msgid "Updated: %s"
msgstr "Actualizado: %s"
-#: ../revisor/progress.py:228
-#: ../revisor/progress.py:389
+#: ../revisor/progress.py:229
+#: ../revisor/progress.py:390
#, python-format
msgid "Installed: %s"
msgstr "Instalado: %s"
-#: ../revisor/progress.py:241
+#: ../revisor/progress.py:242
#, python-format
msgid "Cleanup %s"
msgstr "Limpiar %s"
-#: ../revisor/progress.py:256
-#: ../revisor/progress.py:415
+#: ../revisor/progress.py:257
+#: ../revisor/progress.py:416
#, python-format
msgid "Erased: %s"
msgstr "Borrado: %s"
-#: ../revisor/progress.py:441
+#: ../revisor/progress.py:442
#, python-format
msgid "Downloading %s"
msgstr "Descargando %s"
-#: ../revisor/progress.py:541
+#: ../revisor/progress.py:546
#, python-format
msgid "%s: %s"
msgstr "%s: %s"
@@ -3416,40 +3414,40 @@ msgstr "No se pudo leer el archivo de configuración %s"
msgid "Check current directory."
msgstr "Verifica directorio actual."
-#: ../revisor/modgui/__init__.py:121
+#: ../revisor/modgui/__init__.py:122
msgid "GUI Mode didn't get RevisorBase instance, which is fatal."
msgstr "Modo GUI no tiene instancia RevisorBase, lo cual es fatal."
-#: ../revisor/modgui/__init__.py:190
+#: ../revisor/modgui/__init__.py:191
#, python-format
msgid "Opening up /usr/bin/sudo -u %s /usr/bin/xdg-open %s"
msgstr "Abriendo /usr/bin/sudo -u %s /usr/bin/xdg-open %s"
-#: ../revisor/modgui/__init__.py:323
+#: ../revisor/modgui/__init__.py:324
msgid "Error downloading packages"
msgstr "Error descargando paquetes"
-#: ../revisor/modgui/__init__.py:338
+#: ../revisor/modgui/__init__.py:339
msgid "Continue"
msgstr "Continuar"
-#: ../revisor/modgui/__init__.py:339
+#: ../revisor/modgui/__init__.py:340
msgid "Dependencies added"
msgstr "Dependencias agregadas"
-#: ../revisor/modgui/__init__.py:340
+#: ../revisor/modgui/__init__.py:341
msgid "Updating these packages requires additional package changes for proper operation."
msgstr "La actualización de estos paquetes requiere cambios de paquetes adicionales para que funcionen adecuadamente"
-#: ../revisor/modgui/__init__.py:349
+#: ../revisor/modgui/__init__.py:350
msgid "Adding for dependencies:\n"
msgstr "Añadiendo por dependencias:\n"
-#: ../revisor/modgui/__init__.py:350
+#: ../revisor/modgui/__init__.py:351
msgid "Removing for dependencies:\n"
msgstr "Removiendo por dependencias:\n"
-#: ../revisor/modgui/__init__.py:351
+#: ../revisor/modgui/__init__.py:352
msgid "Updating for dependencies:\n"
msgstr "Actualizando por dependencias:\n"
@@ -3733,22 +3731,22 @@ msgstr "Poniendo reconstruir a %s"
msgid "The URI to a tree we're supposed to reuse the installer images from."
msgstr "La dirección al árbol que se supone reusará el instalador de imágenes."
-#: ../revisor/modreuseinstaller/__init__.py:66
+#: ../revisor/modreuseinstaller/__init__.py:68
#, python-format
msgid "Could not access %s/%s, required for reusing a previous tree. Cancelling the reuse of installer images"
msgstr "No se puede acceder %s%s, requerido para reutilizar un árbol previo. Cancelando la reutilización de imágenes de instalación"
-#: ../revisor/modreuseinstaller/__init__.py:85
+#: ../revisor/modreuseinstaller/__init__.py:87
#, python-format
msgid "Copying %s/%s to %s/%s"
msgstr "Copiando %s/%s a %s/%s"
-#: ../revisor/modreuseinstaller/__init__.py:88
+#: ../revisor/modreuseinstaller/__init__.py:90
#, python-format
msgid "Copying %s/.discinfo to %s/.discinfo"
msgstr "Copiando %s/.discinfo a %s/.discinfo"
-#: ../revisor/modreuseinstaller/__init__.py:91
+#: ../revisor/modreuseinstaller/__init__.py:93
#, python-format
msgid "Copying %s/.treeinfo to %s/.treeinfo"
msgstr "Copiando %s/.treeinfo a %s/.treeinfo"
@@ -3840,6 +3838,12 @@ msgstr "Mandar"
msgid "Revisor, Pimp your distro"
msgstr "Revisor, Enchula tu distro"
+#~ msgid ""
+#~ "SELinux is in enforcing mode on this host. Composing media will fail. "
+#~ "Please set SELinux to permissive mode."
+#~ msgstr ""
+#~ "SELinux está en modo obligatorio en este equipo. La composición del medio "
+#~ "fallará. Por favor configure SELinux en modo permisivo."
#~ msgid "Adding conditional: %s / %s"
#~ msgstr "Añadiendo condicional: %s / %s"
#~ msgid "Running Revisor in Composer mode..."
14 years, 3 months
- 1
- 0
po/pl.po
by Transifex System User
po/pl.po | 247 ++++++++++++++++++++++++++++++---------------------------------
1 file changed, 120 insertions(+), 127 deletions(-)
New commits:
commit 75425875f8f0a05e480462d722267030147e4c67
Author: raven <raven(a)fedoraproject.org>
Date: Tue Feb 2 20:15:20 2010 +0000
Sending translation for Polish
diff --git a/po/pl.po b/po/pl.po
index a283332..39e3802 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,10 +6,10 @@ msgid ""
msgstr ""
"Project-Id-Version: pl\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-08 22:10+0000\n"
-"PO-Revision-Date: 2009-11-08 23:13+0100\n"
+"POT-Creation-Date: 2010-02-02 20:06+0000\n"
+"PO-Revision-Date: 2010-02-02 21:09+0100\n"
"Last-Translator: Piotr Drąg <piotrdrag(a)gmail.com>\n"
-"Language-Team: Polish <fedora-trans-pl(a)redhat.com>\n"
+"Language-Team: Polish <trans-pl(a)lists.fedoraproject.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -1403,23 +1403,23 @@ msgstr "Rozpoczynanie paska postępu dla "
msgid "Apparently we have not yet entered the Build Media stage"
msgstr "Najwyraźniej program nie przeszedł jeszcze do etapu budowania nośnika"
-#: ../revisor/base.py:504 ../revisor/misc.py:378
+#: ../revisor/base.py:504 ../revisor/misc.py:369
#, python-format
msgid "Checking dependencies for %s.%s"
msgstr "Sprawdzanie zależności %s.%s"
#. pbar.cur_task += 1.0
-#: ../revisor/base.py:526 ../revisor/misc.py:411
+#: ../revisor/base.py:526 ../revisor/misc.py:402
#, 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:533 ../revisor/misc.py:418
+#: ../revisor/base.py:533 ../revisor/misc.py:409
#, 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:536 ../revisor/misc.py:246
+#: ../revisor/base.py:536 ../revisor/misc.py:237
msgid "Checking dependencies - allowing conflicts within the package set"
msgstr "Sprawdzanie zależności - pozwalanie na konflikty w zestawie pakietów"
@@ -1464,11 +1464,11 @@ msgstr ""
"%s"
#. End of dependency resolving
-#: ../revisor/base.py:612 ../revisor/image.py:101
+#: ../revisor/base.py:612 ../revisor/image.py:109
msgid "Unable to build transaction"
msgstr "Nie można zbudować transakcji"
-#: ../revisor/base.py:617 ../revisor/image.py:106
+#: ../revisor/base.py:617 ../revisor/image.py:114
#, python-format
msgid "Succesfully built transaction: ret %s, msg %s"
msgstr "Pomyślnie zbudowano transakcję: ret %s, komunikat %s"
@@ -1611,7 +1611,7 @@ msgid "Report of the %d most space consuming packages"
msgstr "Raport o %d pakietach zajmujących najwięcej miejsca"
#. Link the localPkg() result into the build tree
-#: ../revisor/base.py:1074 ../revisor/base.py:1781
+#: ../revisor/base.py:1074 ../revisor/base.py:1783
msgid "Linking in binary packages"
msgstr "Dowiązywanie pakietów binarnych"
@@ -1667,25 +1667,25 @@ msgstr "Rozmiar drzewa instalacji 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:1266
+#: ../revisor/base.py:1268
msgid "Running pkgorder"
msgstr "Wykonywanie pkgorder"
-#: ../revisor/base.py:1329
+#: ../revisor/base.py:1331
#, python-format
msgid "Running with grouplist: %r"
msgstr "Uruchamianie z grouplist: %r"
-#: ../revisor/base.py:1332
+#: ../revisor/base.py:1334
#, python-format
msgid "Running with packagelist: %r"
msgstr "Uruchamianie z packagelist: %r"
-#: ../revisor/base.py:1339
+#: ../revisor/base.py:1341
msgid "Appending group core and base"
msgstr "Dołączanie grup core i base"
-#: ../revisor/base.py:1363
+#: ../revisor/base.py:1365
#, python-format
msgid "Appending default groups %r"
msgstr "Dołączanie domyślnych grup %r"
@@ -1693,7 +1693,7 @@ msgstr "Dołączanie domyślnych grup %r"
#. Do not do this because the installer still has all the groups available
#. if group not in groupList:
#. continue
-#: ../revisor/base.py:1379
+#: ../revisor/base.py:1381
#, python-format
msgid "Appending non-default group %s"
msgstr "Dołączanie nie domyślnej grupy %s"
@@ -1701,89 +1701,89 @@ msgstr "Dołączanie nie domyślnej grupy %s"
#. Do not do this because the installer still has all the groups available
#. if group not in groupList:
#. continue
-#: ../revisor/base.py:1389
+#: ../revisor/base.py:1391
#, python-format
msgid "Appending non-default support group %s"
msgstr "Dołączanie nie domyślnych grup obsługi %s"
-#: ../revisor/base.py:1455
+#: ../revisor/base.py:1457
#, 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:1457
+#: ../revisor/base.py:1459
msgid "Not running package ordering"
msgstr "Porządkowanie kolejności pakietów nie zostanie wykonane"
-#: ../revisor/base.py:1489
+#: ../revisor/base.py:1491
msgid "^Install using kickstart"
msgstr "^Instalacja używając kickstart"
#. Split Tree
-#: ../revisor/base.py:1512
+#: ../revisor/base.py:1514
#, python-format
msgid "Splitting Build Tree (%s)"
msgstr "Rozdzielanie drzewa budowania (%s)"
#. Split repo
-#: ../revisor/base.py:1518
+#: ../revisor/base.py:1520
#, python-format
msgid "Splitting Repository (%s)"
msgstr "Rozdzielanie repozytorium (%s)"
-#: ../revisor/base.py:1532 ../revisor/modgui/build_media.py:260
+#: ../revisor/base.py:1534 ../revisor/modgui/build_media.py:260
#, python-format
msgid "Creating %s ISO Image #%d"
msgstr "Tworzenie %s obrazu ISO #%d"
-#: ../revisor/base.py:1537 ../revisor/modgui/build_media.py:264
+#: ../revisor/base.py:1539 ../revisor/modgui/build_media.py:264
#, 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:1551
+#: ../revisor/base.py:1553
msgid "Implanting MD5 into ISO Images"
msgstr "Wprowadzanie MD5 do obrazów ISO"
#. mediatype = built_image["mediatype"]
#. if not mediatype == 'source':
-#: ../revisor/base.py:1559
+#: ../revisor/base.py:1561
#, python-format
msgid "Implanting md5 into ISO Image: %s"
msgstr "Wprowadzanie MD5 do obrazu ISO: %s"
-#: ../revisor/base.py:1565
+#: ../revisor/base.py:1567
msgid "Cannot implant ISO md5sum"
msgstr "Nie można wprowadzić md5sum ISO"
#. Do some SHA1SUMMONING
-#: ../revisor/base.py:1573
+#: ../revisor/base.py:1575
msgid "Creating SHA1SUMs for Images"
msgstr "Tworzenie plików SHA1SUM dla obrazów"
-#: ../revisor/base.py:1589
+#: ../revisor/base.py:1591
msgid "Creating Rescue ISO Image"
msgstr "Tworzenie ratunkowego obrazu ISO"
-#: ../revisor/base.py:1596
+#: ../revisor/base.py:1598
msgid "Creating USB Key Installer"
msgstr "Tworzenie instalatora dysku USB"
-#: ../revisor/base.py:1653 ../revisor/base.py:1676 ../revisor/base.py:1699
+#: ../revisor/base.py:1655 ../revisor/base.py:1678 ../revisor/base.py:1701
#, python-format
msgid "Copying %s to %s (%d files)"
msgstr "Kopiowanie %s do %s (%d pliki)"
-#: ../revisor/base.py:1657 ../revisor/base.py:1680 ../revisor/base.py:1703
+#: ../revisor/base.py:1659 ../revisor/base.py:1682 ../revisor/base.py:1705
#, python-format
msgid "Moving %s to %s (%d files)"
msgstr "Przenoszenie %s do %s (%d pliki)"
-#: ../revisor/base.py:1660 ../revisor/base.py:1683
+#: ../revisor/base.py:1662 ../revisor/base.py:1685
#, python-format
msgid ""
"Moving of the source tree failed (trying copy):\n"
@@ -1794,7 +1794,7 @@ msgstr ""
"\n"
"%s"
-#: ../revisor/base.py:1663 ../revisor/base.py:1686
+#: ../revisor/base.py:1665 ../revisor/base.py:1688
#, python-format
msgid ""
"Copying of the source tree failed:\n"
@@ -1805,7 +1805,7 @@ msgstr ""
"\n"
"%s"
-#: ../revisor/base.py:1706
+#: ../revisor/base.py:1708
#, python-format
msgid ""
"Moving of the installation tree failed (trying copy):\n"
@@ -1816,7 +1816,7 @@ msgstr ""
"\n"
"%s"
-#: ../revisor/base.py:1709
+#: ../revisor/base.py:1711
#, python-format
msgid ""
"Copying of the installation tree failed:\n"
@@ -1827,54 +1827,54 @@ msgstr ""
"\n"
"%s"
-#: ../revisor/base.py:1718
+#: ../revisor/base.py:1720
msgid "Creating ext3 filesystem"
msgstr "Tworzenie systemu plików ext3"
-#: ../revisor/base.py:1725
+#: ../revisor/base.py:1727
msgid "Configuring System"
msgstr "Konfigurowanie systemu"
-#: ../revisor/base.py:1760
+#: ../revisor/base.py:1762
#, python-format
msgid "Copying copy_dir %s to install_root %s"
msgstr "Kopiowanie copy_dir %s do install_root %s"
-#: ../revisor/base.py:1769 ../revisor/pungi.py:404
+#: ../revisor/base.py:1771 ../revisor/pungi.py:404
#, python-format
msgid "Creating %s"
msgstr "Tworzenie %s"
-#: ../revisor/base.py:1773 ../revisor/pungi.py:408
+#: ../revisor/base.py:1775 ../revisor/pungi.py:408
#, python-format
msgid "Copying %s to %s"
msgstr "Kopiowanie %s do %s"
-#: ../revisor/base.py:1792
+#: ../revisor/base.py:1794
msgid "Linking in Source packages"
msgstr "Dowiązywanie pakietów źródłowych"
-#: ../revisor/base.py:1820
+#: ../revisor/base.py:1822
#, python-format
msgid "Setting rundir to %s"
msgstr "Ustawianie rundir na %s"
-#: ../revisor/base.py:1826
+#: ../revisor/base.py:1828
#, python-format
msgid "Directory %s could not be created. Aborting"
msgstr "Nie można utworzyć katalogu %s. Przerywanie"
-#: ../revisor/base.py:1828
+#: ../revisor/base.py:1830
#, python-format
msgid "Running command: %s"
msgstr "Wykonywanie polecenia: %s"
-#: ../revisor/base.py:1829
+#: ../revisor/base.py:1831
#, python-format
msgid "Extra information: %s %s %s"
msgstr "Dodatkowe informacje: %s %s %s"
-#: ../revisor/base.py:1857
+#: ../revisor/base.py:1859
#, python-format
msgid "Got an error from %s (return code %s)"
msgstr "Otrzymano błąd z %s (kod zwrotny %s)"
@@ -2237,30 +2237,32 @@ msgstr "Uruchomienie z obrazu"
msgid "Run from RAM - requires 1 GB+"
msgstr "Uruchomienie z pamięci RAM - wymaga 1 GB+"
-#: ../revisor/image.py:91
-#, python-format
-msgid ""
-"Error encountered during installation of the software you selected:\n"
-"\n"
-"--> %s"
-msgstr ""
-"Wystąpił błąd podczas instalacji wybranego oprogramowania:\n"
-"\n"
-"--> %s"
+#: ../revisor/image.py:93
+msgid "Error encountered during installation of "
+msgstr "Wystąpił błąd podczas instalacji "
#: ../revisor/image.py:97
+#, python-format
+msgid "An additional error in the error. The value of errs is: %s"
+msgstr "Dodatkowy błąd w błędzie. Wartość błędów to: %s"
+
+#: ../revisor/image.py:98
+msgid "An error occurred during the installation "
+msgstr "Wystąpił błąd podczas instalacji "
+
+#: ../revisor/image.py:105
msgid "Running package installation"
msgstr "Wykonywanie instalacji pakietów"
-#: ../revisor/image.py:108
+#: ../revisor/image.py:116
msgid "Installing Software"
msgstr "Instalowanie oprogramowania"
-#: ../revisor/image.py:143
+#: ../revisor/image.py:151
msgid "SELinux requested but not enabled on host"
msgstr "Zażądano SELinuksa, ale nie jest włączony na komputerze"
-#: ../revisor/image.py:195
+#: ../revisor/image.py:203
#, python-format
msgid ""
"Setting self.cfg.payload_livemedia to %s (from 'part /' command in "
@@ -2269,7 +2271,7 @@ msgstr ""
"Ustawianie self.cfg.payload_livemedia na %s (z polecenia \"part /\" w "
"kickstart, zamiast %s)"
-#: ../revisor/image.py:199
+#: ../revisor/image.py:207
#, python-format
msgid ""
"Setting self.cfg.payload_livemedia to %s (from total installed size of RPMs, "
@@ -2278,7 +2280,7 @@ msgstr ""
"Ustawianie self.cfg.payload_livemedia na %s (z całkowitego rozmiaru "
"zainstalowanych pakietów RPM, zamiast %s)"
-#: ../revisor/image.py:204
+#: ../revisor/image.py:212
#, python-format
msgid ""
"Setting self.cfg.payload_livemedia to %s (from 'part /' command in "
@@ -2287,7 +2289,7 @@ msgstr ""
"Ustawianie self.cfg.payload_livemedia na %s (z polecenia \"part /\" w "
"kickstart, tak jak w trybie ponownego komponowania)"
-#: ../revisor/image.py:221
+#: ../revisor/image.py:229
#, python-format
msgid "Filesystem type set to: %s"
msgstr "Typ systemu plików został ustawiony na: %s"
@@ -2657,19 +2659,19 @@ msgid "Group not found: %s"
msgstr "Nie odnaleziono grupy: %s"
#: ../revisor/kickstart.py:302 ../revisor/kickstart.py:330
-#: ../revisor/kickstart.py:714
+#: ../revisor/kickstart.py:717
#, python-format
msgid "Adding %s-%s:%s-%s.%s"
msgstr "Dodawanie %s-%s:%s-%s.%s"
#: ../revisor/kickstart.py:342 ../revisor/kickstart.py:606
-#: ../revisor/kickstart.py:725
+#: ../revisor/kickstart.py:728
#, 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/kickstart.py:345 ../revisor/kickstart.py:609
-#: ../revisor/kickstart.py:728
+#: ../revisor/kickstart.py:731
#, python-format
msgid ""
"Apparently trying to exclude a package that is not available in the "
@@ -2743,7 +2745,7 @@ msgstr "Z grup (opcjonalne): dodawanie %s-%s:%s-%s.%s do transakcji"
msgid "No include parameter for group %s, using defaults"
msgstr "Brak parametru dołączania dla grupy %s, używanie domyślnych"
-#: ../revisor/kickstart.py:508 ../revisor/kickstart.py:677
+#: ../revisor/kickstart.py:508 ../revisor/kickstart.py:680
#: ../revisor/pkgorder.py:111
#, python-format
msgid "Testing condition: %s / %s"
@@ -2773,7 +2775,7 @@ msgstr "Z pakietów: dodawanie %s-%s:%s-%s.%s do transakcji"
msgid "Could not find package '%s', searching..."
msgstr "Nie można odnaleźć pakietu \"%s\", wyszukiwanie..."
-#: ../revisor/kickstart.py:559 ../revisor/misc.py:210
+#: ../revisor/kickstart.py:559 ../revisor/misc.py:201
#, python-format
msgid "Found packages matching '%s': %s"
msgstr "Odnaleziono pakiety pasujące do \"%s\": %s"
@@ -2792,12 +2794,12 @@ msgstr ""
"Odnaleziono więcej niż jeden pakiet dla %s-%s-%s.%s - wszystkie zostaną "
"dodane do transakcji"
-#: ../revisor/kickstart.py:583 ../revisor/misc.py:224
+#: ../revisor/kickstart.py:583 ../revisor/misc.py:215
#, python-format
msgid "Could not find package %s-%s-%s.%s"
msgstr "Nie można odnaleźć pakietu %s-%s-%s.%s"
-#: ../revisor/kickstart.py:586 ../revisor/misc.py:227
+#: ../revisor/kickstart.py:586 ../revisor/misc.py:218
#, python-format
msgid "From Packages (exact string %s-%s-%s.%s), selecting %s-%s-%s.%s"
msgstr "Z pakietów: (dokładny ciąg %s-%s-%s.%s), wybieranie %s-%s-%s.%s"
@@ -2827,16 +2829,7 @@ msgstr "Należy przerwać."
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:53
-msgid ""
-"SELinux is in enforcing mode on this host. Composing media will fail. Please "
-"set SELinux to permissive mode."
-msgstr ""
-"SElinux jest ustawiony w trybie wymuszania na tym komputerze. Skomponowanie "
-"nośnika nie powiedzie się. Proszę ustawić SELinuksa na tryb zezwalania."
-
-#: ../revisor/misc.py:58
+#: ../revisor/misc.py:49
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 "
@@ -2846,35 +2839,35 @@ msgstr ""
"posiadały SELinuksa, a w rezultacie system zainstalowany z tego nośnika "
"również nie będzie posiadał SELinuksa."
-#: ../revisor/misc.py:94
+#: ../revisor/misc.py:85
msgid "cfg parameter to revisor.misc.download_packages() "
msgstr "parametr konfiguracji dla revisor.misc.download_packages() "
-#: ../revisor/misc.py:107
+#: ../revisor/misc.py:98
#, python-format
msgid "Using local copy of %s-%s-%s.%s at %s"
msgstr "Używanie lokalnej kopii %s-%s-%s.%s w %s"
-#: ../revisor/misc.py:117
+#: ../revisor/misc.py:108
msgid "Unable to find a suitable mirror."
msgstr "Nie można odnaleźć odpowiedniego serwera lustrzanego."
-#: ../revisor/misc.py:129
+#: ../revisor/misc.py:120
#, python-format
msgid "Errors were encountered while downloading packages: %s"
msgstr "Wystąpiły błędy podczas pobierania pakietów: %s"
-#: ../revisor/misc.py:197 ../revisor/misc.py:235
+#: ../revisor/misc.py:188 ../revisor/misc.py:226
#, python-format
msgid "Resolved %s"
msgstr "Rozwiązano %s"
-#: ../revisor/misc.py:222
+#: ../revisor/misc.py:213
#, python-format
msgid "More then one package found for %s-%s-%s.%s"
msgstr "Odnaleziono więcej niż jeden pakiet dla %s-%s-%s.%s"
-#: ../revisor/misc.py:238
+#: ../revisor/misc.py:229
#, python-format
msgid ""
"Looking to resolve package %s to a Provides, but we still can't find it."
@@ -2882,71 +2875,71 @@ msgstr ""
"Próba rozwiązania pakietu %s do dostarczanych, ale wciąż nie można go "
"odnaleźć."
-#: ../revisor/misc.py:250
+#: ../revisor/misc.py:241
#, python-format
msgid "Inclusive dependency resolving starts at %s"
msgstr "Dołączanie podczas rozwiązywania zależności zaczyna się o %s"
-#: ../revisor/misc.py:271
+#: ../revisor/misc.py:262
#, python-format
msgid "Inclusive dependency resolving ends at %s"
msgstr "Dołączanie podczas rozwiązywania zależności kończy się o %s"
-#: ../revisor/misc.py:319
+#: ../revisor/misc.py:310
#, python-format
msgid "Cannot find a source rpm for %s"
msgstr "Nie można odnaleźć źródłowego pakietu RPM dla %s"
-#: ../revisor/misc.py:342
+#: ../revisor/misc.py:333
#, python-format
msgid "Disabling %s repository"
msgstr "Wyłączanie repozytorium %s"
-#: ../revisor/misc.py:357
+#: ../revisor/misc.py:348
#, python-format
msgid "No such repository: %s"
msgstr "Brak repozytorium: %s"
-#: ../revisor/misc.py:359
+#: ../revisor/misc.py:350
#, python-format
msgid "Enabling %s repository"
msgstr "Włączanie repozytorium %s"
-#: ../revisor/misc.py:564 ../revisor/misc.py:569
+#: ../revisor/misc.py:555 ../revisor/misc.py:560
#, python-format
msgid "Creating destination directory: %s"
msgstr "Tworzenie katalogu docelowego: %s"
-#: ../revisor/misc.py:567
+#: ../revisor/misc.py:558
#, python-format
msgid "Removing destination directory: %s"
msgstr "Usuwanie katalogu docelowego: %s"
-#: ../revisor/misc.py:581
+#: ../revisor/misc.py:572
#, python-format
msgid "Linking %s => %s"
msgstr "Dowiązywanie %s => %s"
-#: ../revisor/misc.py:584
+#: ../revisor/misc.py:575
#, python-format
msgid "Package hard link failed: %s: %s"
msgstr "Twarde dowiązanie pakietów nie powiodło się: %s: %s"
-#: ../revisor/misc.py:589
+#: ../revisor/misc.py:580
#, python-format
msgid "Copying: %s to %s"
msgstr "Kopiowanie: %s do %s"
-#: ../revisor/misc.py:592
+#: ../revisor/misc.py:583
#, python-format
msgid "Symlinking: %s to %s"
msgstr "Dowiązywanie symboliczne: %s do %s"
-#: ../revisor/misc.py:595
+#: ../revisor/misc.py:586
msgid "Package symlink succeeded"
msgstr "Dowiązanie symboliczne pakietów powiodło się"
-#: ../revisor/misc.py:597 ../revisor/misc.py:604
+#: ../revisor/misc.py:588 ../revisor/misc.py:595
#, python-format
msgid "Package link failed, trying copy: %s: %s"
msgstr "Dowiązanie pakietów nie powiodło się, próba skopiowania: %s: %s"
@@ -3062,7 +3055,7 @@ msgstr ""
msgid "Cannot execute hook %s for plugin %s: %s"
msgstr "Nie można wykonać haka %s dla wtyczki %s: %s"
-#: ../revisor/progress.py:79 ../revisor/modgui/build_media.py:88
+#: ../revisor/progress.py:80 ../revisor/modgui/build_media.py:88
#: ../revisor/modgui/build_media.py:94 ../revisor/modgui/build_media.py:98
#: ../revisor/modgui/build_media.py:99 ../revisor/modgui/build_media.py:100
#: ../revisor/modgui/build_media.py:105 ../revisor/modgui/build_media.py:110
@@ -3092,12 +3085,12 @@ msgstr "Nie można wykonać haka %s dla wtyczki %s: %s"
msgid "Pending..."
msgstr "Oczekiwanie..."
-#: ../revisor/progress.py:80 ../revisor/progress.py:83
+#: ../revisor/progress.py:81 ../revisor/progress.py:84
#: ../revisor/modgui/build_media.py:308 ../revisor/modgui/build_media.py:311
msgid "Running..."
msgstr "Uruchamianie..."
-#: ../revisor/progress.py:84 ../revisor/progress.py:87
+#: ../revisor/progress.py:85 ../revisor/progress.py:88
#: ../revisor/modgui/build_media.py:215 ../revisor/modgui/build_media.py:221
#: ../revisor/modgui/build_media.py:225 ../revisor/modgui/build_media.py:229
#: ../revisor/modgui/build_media.py:230 ../revisor/modgui/build_media.py:235
@@ -3106,47 +3099,47 @@ msgstr "Uruchamianie..."
msgid "Done"
msgstr "Ukończono"
-#: ../revisor/progress.py:190
+#: ../revisor/progress.py:191
msgid "Preparing transaction"
msgstr "Przygotowywanie transakcji"
-#: ../revisor/progress.py:202 ../revisor/progress.py:366
+#: ../revisor/progress.py:203 ../revisor/progress.py:367
#, python-format
msgid "Unable to open %s: %s"
msgstr "Nie można otworzyć %s: %s"
-#: ../revisor/progress.py:203 ../revisor/progress.py:204
-#: ../revisor/progress.py:367
+#: ../revisor/progress.py:204 ../revisor/progress.py:205
+#: ../revisor/progress.py:368
#, python-format
msgid "Installing %s"
msgstr "Instalowanie %s"
-#: ../revisor/progress.py:226 ../revisor/progress.py:387
+#: ../revisor/progress.py:227 ../revisor/progress.py:388
#, python-format
msgid "Updated: %s"
msgstr "Zaktualizowano: %s"
-#: ../revisor/progress.py:228 ../revisor/progress.py:389
+#: ../revisor/progress.py:229 ../revisor/progress.py:390
#, python-format
msgid "Installed: %s"
msgstr "Zainstalowano: %s"
-#: ../revisor/progress.py:241
+#: ../revisor/progress.py:242
#, python-format
msgid "Cleanup %s"
msgstr "Czyszczenie %s"
-#: ../revisor/progress.py:256 ../revisor/progress.py:415
+#: ../revisor/progress.py:257 ../revisor/progress.py:416
#, python-format
msgid "Erased: %s"
msgstr "Usunięto: %s"
-#: ../revisor/progress.py:441
+#: ../revisor/progress.py:442
#, python-format
msgid "Downloading %s"
msgstr "Pobieranie %s"
-#: ../revisor/progress.py:541
+#: ../revisor/progress.py:546
#, python-format
msgid "%s: %s"
msgstr "%s: %s"
@@ -3549,29 +3542,29 @@ msgstr "Nie można odczytać pliku konfiguracji %s"
msgid "Check current directory."
msgstr "Proszę sprawdzić bieżący katalog."
-#: ../revisor/modgui/__init__.py:121
+#: ../revisor/modgui/__init__.py:122
msgid "GUI Mode didn't get RevisorBase instance, which is fatal."
msgstr ""
"Tryb graficzny nie uzyskał instancji RevisorBase, co jest błędem krytycznym."
-#: ../revisor/modgui/__init__.py:190
+#: ../revisor/modgui/__init__.py:191
#, python-format
msgid "Opening up /usr/bin/sudo -u %s /usr/bin/xdg-open %s"
msgstr "Otwieranie /usr/bin/sudo -u %s /usr/bin/xdg-open %s"
-#: ../revisor/modgui/__init__.py:323
+#: ../revisor/modgui/__init__.py:324
msgid "Error downloading packages"
msgstr "Błąd podczas pobierania pakietów"
-#: ../revisor/modgui/__init__.py:338
+#: ../revisor/modgui/__init__.py:339
msgid "Continue"
msgstr "Kontynuuj"
-#: ../revisor/modgui/__init__.py:339
+#: ../revisor/modgui/__init__.py:340
msgid "Dependencies added"
msgstr "Dodano zależność"
-#: ../revisor/modgui/__init__.py:340
+#: ../revisor/modgui/__init__.py:341
msgid ""
"Updating these packages requires additional package changes for proper "
"operation."
@@ -3579,15 +3572,15 @@ msgstr ""
"Zaktualizowanie tych pakietów wymaga dodatkowych zmian pakietów, aby "
"operacja przebiegła prawidłowo."
-#: ../revisor/modgui/__init__.py:349
+#: ../revisor/modgui/__init__.py:350
msgid "Adding for dependencies:\n"
msgstr "Dodawanie zależności:\n"
-#: ../revisor/modgui/__init__.py:350
+#: ../revisor/modgui/__init__.py:351
msgid "Removing for dependencies:\n"
msgstr "Usuwanie zależności:\n"
-#: ../revisor/modgui/__init__.py:351
+#: ../revisor/modgui/__init__.py:352
msgid "Updating for dependencies:\n"
msgstr "Aktualizowanie zależności:\n"
@@ -3885,7 +3878,7 @@ msgstr "Ustawianie zmiany marki na %s"
msgid "The URI to a tree we're supposed to reuse the installer images from."
msgstr "Adres URI drzewa, z którego ma zostać ponownie użyty instalator."
-#: ../revisor/modreuseinstaller/__init__.py:66
+#: ../revisor/modreuseinstaller/__init__.py:68
#, python-format
msgid ""
"Could not access %s/%s, required for reusing a previous tree. Cancelling the "
@@ -3894,17 +3887,17 @@ msgstr ""
"Nie można uzyskać dostępu do %s/%s, wymaganego do ponownego użycia "
"poprzedniego drzewa. Anulowanie ponownego użycia obrazów instalatora"
-#: ../revisor/modreuseinstaller/__init__.py:85
+#: ../revisor/modreuseinstaller/__init__.py:87
#, python-format
msgid "Copying %s/%s to %s/%s"
msgstr "Kopiowanie %s/%s do %s/%s"
-#: ../revisor/modreuseinstaller/__init__.py:88
+#: ../revisor/modreuseinstaller/__init__.py:90
#, python-format
msgid "Copying %s/.discinfo to %s/.discinfo"
msgstr "Kopiowanie %s/.discinfo do %s/.discinfo"
-#: ../revisor/modreuseinstaller/__init__.py:91
+#: ../revisor/modreuseinstaller/__init__.py:93
#, python-format
msgid "Copying %s/.treeinfo to %s/.treeinfo"
msgstr "Kopiowanie %s/.treeinfo do %s/.treeinfo"
14 years, 3 months
- 1
- 0
unity/Makefile.am unity/scripts
by Jeroen van Meeuwen
unity/Makefile.am | 2
unity/scripts/jigdofy_everything.sh | 92 --------------------------------
unity/scripts/jigdofy_respin.sh | 92 ++++++++++++++++++++++++++++++++
unity/scripts/jigdofy_single-cd_spin.sh | 4 -
4 files changed, 95 insertions(+), 95 deletions(-)
New commits:
commit 8af99db78fedb5224703772823d768a7df7245e5
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Tue Feb 2 16:31:56 2010 +0100
Fix indentation
Rename jigdo_everything -> jigdofy_respin
diff --git a/unity/Makefile.am b/unity/Makefile.am
index 6f2b662..c0b8f92 100644
--- a/unity/Makefile.am
+++ b/unity/Makefile.am
@@ -20,7 +20,7 @@ scriptdatadir = $(pkgdatadir)/unity/scripts/
scriptdata_DATA = \
scripts/find_updated_packages.sh \
scripts/gold_vs_respin.sh \
- scripts/jigdofy_everything.sh \
+ scripts/jigdofy_respin.sh \
scripts/jigdofy_everything_spin.sh \
scripts/jigdofy_release.sh \
scripts/jigdofy_single-cd_spin.sh \
diff --git a/unity/scripts/jigdofy_everything.sh b/unity/scripts/jigdofy_everything.sh
deleted file mode 100755
index c24377b..0000000
--- a/unity/scripts/jigdofy_everything.sh
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/bin/bash
-
-function jigdofy() {
- jigdo-file make-template \
- --image=$1 \
- /data/os/distr/fedora/releases/${version}/Everything/$2/os// \
- /data/os/archive/fedora/updates/${version}/$2// \
- --label "Base-$2"="/data/os/distr/fedora/releases/${version}/Everything/$2/os" \
- --uri "Base-$2"="http://mirrors.fedoraproject.org/mirrorlist?redirect=1&path=pub/fedora/li..." \
- --label "Updates-$2"="/data/os/archive/fedora/updates/${version}/$2" \
- --uri "Updates-$2"="http://mirrors.fedoraproject.org/mirrorlist?redirect=1&path=pub/fedora/li..." \
- --jigdo=$jigdofile \
- --template=/var/www/jigdo/templates/${datestamp}/`basename $1`.template \
- --force --merge=$jigdofile \
- --cache=${jigdofile}.cache
-}
-
-export archs=""
-export JIGDOFY_SOURCE_ISO=0
-
-while [ $# -gt 0 ]; do
- case $1 in
- --datestamp)
- export datestamp=$2
- shift; shift
- ;;
- --version)
- export version=$2
- shift; shift
- ;;
- --source)
- export JIGDOFY_SOURCE_ISO=1
- shift
- ;;
-# --product-dir)
-# export product_dir=$2
-# shift; shift
-# ;;
-# --jigdofile)
-# export jigdofile=$2
-# shift; shift
-# ;;
- --arch)
- export archs="${archs} $2"
- shift; shift
- ;;
- esac
-done
-
-if [ -z "$datestamp" -o -z "$version" ]; then
- echo Usage: $0 --datestamp [datestamp] --version [version] --arch [arch1] [[--arch [arch2]] [--arch [arch3]]] [--source]
- exit 1
-fi
-
-export jigdofile=/var/www/jigdo/templates/${datestamp}/Fedora-Unity-${datestamp}-${version}.jigdo
-export product_dir=/data/revisor/${datestamp}/
-
-[ ! -d /var/www/jigdo/data/${datestamp} ] && mkdir -p /var/www/jigdo/data/${datestamp}
-[ ! -d /var/www/jigdo/templates/${datestamp} ] && mkdir -p /var/www/jigdo/templates/${datestamp}
-
-[ ! -f ${jigdofile} ] && touch ${jigdofile}
-
-for arch in ${archs}; do
- for iso in `ls ${product_dir}/f${version}-$arch-respin/iso/*.iso`; do
- jigdofy $iso $arch
- done
- cat ${product_dir}/f${version}-$arch-respin/iso/SHA1SUM >> /var/www/jigdo/templates/${datestamp}/Fedora-Unity-${datestamp}-${version}.SHA1SUM
-done
-
-if [ "${JIGDOFY_SOURCE_ISO}" == "1" ]; then
-# Jigdofy source image
- jigdo-file make-template \
- --image=${product_dir}/f${version}-source-respin/iso/Fedora-Unity-${datestamp}-${version}-source-DVD.iso \
- /data/os/distr/fedora/releases/${version}/Everything/source// \
- /data/os/archive/fedora/updates/${version}/SRPMS// \
- --label "Base-Source"="/data/os/distr/fedora/releases/${version}/Everything/source" \
- --uri "Base-Source"="http://mirrors.fedoraproject.org/mirrorlist?redirect=1&path=pub/fedora/li..." \
- --label "Updates-Source"="/data/os/archive/fedora/updates/${version}/SRPMS" \
- --uri "Updates-Source"="http://mirrors.fedoraproject.org/mirrorlist?redirect=1&path=pub/fedora/li..." \
- --jigdo=${jigdofile} \
- --template=/var/www/jigdo/templates/${datestamp}/Fedora-Unity-${datestamp}-${version}-source-DVD.iso.template \
- --force --merge=${jigdofile} \
- --cache=${jigdofile}.cache
-
- cat ${product_dir}/f${version}-source-respin/iso/SHA1SUM >> /var/www/jigdo/templates/${datestamp}/Fedora-Unity-${datestamp}-${version}.SHA1SUM
-fi
-## Grab sha1sums
-##cat /srv/revisor/*/iso/SHA1SUM >> /var/www/jigdo/templates/${datestamp}/Fedora-Unity-${datestamp}-${version}.SHA1SUM
-
-sed -i -e "s/\+/\%2b/g" $jigdofile
-sed -i -e "s/Template=F/Template=http:\/\/jigdo.fedoraunity.org\/templates\/${datestamp}\/F/g" $jigdofile
-
diff --git a/unity/scripts/jigdofy_respin.sh b/unity/scripts/jigdofy_respin.sh
new file mode 100755
index 0000000..c24377b
--- /dev/null
+++ b/unity/scripts/jigdofy_respin.sh
@@ -0,0 +1,92 @@
+#!/bin/bash
+
+function jigdofy() {
+ jigdo-file make-template \
+ --image=$1 \
+ /data/os/distr/fedora/releases/${version}/Everything/$2/os// \
+ /data/os/archive/fedora/updates/${version}/$2// \
+ --label "Base-$2"="/data/os/distr/fedora/releases/${version}/Everything/$2/os" \
+ --uri "Base-$2"="http://mirrors.fedoraproject.org/mirrorlist?redirect=1&path=pub/fedora/li..." \
+ --label "Updates-$2"="/data/os/archive/fedora/updates/${version}/$2" \
+ --uri "Updates-$2"="http://mirrors.fedoraproject.org/mirrorlist?redirect=1&path=pub/fedora/li..." \
+ --jigdo=$jigdofile \
+ --template=/var/www/jigdo/templates/${datestamp}/`basename $1`.template \
+ --force --merge=$jigdofile \
+ --cache=${jigdofile}.cache
+}
+
+export archs=""
+export JIGDOFY_SOURCE_ISO=0
+
+while [ $# -gt 0 ]; do
+ case $1 in
+ --datestamp)
+ export datestamp=$2
+ shift; shift
+ ;;
+ --version)
+ export version=$2
+ shift; shift
+ ;;
+ --source)
+ export JIGDOFY_SOURCE_ISO=1
+ shift
+ ;;
+# --product-dir)
+# export product_dir=$2
+# shift; shift
+# ;;
+# --jigdofile)
+# export jigdofile=$2
+# shift; shift
+# ;;
+ --arch)
+ export archs="${archs} $2"
+ shift; shift
+ ;;
+ esac
+done
+
+if [ -z "$datestamp" -o -z "$version" ]; then
+ echo Usage: $0 --datestamp [datestamp] --version [version] --arch [arch1] [[--arch [arch2]] [--arch [arch3]]] [--source]
+ exit 1
+fi
+
+export jigdofile=/var/www/jigdo/templates/${datestamp}/Fedora-Unity-${datestamp}-${version}.jigdo
+export product_dir=/data/revisor/${datestamp}/
+
+[ ! -d /var/www/jigdo/data/${datestamp} ] && mkdir -p /var/www/jigdo/data/${datestamp}
+[ ! -d /var/www/jigdo/templates/${datestamp} ] && mkdir -p /var/www/jigdo/templates/${datestamp}
+
+[ ! -f ${jigdofile} ] && touch ${jigdofile}
+
+for arch in ${archs}; do
+ for iso in `ls ${product_dir}/f${version}-$arch-respin/iso/*.iso`; do
+ jigdofy $iso $arch
+ done
+ cat ${product_dir}/f${version}-$arch-respin/iso/SHA1SUM >> /var/www/jigdo/templates/${datestamp}/Fedora-Unity-${datestamp}-${version}.SHA1SUM
+done
+
+if [ "${JIGDOFY_SOURCE_ISO}" == "1" ]; then
+# Jigdofy source image
+ jigdo-file make-template \
+ --image=${product_dir}/f${version}-source-respin/iso/Fedora-Unity-${datestamp}-${version}-source-DVD.iso \
+ /data/os/distr/fedora/releases/${version}/Everything/source// \
+ /data/os/archive/fedora/updates/${version}/SRPMS// \
+ --label "Base-Source"="/data/os/distr/fedora/releases/${version}/Everything/source" \
+ --uri "Base-Source"="http://mirrors.fedoraproject.org/mirrorlist?redirect=1&path=pub/fedora/li..." \
+ --label "Updates-Source"="/data/os/archive/fedora/updates/${version}/SRPMS" \
+ --uri "Updates-Source"="http://mirrors.fedoraproject.org/mirrorlist?redirect=1&path=pub/fedora/li..." \
+ --jigdo=${jigdofile} \
+ --template=/var/www/jigdo/templates/${datestamp}/Fedora-Unity-${datestamp}-${version}-source-DVD.iso.template \
+ --force --merge=${jigdofile} \
+ --cache=${jigdofile}.cache
+
+ cat ${product_dir}/f${version}-source-respin/iso/SHA1SUM >> /var/www/jigdo/templates/${datestamp}/Fedora-Unity-${datestamp}-${version}.SHA1SUM
+fi
+## Grab sha1sums
+##cat /srv/revisor/*/iso/SHA1SUM >> /var/www/jigdo/templates/${datestamp}/Fedora-Unity-${datestamp}-${version}.SHA1SUM
+
+sed -i -e "s/\+/\%2b/g" $jigdofile
+sed -i -e "s/Template=F/Template=http:\/\/jigdo.fedoraunity.org\/templates\/${datestamp}\/F/g" $jigdofile
+
diff --git a/unity/scripts/jigdofy_single-cd_spin.sh b/unity/scripts/jigdofy_single-cd_spin.sh
index f3b7ceb..0bf4f81 100755
--- a/unity/scripts/jigdofy_single-cd_spin.sh
+++ b/unity/scripts/jigdofy_single-cd_spin.sh
@@ -6,9 +6,9 @@ function jigdofy() {
/data/os/distr/fedora/releases/${version}/Fedora/$2/os// \
/data/os/distr/fedora/releases/${version}/Everything/$2/os// \
--label "Fedora-$2"="/data/os/distr/fedora/releases/${version}/Fedora/$2/os" \
- --uri "Fedora-$2"="http://mirrors.fedoraproject.org/mirrorlist?redirect=1&path=pub/fedora/li..." \
+ --uri "Fedora-$2"="http://download.fedoraproject.org/pub/fedora/linux/releases/${version}/Fe..." \
--label "Everything-$2"="/data/os/distr/fedora/releases/${version}/Everything/$2/os" \
- --uri "Everything-$2"="http://mirrors.fedoraproject.org/mirrorlist?redirect=1&path=pub/fedora/li..." \
+ --uri "Everything-$2"="http://download.fedoraproject.org/pub/fedora/linux/releases/${version}/Ev..." \
--jigdo=$jigdofile \
--template=/var/www/jigdo/templates/Fedora-${version}-Single-CD/`basename $1`.template \
--force --merge=$jigdofile \
14 years, 3 months
- 1
- 0
4 commits - configure.ac revisor/base.py revisor/cfg.py revisor/image.py revisor/modisolinux revisor/modreuseinstaller revisor/pkgorder.py revisor/pungi.py revisor.spec.in unity/Makefile.am unity/scripts
by Jeroen van Meeuwen
configure.ac | 4 -
revisor.spec.in | 92 +++++++++++++++++++++----------
revisor/base.py | 4 -
revisor/cfg.py | 10 +--
revisor/image.py | 13 +++-
revisor/modisolinux/__init__.py | 4 -
revisor/modreuseinstaller/__init__.py | 2
revisor/pkgorder.py | 6 +-
revisor/pungi.py | 2
unity/Makefile.am | 21 ++++++-
unity/scripts/jigdofy_everything_spin.sh | 6 +-
11 files changed, 112 insertions(+), 52 deletions(-)
New commits:
commit 50af9619622a948646557f46cd03980d4c8e11a4
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Jan 4 14:43:16 2010 +0100
Start shipping the Unity Scripts
diff --git a/configure.ac b/configure.ac
index 4188aad..9578789 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
-AC_INIT([revisor], 2.1.10)
-AC_SUBST([RELEASE], 4)
+AC_INIT([revisor], 2.1.11)
+AC_SUBST([RELEASE], 1)
AC_CONFIG_SRCDIR(revisor/__init__.py.in)
diff --git a/revisor.spec.in b/revisor.spec.in
index d508267..29bb28f 100644
--- a/revisor.spec.in
+++ b/revisor.spec.in
@@ -12,6 +12,7 @@
%define pkg_reuseinstaller 1
%define pkg_server 0
%define pkg_unity 1
+%define pkg_unity_scripts 1
%define pkg_virt 0
%define pkg_wui 0
@@ -63,61 +64,69 @@ Conflicts: fedora-release < 7
#Conflicts: redhat-release < 5
# Or:
#Conflicts: redhat-release = 4, redhat-release = 3
+Requires: fedora-kickstarts
+Requires: custom-kickstarts
%if ! %{pkg_comps}
-Obsoletes: revisor-comps < %{version}-%{release}
-Provides: revisor-comps = %{version}-%{release}
+Obsoletes: revisor-comps < %{version}-%{release}
+Provides: revisor-comps = %{version}-%{release}
%endif
%if ! %{pkg_cobbler}
-Obsoletes: revisor-cobbler < %{version}-%{release}
-Provides: revisor-cobbler = %{version}-%{release}
+Obsoletes: revisor-cobbler < %{version}-%{release}
+Provides: revisor-cobbler = %{version}-%{release}
%endif
%if ! %{pkg_composer}
-Obsoletes: revisor-composer < %{version}-%{release}
-Provides: revisor-composer = %{version}-%{release}
+Obsoletes: revisor-composer < %{version}-%{release}
+Provides: revisor-composer = %{version}-%{release}
%endif
%if ! %{pkg_delta}
-Obsoletes: revisor-delta < %{version}-%{release}
-Provides: revisor-delta = %{version}-%{release}
+Obsoletes: revisor-delta < %{version}-%{release}
+Provides: revisor-delta = %{version}-%{release}
%endif
%if ! %{pkg_hub}
-Obsoletes: revisor-hub < %{version}-%{release}
-Provides: revisor-hub = %{version}-%{release}
+Obsoletes: revisor-hub < %{version}-%{release}
+Provides: revisor-hub = %{version}-%{release}
%endif
%if ! %{pkg_isolinux}
-Obsoletes: revisor-isolinux < %{version}-%{release}
-Provides: revisor-isolinux = %{version}-%{release}
+Obsoletes: revisor-isolinux < %{version}-%{release}
+Provides: revisor-isolinux = %{version}-%{release}
%endif
%if ! %{pkg_jigdo}
-Obsoletes: revisor-jigdo < %{version}-%{release}
-Provides: revisor-jigdo = %{version}-%{release}
+Obsoletes: revisor-jigdo < %{version}-%{release}
+Provides: revisor-jigdo = %{version}-%{release}
%endif
%if ! %{pkg_mock}
-Obsoletes: revisor-mock < %{version}-%{release}
-Provides: revisor-mock = %{version}-%{release}
+Obsoletes: revisor-mock < %{version}-%{release}
+Provides: revisor-mock = %{version}-%{release}
%endif
%if ! %{pkg_rebrand}
-Obsoletes: revisor-rebrand < %{version}-%{release}
-Provides: revisor-rebrand = %{version}-%{release}
+Obsoletes: revisor-rebrand < %{version}-%{release}
+Provides: revisor-rebrand = %{version}-%{release}
%endif
%if ! %{pkg_reuseinstaller}
-Obsoletes: revisor-reuseinstaller < %{version}-%{release}
-Provides: revisor-reuseinstaller = %{version}-%{release}
+Obsoletes: revisor-reuseinstaller < %{version}-%{release}
+Provides: revisor-reuseinstaller = %{version}-%{release}
%endif
%if ! %{pkg_server}
-Obsoletes: revisor-server < %{version}-%{release}
-Provides: revisor-server = %{version}-%{release}
+Obsoletes: revisor-server < %{version}-%{release}
+Provides: revisor-server = %{version}-%{release}
%endif
%if ! %{pkg_unity}
-Obsoletes: revisor-unity < %{version}-%{release}
-Provides: revisor-unity = %{version}-%{release}
+Obsoletes: revisor-unity < %{version}-%{release}
+Provides: revisor-unity = %{version}-%{release}
+%else
+Requires: revisor-unity = %{version}-%{release}
+%endif
+%if ! %{pkg_unity_scripts}
+Obsoletes: revisor-unity-scripts < %{version}-%{release}
+Provides: revisor-unity-scripts = %{version}-%{release}
%endif
%if ! %{pkg_virt}
-Obsoletes: revisor-virt < %{version}-%{release}
-Provides: revisor-virt = %{version}-%{release}
+Obsoletes: revisor-virt < %{version}-%{release}
+Provides: revisor-virt = %{version}-%{release}
%endif
%if ! %{pkg_wui}
-Obsoletes: revisor-wui < %{version}-%{release}
-Provides: revisor-wui = %{version}-%{release}
+Obsoletes: revisor-wui < %{version}-%{release}
+Provides: revisor-wui = %{version}-%{release}
%endif
%description cli
@@ -298,6 +307,20 @@ Revisor to create Re-Spins and do testing.
%endif
##
+## Fedora Unity Configuration and Scripts for Revisor
+##
+%if %{pkg_unity_scripts}
+%package unity-scripts
+Summary: Fedora Unity Configuration and Scripts for Revisor
+Group: Applications/System
+Requires: revisor-cli
+
+%description unity-scripts
+The configuration files and scripts Fedora Unity uses with
+Revisor to create Re-Spins and do testing.
+%endif
+
+##
## Revisor virtualization plugin
##
%if %{pkg_virt}
@@ -384,6 +407,10 @@ make install DESTDIR=$RPM_BUILD_ROOT
rm -rf %{buildroot}/%{_datadir}/revisor/unity/
%endif
+%if ! %{pkg_unity_scripts}
+ rm -rf %{buildroot}/%{_datadir}/revisor/unity/scripts/
+%endif
+
%if ! %{pkg_virt}
rm -rf %{buildroot}/%{python_sitelib}/revisor/modvirt
%endif
@@ -545,7 +572,14 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_sysconfdir}/revisor-unity/conf.d
%config(noreplace) %{_sysconfdir}/revisor-unity/*.conf
%config(noreplace) %{_sysconfdir}/revisor-unity/conf.d/*
-%{_datadir}/revisor/unity/
+%dir %{_datadir}/revisor/unity/
+%{_datadir}/revisor/unity/*.*
+%endif
+
+%if %{pkg_unity_scripts}
+%files unity-scripts
+%defattr(-,root,root,-)
+%{_datadir}/revisor/unity/scripts/
%endif
%if %{pkg_virt}
diff --git a/unity/Makefile.am b/unity/Makefile.am
index f326e45..6f2b662 100644
--- a/unity/Makefile.am
+++ b/unity/Makefile.am
@@ -16,6 +16,24 @@ unitydata_DATA = \
share/fedora-12-single-cd_isolinux.cfg \
share/fedora-12-respin.cfg
+scriptdatadir = $(pkgdatadir)/unity/scripts/
+scriptdata_DATA = \
+ scripts/find_updated_packages.sh \
+ scripts/gold_vs_respin.sh \
+ scripts/jigdofy_everything.sh \
+ scripts/jigdofy_everything_spin.sh \
+ scripts/jigdofy_release.sh \
+ scripts/jigdofy_single-cd_spin.sh \
+ scripts/live-respin-size-diff.py \
+ scripts/make_me_source_iso.sh \
+ scripts/mock_build_srpm.sh \
+ scripts/mock_respins.sh \
+ scripts/respin.sh \
+ scripts/sync_repo.sh \
+ scripts/torrentify_everything_spin.sh \
+ scripts/torrentify_respin.sh \
+ scripts/torrentify_single-cd_spin.sh
+
revisorconfdir = $(sysconfdir)/revisor-unity/conf.d/
revisorconf_DATA = \
conf/conf.d/fedora-12-everything.cfg \
@@ -259,4 +277,5 @@ EXTRA_DIST = \
conf/conf.d/revisor-f11-x86_64-live-xfce-respin.conf \
$(etcconf_DATA) \
$(revisorconf_DATA) \
- $(unitydata_DATA)
+ $(unitydata_DATA) \
+ $(scriptdata_DATA)
commit 5921e7a936350304ca9470aabc2df61a3f8d8396
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Jan 4 14:38:56 2010 +0100
Fix up jigdofy_everything.sh
diff --git a/unity/scripts/jigdofy_everything_spin.sh b/unity/scripts/jigdofy_everything_spin.sh
index 353979b..982e98e 100755
--- a/unity/scripts/jigdofy_everything_spin.sh
+++ b/unity/scripts/jigdofy_everything_spin.sh
@@ -6,9 +6,9 @@ function jigdofy() {
/data/os/distr/fedora/releases/${version}/Fedora/$2/os// \
/data/os/distr/fedora/releases/${version}/Everything/$2/os// \
--label "Fedora-$2"="/data/os/distr/fedora/releases/${version}/Fedora/$2/os" \
- --uri "Fedora-$2"="http://mirrors.fedoraproject.org/mirrorlist?redirect=1&path=pub/fedora/li..." \
+ --uri "Fedora-$2"="http://mirrors.fedoraproject.org/mirrorlist?redirect=1&path=pub/fedora/li..." \
--label "Everything-$2"="/data/os/distr/fedora/releases/${version}/Everything/$2/os" \
- --uri "Everything-$2"="http://mirrors.fedoraproject.org/mirrorlist?redirect=1&path=pub/fedora/li..." \
+ --uri "Everything-$2"="http://mirrors.fedoraproject.org/mirrorlist?redirect=1&path=pub/fedora/li..." \
--jigdo=$jigdofile \
--template=/var/www/jigdo/templates/Fedora-${version}-Everything/`basename $1`.template \
--force --merge=$jigdofile \
@@ -55,5 +55,5 @@ done
##cat /srv/revisor/*/iso/SHA1SUM >> /var/www/jigdo/templates/${datestamp}/Fedora-Unity-${datestamp}-${version}.SHA1SUM
sed -i -e "s/\+/\%2b/g" $jigdofile
-sed -i -e "s/Template=F/Template=http:\/\/jigdo.fedoraunity.org\/templates\/Fedora-11-Everything\/F/g" $jigdofile
+sed -i -e "s/Template=F/Template=http:\/\/jigdo.fedoraunity.org\/templates\/Fedora-${version}-Everything\/F/g" $jigdofile
commit 60488c4ddf26e5a170cfd21d6c31431de0723432
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Jan 4 14:38:05 2010 +0100
Get rid of $TMPDIR/revisor-pungi
diff --git a/revisor/base.py b/revisor/base.py
index 3c30b71..b4df62d 100644
--- a/revisor/base.py
+++ b/revisor/base.py
@@ -1158,7 +1158,7 @@ class RevisorBase:
run_buildinstall = False
for file in files:
- if not os.access("%s/revisor-pungi/%s/%s/%s/os/%s" % (self.cfg.working_directory, self.cfg.version, self.cfg.model, self.cfg.architecture, file), os.R_OK):
+ if not os.access("%s/revisor-install/%s/%s/%s/os/%s" % (self.cfg.working_directory, self.cfg.version, self.cfg.model, self.cfg.architecture, file), os.R_OK):
run_buildinstall = True
@@ -1174,7 +1174,7 @@ class RevisorBase:
# # Nuke stage2.img
# if self.cfg.install_nogr:
# try:
-# os.unlink(os.path.join(self.cfg.working_directory, "revisor-pungi", self.cfg.version, self.cfg.model, self.cfg.architecture, "os", "images", "stage2.img"))
+# os.unlink(os.path.join(self.cfg.working_directory, "revisor-install", self.cfg.version, self.cfg.model, self.cfg.architecture, "os", "images", "stage2.img"))
# except:
# pass
diff --git a/revisor/cfg.py b/revisor/cfg.py
index 0a9343b..801344b 100644
--- a/revisor/cfg.py
+++ b/revisor/cfg.py
@@ -134,7 +134,7 @@ class ConfigStore:
# No xsltproc no glory
return self.comps
- self.comps = os.path.join(self.working_directory,"revisor-pungi",self.version,self.model,"comps.xml")
+ self.comps = os.path.join(self.working_directory,"revisor-install",self.version,self.model,"comps.xml")
doc = libxml2.newDoc("1.0")
dtd = doc.newDtd('comps', '-//Red Hat, Inc.//DTD Comps info//EN', 'comps.dtd')
@@ -199,7 +199,7 @@ class ConfigStore:
# No xsltproc no glory
return self.comps
- self.comps = os.path.join(self.working_directory,"revisor-pungi",self.version,self.revisor_model,"comps.xml")
+ self.comps = os.path.join(self.working_directory,"revisor-install",self.version,self.revisor_model,"comps.xml")
ourcomps = open(self.comps, "w")
ourcomps.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE comps PUBLIC \"-//Red Hat, Inc.//DTD Comps info//EN\" \"comps.dtd\">\n<comps>\n")
@@ -245,7 +245,7 @@ class ConfigStore:
complain = False
if os.access(os.path.join(self.working_directory,"pungi-revisor"), os.R_OK):
complain = True
- if os.access(os.path.join(self.working_directory,"revisor-pungi"), os.R_OK):
+ if os.access(os.path.join(self.working_directory,"revisor-install"), os.R_OK):
complain = True
if os.access(os.path.join(self.working_directory,"revisor"), os.R_OK):
complain = True
@@ -264,8 +264,8 @@ class ConfigStore:
complain = False
if os.access(os.path.join(self.working_directory,"pungi-revisor"), os.R_OK):
shutil.rmtree(os.path.join(self.working_directory,"pungi-revisor"))
- if os.access(os.path.join(self.working_directory,"revisor-pungi"), os.R_OK):
- shutil.rmtree(os.path.join(self.working_directory,"revisor-pungi"))
+ if os.access(os.path.join(self.working_directory,"revisor-install"), os.R_OK):
+ shutil.rmtree(os.path.join(self.working_directory,"revisor-install"))
if os.access(os.path.join(self.working_directory,"revisor"), os.R_OK):
if os.path.ismount("%s%s" % (self.working_directory,"revisor")):
for f in ["/sys", "/proc", "/dev/pts", "/dev", "/selinux", "/yum-cache", "/var/cache/yum", ""]:
diff --git a/revisor/modisolinux/__init__.py b/revisor/modisolinux/__init__.py
index d6ff0e0..83e345d 100644
--- a/revisor/modisolinux/__init__.py
+++ b/revisor/modisolinux/__init__.py
@@ -83,10 +83,10 @@ class RevisorIsolinux:
if not self.cfg.isolinux_cfg == False and not self.cfg.isolinux_cfg == "":
self.log.debug(_("Going to replace isolinux/isolinux.cfg with %s") % (self.cfg.isolinux_cfg), level=7)
try:
- os.unlink(os.path.join(self.cfg.working_directory, "revisor-pungi", self.cfg.version, self.cfg.model, self.cfg.architecture, "os", "isolinux", "isolinux.cfg"))
+ os.unlink(os.path.join(self.cfg.working_directory, "revisor-install", self.cfg.version, self.cfg.model, self.cfg.architecture, "os", "isolinux", "isolinux.cfg"))
self.log.debug(_("Deleted the old isolinux.cfg"), level=9)
try:
- shutil.copy(self.cfg.isolinux_cfg, os.path.join(self.cfg.working_directory, "revisor-pungi", self.cfg.version, self.cfg.model, self.cfg.architecture, "os", "isolinux", "isolinux.cfg"))
+ shutil.copy(self.cfg.isolinux_cfg, os.path.join(self.cfg.working_directory, "revisor-install", self.cfg.version, self.cfg.model, self.cfg.architecture, "os", "isolinux", "isolinux.cfg"))
self.log.debug(_("Inserted the new isolinux.cfg"), level=9)
except:
self.log.warning(_("Could not copy in the new isolinux.cfg"))
diff --git a/revisor/modreuseinstaller/__init__.py b/revisor/modreuseinstaller/__init__.py
index c9e81de..ff1db0a 100644
--- a/revisor/modreuseinstaller/__init__.py
+++ b/revisor/modreuseinstaller/__init__.py
@@ -80,7 +80,7 @@ class RevisorReuseinstaller:
else:
dirs = [ "EFI", "isolinux", "images" ]
- target = os.path.join(self.cfg.working_directory, "revisor-pungi", self.cfg.version, self.cfg.model, self.cfg.architecture, "os")
+ target = os.path.join(self.cfg.working_directory, "revisor-install", self.cfg.version, self.cfg.model, self.cfg.architecture, "os")
for dir in dirs:
if os.access(os.path.join(self.cfg.reuse, dir), os.R_OK):
diff --git a/revisor/pkgorder.py b/revisor/pkgorder.py
index 9e1c83e..99319bd 100644
--- a/revisor/pkgorder.py
+++ b/revisor/pkgorder.py
@@ -63,13 +63,13 @@ class PackageOrderer(yum.YumBase):
self.arch = "i686"
# We're gonna use this an awful lot
- self.toppath = os.path.join(self.cfg.working_directory,"revisor-pungi",self.cfg.version,self.cfg.model,self.cfg.architecture,"os")
+ self.toppath = os.path.join(self.cfg.working_directory,"revisor-install",self.cfg.version,self.cfg.model,self.cfg.architecture,"os")
- self.cfg.pkgorder_file = os.path.join(self.cfg.working_directory,"revisor-pungi","pkgorder-file")
+ self.cfg.pkgorder_file = os.path.join(self.cfg.working_directory,"revisor-install","pkgorder-file")
# If we have a pkgorder file set already, see if we can use that one.
self.log.debug("Setting pkgorder_file to %s" % self.cfg.pkgorder_file)
- self.testpath = tempfile.mkdtemp(dir=os.path.join(self.cfg.working_directory,"revisor-pungi"), prefix="pkgorder-root-")
+ self.testpath = tempfile.mkdtemp(dir=os.path.join(self.cfg.working_directory,"revisor-install"), prefix="pkgorder-root-")
os.makedirs(os.path.join(self.testpath,"etc"))
def addGroups(self, groupLst):
diff --git a/revisor/pungi.py b/revisor/pungi.py
index 03669f6..8086738 100644
--- a/revisor/pungi.py
+++ b/revisor/pungi.py
@@ -37,7 +37,7 @@ class RevisorPungi:
self.cfg = base.cfg
self.log = base.log
- self.destdir = os.path.join(self.cfg.working_directory,"revisor-pungi")
+ self.destdir = os.path.join(self.cfg.working_directory,"revisor-install")
self.archdir = os.path.join(self.destdir,
self.cfg.version,
self.cfg.model,
commit 4a1adc6a97a2f076e8da45c706980a1733567a23
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Jan 4 14:37:48 2010 +0100
Be more verbose if errors keep occuring
diff --git a/revisor/image.py b/revisor/image.py
index 406955e..45ce221 100644
--- a/revisor/image.py
+++ b/revisor/image.py
@@ -89,9 +89,16 @@ class ImageCreator(imgcreate.creator.ImageCreator):
if os.access(self.cfg.yumobj.conf.installroot + "/etc/yum.conf", os.R_OK):
os.unlink(self.cfg.yumobj.conf.installroot + "/etc/yum.conf")
- self.log.error(_("""Error encountered during installation of the software you selected:
-
---> %s""") % '\r\n--> '.join([message for (message, details,) in errs.value]), recoverable=False)
+ try:
+ self.log.error(_( "Error encountered during installation of " + \
+ "the software you selected:\r\n\r\n" + \
+ "--> %s") % '\r\n--> '.join([message for (message, details,) in errs.value]), recoverable=False)
+ except AttributeError:
+ self.log.debug(_("An additional error in the error. The value of errs is: %s") % errs, level=9)
+ self.log.error(_( "An error occurred during the installation " + \
+ "of the software you selected, and an " + \
+ "additional error occurred trying to " + \
+ "describe what went wrong exactly."), recoverable=False)
def runInstall(self, pbar=None):
14 years, 3 months
- 1
- 0
- ← Newer
- 1
- Older →