unity/scripts/respin.sh | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 61a19a183b9bc4486229255f873a33c486303942
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Fri Feb 27 17:48:38 2009 +0100
Make the log file end up in the correct location (revisor_cwd)
Redirect stderr to the log file, too
diff --git a/unity/scripts/respin.sh b/unity/scripts/respin.sh
index 3714e9f..70a25d6 100755
--- a/unity/scripts/respin.sh
+++ b/unity/scripts/respin.sh
@@ -26,7 +26,8 @@
# # config_opts['plugin_conf']['bind_mount_enable'] = True
# config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/selinux/', '/selinux/' ))
# config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/srv/revisor/', '/srv/revisor/' ))
-# # (optional)
+# # (optional, saves you a lot of downloads if you run the default revisor setup and are respinning
+# # in batch)
# config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/var/tmp/revisor-yumcache/', '/var/tmp/revisor-yumcache/' ))
#
##
@@ -231,6 +232,7 @@ for version in $VERSIONS; do
fi
if [ $INSTALL -eq 1 ]; then
+ cd ${revisor_cwd}
[ $JUST_LIST -eq 1 ] && echo f$version-$arch-respin && continue
@@ -257,7 +259,7 @@ for version in $VERSIONS; do
./revisor.py --cli --config unity/conf/f$version-install-respin.conf \\
--destination-directory /srv/revisor/$datestamp/ \\
--model f$version-$arch-respin --debug 9 \\
- --clean-up $cleanup\n" | mock -v -r fedora-$version-$arch shell >> revisor-f$version-$arch-respin.log
+ --clean-up $cleanup\n" | mock -v -r fedora-$version-$arch shell >> revisor-f$version-$arch-respin.log 2>&1
[ $? -gt 0 ] && \
printf "Spin f$version-$arch-respin failed, log file attached.$MESSAGE_END" "$datestamp" "f$version-$arch-respin" \
1
0
switchhere | 8 ++++----
unity/scripts/respin.sh | 10 +---------
2 files changed, 5 insertions(+), 13 deletions(-)
New commits:
commit 0c142081868d042abc07a4ad782cb284793c245e
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Fri Feb 27 17:44:08 2009 +0100
Fix indentation in switchhere
Fix |tee -a (use >> instead) so we get the correct $?
diff --git a/switchhere b/switchhere
index 26455a9..436d9b4 100755
--- a/switchhere
+++ b/switchhere
@@ -8,11 +8,11 @@ else
fi
if [ -z "$answer" -o "${answer[0]}" == "N" -o "${answer[0]}" == "n" ]; then
- echo "Quitting."
- exit 0
+ echo "Quitting."
+ exit 0
elif [ "$answer" != "Y" -a "$answer" != "y" ]; then
- echo "That was no sane input. Quitting."
- exit 0
+ echo "That was no sane input. Quitting."
+ exit 0
fi
[ -d /etc/revisor ] && sudo rm -rf /etc/revisor
diff --git a/unity/scripts/respin.sh b/unity/scripts/respin.sh
index f2a06db..3714e9f 100755
--- a/unity/scripts/respin.sh
+++ b/unity/scripts/respin.sh
@@ -238,14 +238,6 @@ for version in $VERSIONS; do
echo "Creating $spin"
- mock -r fedora-$version-$arch clean | tee revisor-f$version-$arch-respin.log && \
- mock -r fedora-$version-$arch init | tee -a revisor-f$version-$arch-respin.log && \
- mock -r fedora-$version-$arch install $revisor_deps | tee -a revisor-f$version-$arch-respin.log && \
- echo -en "git clone git://git.fedorahosted.org/revisor\n" | mock -r fedora-$version-$arch shell | tee -a revisor-f$version-$arch-respin.log && \
- echo -en "cd /revisor; ./switchhere --yes\n" | mock -r fedora-$version-$arch shell | tee -a revisor-f$version-$arch-respin.log && \
- echo -en "cd /revisor; autoreconf && ./configure\n" | mock -r fedora-$version-$arch shell | tee -a revisor-f$version-$arch-respin.log && \
- echo -en "find /var/lib/rpm/ -name '__db.*' -delete\n" | mock -r fedora-$version-$arch shell | tee -a revisor-f$version-$arch-respin.log && \
-
sleep 10
datestamp=`date +'%Y%m%d'`
@@ -265,7 +257,7 @@ for version in $VERSIONS; do
./revisor.py --cli --config unity/conf/f$version-install-respin.conf \\
--destination-directory /srv/revisor/$datestamp/ \\
--model f$version-$arch-respin --debug 9 \\
- --clean-up $cleanup\n" | mock -v -r fedora-$version-$arch shell | tee -a revisor-f$version-$arch-respin.log
+ --clean-up $cleanup\n" | mock -v -r fedora-$version-$arch shell >> revisor-f$version-$arch-respin.log
[ $? -gt 0 ] && \
printf "Spin f$version-$arch-respin failed, log file attached.$MESSAGE_END" "$datestamp" "f$version-$arch-respin" \
1
0
unity/scripts/respin.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 9c98608ca7dc95916b9b4c08c52d56dfe346f76b
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Fri Feb 27 17:27:20 2009 +0100
Add the architecture to the package names in rpms.log
diff --git a/unity/scripts/respin.sh b/unity/scripts/respin.sh
index 2eb0eb6..f2a06db 100755
--- a/unity/scripts/respin.sh
+++ b/unity/scripts/respin.sh
@@ -219,7 +219,7 @@ for version in $VERSIONS; do
sudo mount -o loop,ro ${isoimage} /tmp/loopmount_iso && \
sudo mount -o loop,ro /tmp/loopmount_iso/LiveOS/squashfs.img /tmp/loopmount_squashfs && \
sudo mount -o loop,ro /tmp/loopmount_squashfs/LiveOS/ext3fs.img /tmp/loopmount_ext3fs && \
- sudo chroot /tmp/loopmount_ext3fs/ rpm -qa --qf "%{SIZE}\t%{NAME}\n" | sort -n -r > rpms-$spin.log && \
+ sudo chroot /tmp/loopmount_ext3fs/ rpm -qa --qf "%{SIZE}\t%{NAME}.%{ARCH}\n" | sort -n -r > rpms-$spin.log && \
sudo mv rpms-$spin.log /srv/revisor/$datestamp/$spin/log/
sudo umount /tmp/loopmount_ext3fs && \
sudo umount /tmp/loopmount_squashfs && \
commit 76259322d02e2ebe72bd07f697957ac7e33c4b2c
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Fri Feb 27 17:26:15 2009 +0100
Remove the head -n 1 testing thing
diff --git a/unity/scripts/respin.sh b/unity/scripts/respin.sh
index b415582..2eb0eb6 100755
--- a/unity/scripts/respin.sh
+++ b/unity/scripts/respin.sh
@@ -179,7 +179,7 @@ for version in $VERSIONS; do
if [ $LIVE -eq 1 ]; then
cd ${revisor_cwd}
- for spin in `${revisor_cmd} --config /etc/revisor-unity/f$version-live-respin.conf --list-models | grep "^ f$version-$arch-" | awk '{print $1}' | head -n 1`; do
+ for spin in `${revisor_cmd} --config /etc/revisor-unity/f$version-live-respin.conf --list-models | grep "^ f$version-$arch-" | awk '{print $1}'`; do
echo "Creating $spin"
1
0
unity/scripts/respin.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 9c98608ca7dc95916b9b4c08c52d56dfe346f76b
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Fri Feb 27 17:27:20 2009 +0100
Add the architecture to the package names in rpms.log
diff --git a/unity/scripts/respin.sh b/unity/scripts/respin.sh
index 2eb0eb6..f2a06db 100755
--- a/unity/scripts/respin.sh
+++ b/unity/scripts/respin.sh
@@ -219,7 +219,7 @@ for version in $VERSIONS; do
sudo mount -o loop,ro ${isoimage} /tmp/loopmount_iso && \
sudo mount -o loop,ro /tmp/loopmount_iso/LiveOS/squashfs.img /tmp/loopmount_squashfs && \
sudo mount -o loop,ro /tmp/loopmount_squashfs/LiveOS/ext3fs.img /tmp/loopmount_ext3fs && \
- sudo chroot /tmp/loopmount_ext3fs/ rpm -qa --qf "%{SIZE}\t%{NAME}\n" | sort -n -r > rpms-$spin.log && \
+ sudo chroot /tmp/loopmount_ext3fs/ rpm -qa --qf "%{SIZE}\t%{NAME}.%{ARCH}\n" | sort -n -r > rpms-$spin.log && \
sudo mv rpms-$spin.log /srv/revisor/$datestamp/$spin/log/
sudo umount /tmp/loopmount_ext3fs && \
sudo umount /tmp/loopmount_squashfs && \
1
0
unity/scripts/respin.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 76259322d02e2ebe72bd07f697957ac7e33c4b2c
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Fri Feb 27 17:26:15 2009 +0100
Remove the head -n 1 testing thing
diff --git a/unity/scripts/respin.sh b/unity/scripts/respin.sh
index b415582..2eb0eb6 100755
--- a/unity/scripts/respin.sh
+++ b/unity/scripts/respin.sh
@@ -179,7 +179,7 @@ for version in $VERSIONS; do
if [ $LIVE -eq 1 ]; then
cd ${revisor_cwd}
- for spin in `${revisor_cmd} --config /etc/revisor-unity/f$version-live-respin.conf --list-models | grep "^ f$version-$arch-" | awk '{print $1}' | head -n 1`; do
+ for spin in `${revisor_cmd} --config /etc/revisor-unity/f$version-live-respin.conf --list-models | grep "^ f$version-$arch-" | awk '{print $1}'`; do
echo "Creating $spin"
1
0
configure.ac revisor.spec.in revisor/splittree.py scripts/Makefile.am
by Jeroen van Meeuwen 26 Feb '09
by Jeroen van Meeuwen 26 Feb '09
26 Feb '09
configure.ac | 2 +-
revisor.spec.in | 14 +++++++++++---
revisor/splittree.py | 3 ++-
scripts/Makefile.am | 2 +-
4 files changed, 15 insertions(+), 6 deletions(-)
New commits:
commit ec44a982b31295345dd4e136259f82bbbf08460b
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Thu Feb 26 08:14:16 2009 +0100
Fix some packaging issues
Bump version number
diff --git a/configure.ac b/configure.ac
index eff8bba..33d2ebe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([revisor], 2.1.3)
+AC_INIT([revisor], 2.1.4)
AC_SUBST([RELEASE], 1)
AC_CONFIG_SRCDIR(revisor/__init__.py.in)
diff --git a/revisor.spec.in b/revisor.spec.in
index c4f8c91..e7b638d 100644
--- a/revisor.spec.in
+++ b/revisor.spec.in
@@ -388,6 +388,7 @@ desktop-file-install --vendor="fedora" \
rm -rf $RPM_BUILD_ROOT
%files
+%defattr(-,root,root,-)
%files cli
%defattr(-,root,root,-)
@@ -401,8 +402,8 @@ rm -rf $RPM_BUILD_ROOT
%{python_sitelib}/revisor/*.pyo
%{_bindir}/*
%{_sbindir}/*
-%dir %{_libdir}/revisor
-%dir %{_libdir}/revisor/scripts
+%dir %{_prefix}/lib/revisor
+%dir %{_prefix}/lib/revisor/scripts
%dir %{_sysconfdir}/revisor
%dir %{_sysconfdir}/revisor/conf.d
%config(noreplace) %{_sysconfdir}/revisor/revisor.conf
@@ -411,10 +412,11 @@ rm -rf $RPM_BUILD_ROOT
%config(noreplace) %{_sysconfdir}/security/console.apps/*
%{_datadir}/locale/*/LC_MESSAGES/revisor.mo
%defattr(0755,root,root,-)
-%{_libdir}/revisor/scripts/*
+%{_prefix}/lib/revisor/scripts/*
%if %{pkg_comps}
%files comps
+%defattr(-,root,root,-)
%dir %{_datadir}/revisor/comps/
%{_datadir}/revisor/comps/*
%{_datadir}/revisor/comps-cleanup.xsl
@@ -552,6 +554,12 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* @DATESTAMP@ Jeroen van Meeuwen <kanarip a fedoraunity.org> @VERSION@-@RELEASE@
+- Fix configuration file issues
+- Better estimation for the size of a tree that is to become an iso
+- Huge improvements to package ordering
+- Exclude boot.iso from installation media iso files
+
+* Thu Feb 25 2009 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.1.3-1
- Add modmock, modhub, modcomposer
- Rebuild for Fedora 10
- Include modisolinux and modreuseinstaller
diff --git a/revisor/splittree.py b/revisor/splittree.py
index e67b01e..a2105b2 100755
--- a/revisor/splittree.py
+++ b/revisor/splittree.py
@@ -1,9 +1,10 @@
-#!/usr/bin/env python
#
# splittree.py
#
# Copyright (C) 2003, 2004, 2005 Red Hat, Inc. All rights reserved.
#
+# Copyright (C) 2008, 2009, Jeroen van Meeuwen. No rights reserved. Pfff.
+#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index b8da104..23b4bed 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -1,4 +1,4 @@
-scriptdir = $(libdir)/revisor/scripts
+scriptdir = $(prefix)/lib/revisor/scripts
script_SCRIPTS = \
DEVEL-buildinstall \
1
0
conf/conf.d/fedora-10-gold.cfg | 181
conf/conf.d/fedora-9-respin.cfg | 192
conf/conf.d/sample-ks.cfg | 7
conf/revisor.desktop.in | 2
configure.ac | 5
doc/Revisor_Documentation/en-US/Appendix.xml | 475 +
doc/Revisor_Documentation/en-US/Author_Group.xml | 16
doc/Revisor_Documentation/en-US/Book_Info.xml | 34
doc/Revisor_Documentation/en-US/Preface.xml | 56
doc/Revisor_Documentation/en-US/Revision_History.xml | 26
doc/Revisor_Documentation/en-US/Revisor_Documentation.ent | 5
doc/Revisor_Documentation/en-US/Revisor_Documentation.xml | 1505 +++
doc/Revisor_Documentation/en-US/images/icon.svg | 3936 ++++++++++
hub-demo.py | 23
intltool-extract | 1
intltool-merge | 1
intltool-update | 1
po/Changelog | 26
po/POTFILES.in | 3
po/de.po | 501 -
po/es.po | 2244 +++--
po/it.po | 1132 +-
po/pl.po | 673 +
po/pt_BR.po | 385
revisor.spec.in | 105
revisor/Makefile.am | 6
revisor/__init__.py.in | 81
revisor/base.py | 181
revisor/cfg.py | 25
revisor/image.py | 2
revisor/misc.py | 206
revisor/modcomposer/Makefile.am | 8
revisor/modcomposer/__init__.py | 268
revisor/modgui/configuration.py | 4
revisor/modgui/glade/base_buttons.glade | 523 -
revisor/modgui/glade/welcome_buttons.glade | 111
revisor/modhub/Makefile.am | 8
revisor/modhub/__init__.py | 215
revisor/modhub/anaconda-ks.cfg | 20
revisor/modhub/test.ks | 1
revisor/modisolinux/__init__.py | 14
revisor/modjigdo/__init__.py | 3
revisor/modmock/Makefile.am | 8
revisor/modmock/__init__.py | 63
revisor/modrebrand/__init__.py | 75
revisor/modreuseinstaller/__init__.py | 21
revisor/pkgorder.py | 78
revisor/plugins.py | 3
revisor/pungi.py | 18
revisor/splittree.py | 248
scripts/DEVEL-buildinstall | 140
scripts/F10-buildinstall | 2
scripts/Makefile.am | 2
scripts/find-default-groups.py | 26
scripts/repoclosure.py | 4
switchhere | 9
unity/Makefile.am | 12
unity/conf/conf.d/fedora-10-everything.cfg | 3
unity/conf/conf.d/fedora-10-single-cd.cfg | 2
unity/conf/conf.d/fedora-rawhide-single-cd.cfg | 2
unity/conf/conf.d/revisor-f10-i386-live-aos-respin.conf | 87
unity/conf/conf.d/revisor-f10-i386-live-broffice.org-respin.conf | 87
unity/conf/conf.d/revisor-f10-i386-live-desktop-respin.conf | 2
unity/conf/conf.d/revisor-f10-i386-live-developer-respin.conf | 2
unity/conf/conf.d/revisor-f10-i386-live-education-math-respin.conf | 2
unity/conf/conf.d/revisor-f10-i386-live-electronic-lab-respin.conf | 2
unity/conf/conf.d/revisor-f10-i386-live-games-respin.conf | 2
unity/conf/conf.d/revisor-f10-i386-live-kde-respin.conf | 2
unity/conf/conf.d/revisor-f10-i386-live-sugar-respin.conf | 2
unity/conf/conf.d/revisor-f10-i386-live-xfce-respin.conf | 2
unity/conf/conf.d/revisor-f10-i386-rebrand-testing.conf | 2
unity/conf/conf.d/revisor-f10-i386-respin.conf | 3
unity/conf/conf.d/revisor-f10-i386-single-cd.conf | 2
unity/conf/conf.d/revisor-f10-ppc-live-aos-respin.conf | 87
unity/conf/conf.d/revisor-f10-ppc-live-broffice.org-respin.conf | 87
unity/conf/conf.d/revisor-f10-ppc-live-desktop-respin.conf | 2
unity/conf/conf.d/revisor-f10-ppc-live-developer-respin.conf | 2
unity/conf/conf.d/revisor-f10-ppc-live-education-math-respin.conf | 2
unity/conf/conf.d/revisor-f10-ppc-live-electronic-lab-respin.conf | 2
unity/conf/conf.d/revisor-f10-ppc-live-games-respin.conf | 2
unity/conf/conf.d/revisor-f10-ppc-live-kde-respin.conf | 2
unity/conf/conf.d/revisor-f10-ppc-live-sugar-respin.conf | 2
unity/conf/conf.d/revisor-f10-ppc-live-xfce-respin.conf | 2
unity/conf/conf.d/revisor-f10-ppc-respin.conf | 2
unity/conf/conf.d/revisor-f10-ppc-single-cd.conf | 2
unity/conf/conf.d/revisor-f10-ppc64-live-aos-respin.conf | 87
unity/conf/conf.d/revisor-f10-ppc64-live-broffice.org-respin.conf | 87
unity/conf/conf.d/revisor-f10-ppc64-live-desktop-respin.conf | 2
unity/conf/conf.d/revisor-f10-ppc64-live-developer-respin.conf | 2
unity/conf/conf.d/revisor-f10-ppc64-live-education-math-respin.conf | 2
unity/conf/conf.d/revisor-f10-ppc64-live-electronic-lab-respin.conf | 2
unity/conf/conf.d/revisor-f10-ppc64-live-games-respin.conf | 2
unity/conf/conf.d/revisor-f10-ppc64-live-kde-respin.conf | 2
unity/conf/conf.d/revisor-f10-ppc64-live-sugar-respin.conf | 2
unity/conf/conf.d/revisor-f10-ppc64-live-xfce-respin.conf | 2
unity/conf/conf.d/revisor-f10-ppc64-respin.conf | 2
unity/conf/conf.d/revisor-f10-ppc64-single-cd.conf | 2
unity/conf/conf.d/revisor-f10-x86_64-live-aos-respin.conf | 88
unity/conf/conf.d/revisor-f10-x86_64-live-broffice.org-respin.conf | 88
unity/conf/conf.d/revisor-f10-x86_64-live-desktop-respin.conf | 3
unity/conf/conf.d/revisor-f10-x86_64-live-developer-respin.conf | 3
unity/conf/conf.d/revisor-f10-x86_64-live-education-math-respin.conf | 3
unity/conf/conf.d/revisor-f10-x86_64-live-electronic-lab-respin.conf | 3
unity/conf/conf.d/revisor-f10-x86_64-live-games-respin.conf | 3
unity/conf/conf.d/revisor-f10-x86_64-live-kde-respin.conf | 3
unity/conf/conf.d/revisor-f10-x86_64-live-sugar-respin.conf | 3
unity/conf/conf.d/revisor-f10-x86_64-live-xfce-respin.conf | 2
unity/conf/conf.d/revisor-f10-x86_64-respin.conf | 2
unity/conf/conf.d/revisor-f10-x86_64-single-cd.conf | 2
unity/conf/conf.d/revisor-f8-ppc-respin.conf | 2
unity/conf/conf.d/revisor-f8-ppc-single-cd.conf | 2
unity/conf/conf.d/revisor-f8-ppc64-respin.conf | 2
unity/conf/conf.d/revisor-f8-ppc64-single-cd.conf | 2
unity/conf/conf.d/revisor-f8-x86_64-respin.conf | 2
unity/conf/conf.d/revisor-f8-x86_64-single-cd.conf | 2
unity/conf/conf.d/revisor-f9-i386-live-desktop-respin.conf | 2
unity/conf/conf.d/revisor-f9-i386-live-developer-respin.conf | 2
unity/conf/conf.d/revisor-f9-i386-live-education-math-respin.conf | 2
unity/conf/conf.d/revisor-f9-i386-live-electronic-lab-respin.conf | 2
unity/conf/conf.d/revisor-f9-i386-live-games-respin.conf | 2
unity/conf/conf.d/revisor-f9-i386-live-kde-respin.conf | 2
unity/conf/conf.d/revisor-f9-i386-live-xfce-respin.conf | 2
unity/conf/conf.d/revisor-f9-i386-rebrand-testing.conf | 2
unity/conf/conf.d/revisor-f9-i386-respin.conf | 2
unity/conf/conf.d/revisor-f9-i386-single-cd.conf | 2
unity/conf/conf.d/revisor-f9-ppc-live-desktop-respin.conf | 2
unity/conf/conf.d/revisor-f9-ppc-live-developer-respin.conf | 2
unity/conf/conf.d/revisor-f9-ppc-live-education-math-respin.conf | 2
unity/conf/conf.d/revisor-f9-ppc-live-electronic-lab-respin.conf | 2
unity/conf/conf.d/revisor-f9-ppc-live-games-respin.conf | 2
unity/conf/conf.d/revisor-f9-ppc-live-kde-respin.conf | 2
unity/conf/conf.d/revisor-f9-ppc-live-xfce-respin.conf | 2
unity/conf/conf.d/revisor-f9-ppc-respin.conf | 2
unity/conf/conf.d/revisor-f9-ppc-single-cd.conf | 2
unity/conf/conf.d/revisor-f9-ppc64-live-desktop-respin.conf | 2
unity/conf/conf.d/revisor-f9-ppc64-live-developer-respin.conf | 2
unity/conf/conf.d/revisor-f9-ppc64-live-education-math-respin.conf | 2
unity/conf/conf.d/revisor-f9-ppc64-live-electronic-lab-respin.conf | 2
unity/conf/conf.d/revisor-f9-ppc64-live-games-respin.conf | 2
unity/conf/conf.d/revisor-f9-ppc64-live-kde-respin.conf | 2
unity/conf/conf.d/revisor-f9-ppc64-live-xfce-respin.conf | 2
unity/conf/conf.d/revisor-f9-ppc64-respin.conf | 2
unity/conf/conf.d/revisor-f9-ppc64-single-cd.conf | 2
unity/conf/conf.d/revisor-f9-x86_64-live-desktop-respin.conf | 3
unity/conf/conf.d/revisor-f9-x86_64-live-developer-respin.conf | 3
unity/conf/conf.d/revisor-f9-x86_64-live-education-math-respin.conf | 3
unity/conf/conf.d/revisor-f9-x86_64-live-electronic-lab-respin.conf | 3
unity/conf/conf.d/revisor-f9-x86_64-live-games-respin.conf | 3
unity/conf/conf.d/revisor-f9-x86_64-live-kde-respin.conf | 3
unity/conf/conf.d/revisor-f9-x86_64-live-xfce-respin.conf | 3
unity/conf/conf.d/revisor-f9-x86_64-respin.conf | 2
unity/conf/conf.d/revisor-f9-x86_64-single-cd.conf | 2
unity/conf/conf.d/revisor-os9-i386-single-cd.conf | 2
unity/conf/conf.d/revisor-os9-ppc-single-cd.conf | 2
unity/conf/conf.d/revisor-os9-ppc64-single-cd.conf | 2
unity/conf/conf.d/revisor-os9-x86_64-single-cd.conf | 2
unity/conf/f10-install-respin.conf | 1
unity/conf/f10-install-single-cd.conf | 77
unity/conf/f10-live-respin.conf | 1153 +-
unity/conf/f9-install-respin.conf | 9
unity/conf/f9-live-respin.conf | 8
unity/conf/rawhide-install-respin.conf | 8
unity/scripts/make_me_source_iso.sh | 54
unity/scripts/mock_respins.sh | 45
unity/scripts/respin.sh | 286
unity/scripts/torrentify_respin.sh | 55
166 files changed, 13014 insertions(+), 3498 deletions(-)
New commits:
commit ec44a982b31295345dd4e136259f82bbbf08460b
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Thu Feb 26 08:14:16 2009 +0100
Fix some packaging issues
Bump version number
diff --git a/configure.ac b/configure.ac
index eff8bba..33d2ebe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([revisor], 2.1.3)
+AC_INIT([revisor], 2.1.4)
AC_SUBST([RELEASE], 1)
AC_CONFIG_SRCDIR(revisor/__init__.py.in)
diff --git a/revisor.spec.in b/revisor.spec.in
index c4f8c91..e7b638d 100644
--- a/revisor.spec.in
+++ b/revisor.spec.in
@@ -388,6 +388,7 @@ desktop-file-install --vendor="fedora" \
rm -rf $RPM_BUILD_ROOT
%files
+%defattr(-,root,root,-)
%files cli
%defattr(-,root,root,-)
@@ -401,8 +402,8 @@ rm -rf $RPM_BUILD_ROOT
%{python_sitelib}/revisor/*.pyo
%{_bindir}/*
%{_sbindir}/*
-%dir %{_libdir}/revisor
-%dir %{_libdir}/revisor/scripts
+%dir %{_prefix}/lib/revisor
+%dir %{_prefix}/lib/revisor/scripts
%dir %{_sysconfdir}/revisor
%dir %{_sysconfdir}/revisor/conf.d
%config(noreplace) %{_sysconfdir}/revisor/revisor.conf
@@ -411,10 +412,11 @@ rm -rf $RPM_BUILD_ROOT
%config(noreplace) %{_sysconfdir}/security/console.apps/*
%{_datadir}/locale/*/LC_MESSAGES/revisor.mo
%defattr(0755,root,root,-)
-%{_libdir}/revisor/scripts/*
+%{_prefix}/lib/revisor/scripts/*
%if %{pkg_comps}
%files comps
+%defattr(-,root,root,-)
%dir %{_datadir}/revisor/comps/
%{_datadir}/revisor/comps/*
%{_datadir}/revisor/comps-cleanup.xsl
@@ -552,6 +554,12 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* @DATESTAMP@ Jeroen van Meeuwen <kanarip a fedoraunity.org> @VERSION@-@RELEASE@
+- Fix configuration file issues
+- Better estimation for the size of a tree that is to become an iso
+- Huge improvements to package ordering
+- Exclude boot.iso from installation media iso files
+
+* Thu Feb 25 2009 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.1.3-1
- Add modmock, modhub, modcomposer
- Rebuild for Fedora 10
- Include modisolinux and modreuseinstaller
diff --git a/revisor/splittree.py b/revisor/splittree.py
index e67b01e..a2105b2 100755
--- a/revisor/splittree.py
+++ b/revisor/splittree.py
@@ -1,9 +1,10 @@
-#!/usr/bin/env python
#
# splittree.py
#
# Copyright (C) 2003, 2004, 2005 Red Hat, Inc. All rights reserved.
#
+# Copyright (C) 2008, 2009, Jeroen van Meeuwen. No rights reserved. Pfff.
+#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index b8da104..23b4bed 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -1,4 +1,4 @@
-scriptdir = $(libdir)/revisor/scripts
+scriptdir = $(prefix)/lib/revisor/scripts
script_SCRIPTS = \
DEVEL-buildinstall \
commit a8032d49915bdaeac57948c5e3478c292ea82cc5
Merge: c01918f... 01347e7...
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Thu Feb 26 07:42:06 2009 +0100
Merge branch 'master' of ssh://git.fedorahosted.org/git/revisor
commit c01918f243f974f9993baa6a2d05fea0bbf9b168
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Thu Feb 26 07:38:59 2009 +0100
Do not import these unused items from rhpl.translate
diff --git a/revisor/modjigdo/__init__.py b/revisor/modjigdo/__init__.py
index 3e0f963..7dc102b 100644
--- a/revisor/modjigdo/__init__.py
+++ b/revisor/modjigdo/__init__.py
@@ -22,8 +22,7 @@ import os, sys, re
from optparse import OptionParser
# Translation
-from rhpl.translate import _, N_, getDefaultLangs
-import rhpl.translate as translate
+from rhpl.translate import _
# What it needs to do:
# - Given a checkbox to jigdofy whatever /installation media/ we compose, this stuff gets triggered
commit 96705b498809a2ff0bb91be4bbee55ac3b50333e
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Thu Feb 26 07:38:44 2009 +0100
Update the documentation
diff --git a/doc/Revisor_Documentation/en-US/Appendix.xml b/doc/Revisor_Documentation/en-US/Appendix.xml
index 38ee4a0..7ca7a75 100644
--- a/doc/Revisor_Documentation/en-US/Appendix.xml
+++ b/doc/Revisor_Documentation/en-US/Appendix.xml
@@ -7,6 +7,26 @@
<appendix id="Revisor_Documentation-Appendix-Terminology" label="A">
<title>Terminology</title>
+ <formalpara id="Revisor_Documentation-Appendix-Terminology-model">
+ <title>Model</title>
+ <indexterm>
+ <primary>model</primary>
+ </indexterm>
+ <para>
+ para
+ </para>
+ </formalpara>
+
+ <formalpara id="Revisor_Documentation-Appendix-Terminology-package_manifest">
+ <title>Package Manifest</title>
+ <indexterm>
+ <primary>Package Manifest</primary>
+ </indexterm>
+ <para>
+ A package manifest is the list of groups and packages to include or exclude from a transaction, in a kickstart configuration file.
+ </para>
+ </formalpara>
+
<formalpara id="Revisor_Documentation-Appendix-Terminology-Remix">
<title>Remix</title>
<indexterm>
diff --git a/doc/Revisor_Documentation/en-US/Revisor_Documentation.xml b/doc/Revisor_Documentation/en-US/Revisor_Documentation.xml
index 1e09676..6c0cd2f 100644
--- a/doc/Revisor_Documentation/en-US/Revisor_Documentation.xml
+++ b/doc/Revisor_Documentation/en-US/Revisor_Documentation.xml
@@ -274,6 +274,12 @@
<para>
<screen># <userinput>yum install revisor</userinput></screen>
</para>
+ <note>
+ <title>About EOL Releases</title>
+ <para>
+ Please bear in mind that Fedora releases that are past the point of End-Of-Life, approximatly 13 months after the initial release, are not supported anymore for use with Revisor. Also, the version of Revisor running on these EOL versions of Fedora are not supported anymore.
+ </para>
+ </note>
</section>
</section>
@@ -314,7 +320,27 @@
<section id="Revisor_Documentation-Configuration-Files">
<title>Configuration Files</title>
<para>
- para
+ Revisor uses configuration files for a large part of it's operations. These files mostly reside in <filename>/etc/revisor/</filename>. There is two types of files Revisor uses:
+ </para>
+ <para>
+ <orderedlist>
+ <listitem>
+ <formalpara>
+ <title>Revisor Configuration Files</title>
+ <para>
+ Revisor configuration files, such as <filename>/etc/revisor/revisor.conf</filename>, contain information and settings unique to Revisor. A Revisor configuration file is where you specify default options, and include information on different products you want to compose.
+ </para>
+ </formalpara>
+ </listitem>
+ <listitem>
+ <formalpara>
+ <title>YUM Configuration Files</title>
+ <para>
+ YUM configuration files, such as the files in <filename>/etc/revisor/conf.d/</filename>, contain configuration for YUM. To be more precise, Revisor doesn't even handle the files (it let's YUM do so). The files in <filename>/etc/revisor/conf.d/</filename> practically contain the same information as <filename>/etc/yum.conf</filename> combined with the files in <filename>/etc/yum.repos.d/</filename> (but not exactly the same content!).
+ </para>
+ </formalpara>
+ </listitem>
+ </orderedlist>
</para>
<section id="Revisor_Documentation-Configuration-Files-_etc_revisor_revisor.conf">
@@ -339,7 +365,7 @@
<formalpara>
<title><literal>[<replaceable>model</replaceable>]</literal></title>
<para>
- Model configuration. One section per model.
+ Model configuration. One section per <xref linkend="Revisor_Documentation-Appendix-Terminology-model" />.
</para>
</formalpara>
<para>
@@ -349,13 +375,13 @@
</orderedlist>
</para>
<para>
- Model sections basically define a single product. Amongst other things, the distribution, release version, architecture for the product to be composed and what YUM configuration file to use, are (often) defined on a per-model basis. There is a large number of settings available for models, and they are all related to how the product is going to look like. The product name, the location of the RPM payload for installation media, the ISO label, the YUM configuration file to use, are all model settings.
+ Model sections basically define a single product. Amongst other things, the distribution name, release version, architecture for the product to be composed and what YUM configuration file to use, are (often) defined on a per-model basis. There is a large number of settings available for models, and they are all related to how the product is going to look like. The product name, the location of the RPM payload for installation media, the ISO label, the YUM configuration file to use, are all model settings.
</para>
<para>
- Using models, you can reproduce the outcome of the compose process, a <emphasis>product</emphasis>, simply by not touching the model configuration anymore. If you want something different, you can just add another model section, and name it different.
+ Using models, you can reproduce the outcome of the compose process, a <emphasis>product</emphasis>, simply by not changing the model configuration anymore. If you want something different, you can just add another model section, and name it differently.
</para>
<para>
- To see what models are available, use:
+ To see what models are available with the Revisor standard package, use:
</para>
<para>
<screen>$ <userinput>revisor --list-models</userinput></screen>
@@ -372,14 +398,17 @@
<section id="Revisor_Documentation-Configuration-Files-Updates">
<title>Updates to Configuration Files</title>
<para>
- Something about .rpmnew and .rpmsave files
+ The Revisor packages are not allowed to overwrite files in <filename>/etc/</filename>, and they should thus not do so. If an update to Revisor is installed on your system, files with the extension <literal>.rpmnew</literal> may be created --if you had changed anything in the file before applying the update. Since this world isn't perfect, configuration errors may exist in the configuration files shipped with Revisor. Please pay close attention to updates to these configuration files by examining the <literal>.rpmnew</literal> files.
+ </para>
+ <para>
+ You can use any file location (not just <filename>/etc/revisor/</filename>) for your own custom configuration.
</para>
</section>
<section id="Revisor_Documentation-Configuration-Files-Changing_Configuration_Files">
<title>Changing Configuration Files</title>
<para>
- Something about creating your own Configuration Files
+ If you are creating your own models off of the ones that ship with Revisor itself, please consider using an alternative configuration file (a file other then <filename>/etc/revisor/revisor.conf</filename>, or copy the original file for safekeeping. This way, you can always return to a working, sample configuration file and test whether it is Revisor causing errors, or configuration mistakes.
</para>
</section>
@@ -388,8 +417,47 @@
<section id="Revisor_Documentation-Configuration-Global_and_Model_Configuration">
<title>Global and Model Configuration</title>
<para>
- para
+ The default Revisor configuration file, <filename>/etc/revisor/revisor.conf</filename> consists of multiple sections (the file is in .INI format). One is the <literal>[revisor]</literal> global section, where you specify configuration options that apply to each other section or <xref linkend="Revisor_Documentation-Appendix-Terminology-model" />.
</para>
+ <para>
+ The options specified in the global and model configuration sections apply to the Revisor compose in the following order:
+ </para>
+ <para>
+ <orderedlist>
+ <listitem>
+ <para>
+ The options from the global section are read, tested and set.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ The options from a model section are read, tested and set, regardless of whether the global section had caused the setting to be set to a certain value already.
+ </para>
+ </listitem>
+ </orderedlist>
+ </para>
+ <para>
+ For example, if you know all the models in a configuration file are optical live media products, the configuration sections could look like the following:
+ </para>
+ <para>
+ <screen>[revisor]
+# Optical live media for all models
+media_live_optical = 1
+
+[model1]
+main = /etc/revisor/conf.d/revisor-model1.conf
+description = The model1 product
+architecture = i386
+# This is already configured in the global section of
+# this configuration file and can thus be removed.
+#media_live_optical = 1</screen>
+ </para>
+ <note>
+ <title>When Running the GUI</title>
+ <para>
+ Note that when running Revisor in Graphical User Interface mode, you can still change a lot of the settings supplied by Revisor through the configuration files loaded. When you are running Revisor in GUI mode, the configuration files supply the defaults.
+ </para>
+ </note>
</section>
<section id="Revisor_Documentation-Configuration-Yum_Repositories">
@@ -644,7 +712,7 @@
In Re-Spin mode, the way the RPM payload is determined from kickstart differs from Revisor's normal procedures. See <xref linkend="Revisor_Documentation-Using_Kickstart" /> for more details on using a kickstart package manifest.
</para>
<para>
- A kickstart file's so-called package manifest usually looks like:
+ A kickstart file's so-called <xref linkend="Revisor_Documentation-Appendix-Terminology-package_manifest" /> usually looks like:
</para>
<para>
<screen>%packages
commit 01347e720d5f01345ce2d00080f0e156000ffdc8
Author: Izaac Zavaleta <jorge.izaac(a)gmail.com>
Date: Thu Feb 26 00:54:39 2009 +0000
Updated Spanish translation
Transmitted-via: Transifex (translate.fedoraproject.org)
diff --git a/po/Changelog b/po/Changelog
index 776cf5c..7a9f2f0 100644
--- a/po/Changelog
+++ b/po/Changelog
@@ -1,4 +1,6 @@
-Updated Spanish Translation
+Updated Spanish translation
+
+Transmitted-via: Transifex (translate.fedoraproject.org)Updated Spanish Translation
Transmitted-via: Transifex (translate.fedoraproject.org)Updated Spanish translation
diff --git a/po/es.po b/po/es.po
index 81d0bde..4359302 100644
--- a/po/es.po
+++ b/po/es.po
@@ -12,7 +12,7 @@ msgstr ""
"Project-Id-Version: revisor\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-02-18 01:36+0000\n"
-"PO-Revision-Date: 2009-02-25 14:30-0700\n"
+"PO-Revision-Date: 2009-02-25 17:50-0700\n"
"Last-Translator: Izaac Zavaleta <izaac(a)fedoraproject.org>\n"
"Language-Team: fedora spanish <fedora-trans-es(a)redhat.com>\n"
"MIME-Version: 1.0\n"
@@ -3985,7 +3985,7 @@ msgstr "Revisor, Enchula tu distro"
#, fuzzy
#~ msgid "Removing package %s-%s:%s-%s.%s for rebranding"
-#~ msgstr "Desde los Paquetes: Agregando %s-%s:%s-%s.%s a la transacción"
+#~ msgstr "Removiendo paquete %s-%s:%s-%s.%s para renombrar"
#~ msgid "Root passwords do not match."
#~ msgstr "Las contraseñas de root no coinciden."
@@ -3997,47 +3997,39 @@ msgstr "Revisor, Enchula tu distro"
#~ "No se pudo extraer la información del software. Esto puede ser debido a "
#~ "que no haya conexión de red disponible."
-#, fuzzy
#~ msgid "Adding req. pkg %s-%s:%s-%s.%s"
#~ msgstr "Agregandos paq. req. %s-%s:%s-%s.%s"
-#, fuzzy
#~ msgid "Create Installation Media CDs"
-#~ msgstr "discos de instalación CD o DVD"
+#~ msgstr "Crear CDs de Instalación"
#~ msgid "Build raw HDD install image."
#~ msgstr "Construir una imágen de instalación en disco rígido."
-#, fuzzy
#~ msgid "Plugin %s failed to load"
-#~ msgstr "No se puede cargar el archivo kickstart %s"
+#~ msgstr "Falló a cargar Plugin %s"
#~ msgid "Setting Live Media Ext3 Filesystem Size to %s MB"
#~ msgstr ""
#~ "Configurando el Tamaño del Sistema de Archivo Ext3 del Medio Vivo en %s MB"
-#, fuzzy
#~ msgid "Setting up Ext3 Filesystem"
-#~ msgstr "Preparación de un Servidor PXE"
+#~ msgstr "Configurando sistema de archivos Ext3"
#~ msgid "Successfully set up the installation target for live media."
#~ msgstr "Se configuró destino de instalación del medio vivo con éxito."
-#, fuzzy
#~ msgid "Installing Packages"
-#~ msgstr "Instalación de Paquetes"
+#~ msgstr "Instalando Paquetes"
-#, fuzzy
#~ msgid "Configuring Network"
-#~ msgstr "Configuración Manual de los Parámetros de Red"
+#~ msgstr "Configuración de Red"
-#, fuzzy
#~ msgid "Creating RAM Filesystem"
-#~ msgstr "Correr desde la RAM"
+#~ msgstr "Creando sistema de archivos RAM"
-#, fuzzy
#~ msgid "Configure BootLoader"
-#~ msgstr "Configurar impresoras"
+#~ msgstr "Configurar Cargador de Arranque"
#~ msgid ""
#~ "Launching an interactive shell in the live image. 'exit' when you are "
@@ -4055,9 +4047,8 @@ msgstr "Revisor, Enchula tu distro"
#~ msgid "Unmounting Filesystems"
#~ msgstr "Desmontando los Sistemas de Archivos"
-#, fuzzy
#~ msgid "Creating Squash Filesystem"
-#~ msgstr "Creación de Cuentas de Usuario Adicionales"
+#~ msgstr "Creando sistema de archivos Squash"
#~ msgid ""
#~ "This is going to take a while and might cause the GUI to become "
@@ -4066,9 +4057,8 @@ msgstr "Revisor, Enchula tu distro"
#~ "Esto va a tomar un tiempo y puede causar que la interfase gráfica no "
#~ "responda... se recuperará después de que se complete esta tarea."
-#, fuzzy
#~ msgid "Creating ISO Live Image"
-#~ msgstr "Docs :: Leame de la Imagen Viva"
+#~ msgstr "Creando Imágen ISO en Vivo"
#~ msgid "Cleaning up build environment"
#~ msgstr "Limpiando el entorno de construcción"
@@ -4083,9 +4073,8 @@ msgstr "Revisor, Enchula tu distro"
#~ msgid "Use this directory as the base."
#~ msgstr "Usar este directorio como base."
-#, fuzzy
#~ msgid "Build install tree."
-#~ msgstr "Construir una imágen de instalación en disco rígido."
+#~ msgstr "Construir árbol de instalación."
#~ msgid "Set kickstart to boot by default"
#~ msgstr "Hacer que el kickstart arranque por defecto"
@@ -4140,9 +4129,8 @@ msgstr "Revisor, Enchula tu distro"
#~ "Construir el árbol de instalación. [inferido cuando se usa --cd --dvd --"
#~ "unified o --dvd-dual-layer]"
-#, fuzzy
#~ msgid "Running main routine..."
-#~ msgstr "Nombre genérico de proyecto"
+#~ msgstr "Ejecutando turina principal..."
#~ msgid "Adding required packages for Installation Media"
#~ msgstr "Agregando paquetes requeridos para el Medio de Instalación"
@@ -4168,9 +4156,8 @@ msgstr "Revisor, Enchula tu distro"
#~ msgid "Package link failed, same file: %s: %s"
#~ msgstr "Falló el enlace de paquete, mismo archivo: %s: %s"
-#, fuzzy
#~ msgid "Adding Profile to Cobbler"
-#~ msgstr "Agregando Sistemas Operativos al Menú de Arranque"
+#~ msgstr "Agregando Perfil a Cobbler"
#~ msgid "Adding Distro and Profile to Cobbler"
#~ msgstr "Agregando Distro y Perfil a Cobbler"
@@ -4198,9 +4185,8 @@ msgstr "Revisor, Enchula tu distro"
#~ "Puede estar usando un archivo de configuración viejo, dado que hay una "
#~ "directiva de configuración 'pungi' en %s"
-#, fuzzy
#~ msgid "No model specified."
-#~ msgstr "Reproducir el sonido especificado"
+#~ msgstr "Sin modelo especificado."
#~ msgid "Invalid model specified: %s does not exist in %s"
#~ msgstr "Modelo especificado inválido: %s no existe en %s"
@@ -4290,25 +4276,20 @@ msgstr "Revisor, Enchula tu distro"
#~ msgid "Running in CLI mode..."
#~ msgstr "Corriendo en modo CLI..."
-#, fuzzy
#~ msgid "Xorg is installed: %s"
-#~ msgstr "Software Instalado Manualmente"
+#~ msgstr "Xorg está instalado: %s"
-#, fuzzy
#~ msgid "Default desktop is %s"
-#~ msgstr "La impresora por defecto es %s"
+#~ msgstr "Escritorio predeterminado es %s"
-#, fuzzy
#~ msgid "Gnome is installed: %s"
-#~ msgstr "Software Instalado Manualmente"
+#~ msgstr "Gnome está instalado: %s"
-#, fuzzy
#~ msgid "KDE is installed: %s"
-#~ msgstr "Software Instalado Manualmente"
+#~ msgstr "KDE está instalado: %s"
-#, fuzzy
#~ msgid "XFCE is installed: %s"
-#~ msgstr "Software Instalado Manualmente"
+#~ msgstr "XFCE está instalado: %s"
#~ msgid "anaconda-runtime not installed; not setting up mediacheck"
#~ msgstr "anaconda-runtime no está instalado; no se puso mediacheck"
@@ -4341,29 +4322,25 @@ msgstr "Revisor, Enchula tu distro"
#~ msgid "No IP address and/or netmask specified with static "
#~ msgstr "No hay una dirección IP y/o máscara de red especificado con static"
-#, fuzzy
#~ msgid "Setting SELinux to: %s"
-#~ msgstr "¡Bienvenido a Fedora!"
+#~ msgstr "Poniendo SELinux a: %s"
#~ msgid "Disabling SELinux as we cannot restore contexts"
#~ msgstr ""
#~ "Deshabilitando SELinux debido a que no se pueden restaurar los contextos"
-#, fuzzy
#~ msgid "Setting crypted root password"
-#~ msgstr "Pantalla para Poner la Clave de Root"
+#~ msgstr "Poner clave de root encriptada"
#, fuzzy
#~ msgid "Emptying root password"
-#~ msgstr "Ponga la Contraseña de Root"
+#~ msgstr "Quitando password de root"
-#, fuzzy
#~ msgid "Setting uncrypted root password"
-#~ msgstr "Pantalla para Poner la Clave de Root"
+#~ msgstr "Poniendo clave de root no encriptada"
-#, fuzzy
#~ msgid "Output: %r, Error: %r"
-#~ msgstr "Error del servidor"
+#~ msgstr "Salida: %r, Error: %r"
#~ msgid "No kernels installed: /lib/modules is empty"
#~ msgstr "No se instalaron kernels: /lib/modules está vacío"
@@ -4377,32 +4354,26 @@ msgstr "Revisor, Enchula tu distro"
#~ msgid "syslinux not installed : no suitable *menu.c32 found"
#~ msgstr "syslinux no instalado : no se encontró un *menu.c32 apropiado"
-#, fuzzy
#~ msgid "syslinux not installed : %s not found"
-#~ msgstr "El traductor de {1} no fue encontrado"
+#~ msgstr "syslinux no instalado : %s no encontrado"
-#, fuzzy
#~ msgid "Welcome to %(label)s!"
-#~ msgstr "¡Bienvenido a Fedora!"
+#~ msgstr "¡Bienvenido a %(label)s!"
-#, fuzzy
#~ msgid "Run kernel %s"
-#~ msgstr "Kernel de Linux"
+#~ msgstr "Correr kernel %s"
-#, fuzzy
#~ msgid "Verify and run from image"
#~ msgstr "Verificar y correr desde la imagen"
-#, fuzzy
#~ msgid "Memory Test"
-#~ msgstr "Consola de Pruebas"
+#~ msgstr "Prueba de Memoria"
#~ msgid "Installation target minimized to %dK"
#~ msgstr "El destino de instalación se minimizó a %d K"
-#, fuzzy
#~ msgid "configuration for '%s'"
-#~ msgstr "Una consola especial para la configuración"
+#~ msgstr "configuración para '%s'"
#~ msgid "/usr/lib/livecd-creator/mayflower not found"
#~ msgstr "/usr/lib/livecd-creator/mayflower no encontrado"
commit 9219f52e325f455cd595a5dd8c72cb8d74da5d12
Author: Izaac Zavaleta <jorge.izaac(a)gmail.com>
Date: Thu Feb 26 00:39:37 2009 +0000
Updated Spanish Translation
Transmitted-via: Transifex (translate.fedoraproject.org)
diff --git a/po/Changelog b/po/Changelog
index 18e4ba2..776cf5c 100644
--- a/po/Changelog
+++ b/po/Changelog
@@ -1,4 +1,6 @@
-Updated Spanish translation
+Updated Spanish Translation
+
+Transmitted-via: Transifex (translate.fedoraproject.org)Updated Spanish translation
Transmitted-via: Transifex (translate.fedoraproject.org)Updated Spanish translation
diff --git a/po/es.po b/po/es.po
index 8bab43e..81d0bde 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,3 +1,8 @@
+# translation of es.po to Spanish
+# Spanish translation of Revisor.
+# This file is distributed under the same license as the Revisor package.
+#
+# Izaac Zavaleta <izaac(a)fedoraproject.org>, 2009.
#: ../revisor/modgui/glade/lm_bootloader.glade.h:4
#: ../revisor/modgui/glade/lm_bootloader.glade.h:10
#: ../revisor/modgui/glade/lm_usercustomize.glade.h:1
@@ -36,6 +41,25 @@ msgid ""
" Free Software Foundation, Inc.,\n"
" 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA\n"
msgstr ""
+"\n"
+" Revisor, un producto de Fedora Unity\n"
+" Copyright (C) 2005, 2006, 2007 Fedora Unity\n"
+"\n"
+" Este programa es software libre; usted puede distribuirlo y/o modificarlo\n"
+" bajo los términos de la GNU Licencia Pública General como fué publicada\n"
+" por la Fundación de Software Libre; tanto bajo la versión 2 de la licencia, ó\n"
+" (a su elección) cualquier versión reciente.\n"
+"\n"
+" Éste programa es distribuído conla esperanza de que será útil,\n"
+" pero sin NINGUNA GARANTÍA; ni siquiera bajo la garantía implícita de\n"
+" COMERCIALIZACIÓN ó ADECUADO PARA UN PROPÓSITO PARTICULAR.\n"
+" Vea la GNU Licencia Pública General para más detalles.\n"
+"\n"
+" Usted debío recibir una copia de la GNU Licencia Pública General\n"
+" junto con éste programa; si no, escriba a la\n"
+" Free Software Foundation, Inc.,\n"
+" 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA\n"
+
#: ../revisor/modgui/glade/base_screen.glade.in.h:20
msgid ""
@@ -63,7 +87,7 @@ msgstr ""
"\t* Jeroen van Meeuwen (kanarip) <kanarip(a)fedoraunity.org>\n"
"\n"
"Traductores:\n"
-"\t* Nombre Apellido (pseudónimo) <email(a)dominio.com>"
+"\t* Izaac Zavaleta (izaac) <izaac(a)fedoraproject.org>"
#: ../revisor/modgui/glade/base_screen.glade.in.h:32
msgid "<b>More information about:</b>"
@@ -849,18 +873,18 @@ msgstr ""
"Revisor, un producto de Fedora Unity\n"
"Copyright (C) 2005 - 2008 Fedora Unity\n"
"\n"
-"This program is free software; you can redistribute it and/or modify it "
-"under the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version.\n"
+"Este programa es software libre; usted puede distribuirlo y/o modificarlo "
+"bajo los términos de la GNU Licencia Pública General como fué publicada por "
+"la Fundación de Software Libre; tanto bajo la versión 2 de la licencia, ó "
+"(a su elección) cualquier versión reciente.\n"
"\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public\n"
-"License for more details.\n"
+"Éste programa es distribuído conla esperanza de que será útil, pero con "
+"NINGUNA GARANTÍA; ni siquiera bajo la garantía implícita de COMERCIALIZACIÓN ó "
+"ADECUADO PARA UN PROPÓSITO PARTICULAR. Vea la GNU Licencia Pública\n"
+"General para más detalles.\n"
"\n"
-"You should have received a copy of the GNU General Public License along with "
-"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Usted debío recibir una copia de la GNU Licencia Pública General junto con "
+"éste programa; si no, escriba a la Free Software Foundation, Inc., 51 "
"Franklin St, Fifth Floor, Boston, MA 02110-1301 USA\n"
@@ -872,7 +896,7 @@ msgid ""
msgstr ""
"\n"
"Traductores:\n"
-"\t* Nombre Apellido (pseudónimo) <email(a)dominio.com>\n"
+"\t* Izaac Zavaleta (izaac) <izaac(a)fedoraproject.org>\n"
#: ../revisor/modgui/glade/revisor.glade.h:26
msgid " "
@@ -3766,43 +3790,47 @@ msgstr "Se reemplazara isolinux/isolinux.cfg con %s"
#: ../revisor/modisolinux/__init__.py:87
msgid "Deleted the old isolinux.cfg"
-msgstr ""
+msgstr "Eliminado el antiguo isolinux.cfg"
#: ../revisor/modisolinux/__init__.py:90
msgid "Inserted the new isolinux.cfg"
-msgstr ""
+msgstr "Insertado el nuevo isolinux.cfg"
#: ../revisor/modisolinux/__init__.py:92
msgid "Could not copy in the new isolinux.cfg"
-msgstr ""
+msgstr "No se pudo copiar en el nuevo isolinux.cfg"
#: ../revisor/modisolinux/__init__.py:94
msgid "Could not unlink the old isolinux.cfg?"
-msgstr ""
+msgstr "¿No se puede quitar enlace en el viejo isolinux.cfg?"
#: ../revisor/modisolinux/__init__.py:96
msgid "Not replacing isolinux.cfg"
-msgstr ""
+msgstr "No reemplazando isolinux.cfg"
#: ../revisor/modrebrand/__init__.py:43
+#, fuzzy
msgid "Not rebranding pre_resolve_dependencies"
-msgstr ""
+msgstr "Sin renombrar pre_resolve_dependencies"
#: ../revisor/modrebrand/__init__.py:57
-#, fuzzy, python-format
+#, python-format
msgid "Adding %s-%s-%s.%s"
-msgstr "Agregando"
+msgstr "Agregando %s-%s-%s.%s"
#: ../revisor/modrebrand/__init__.py:60
-#, fuzzy, python-format
+#, python-format
msgid "Removing %s-%s-%s.%s"
-msgstr "Agregando"
+msgstr "Removiendo %s-%s-%s.%s"
#: ../revisor/modrebrand/__init__.py:77
+#, fuzzy
msgid ""
"Rebrand name. Revisor will select <name>-logos, <name>-release and <name>-"
"release-notes packages, if available."
msgstr ""
+"Reesccribir nombre. Revisor seleccionará paquetes <name>-logos, <name>-release"
+"<name>-release-notes, si están disponibles."
#: ../revisor/modrebrand/__init__.py:85
#, fuzzy, python-format
@@ -3811,7 +3839,7 @@ msgstr "¡Bienvenido a Fedora!"
#: ../revisor/modreuseinstaller/__init__.py:48
msgid "The URI to a tree we're supposed to reuse the installer images from."
-msgstr ""
+msgstr "La dirección al árbol que se supone reusará el instalador de imágenes."
#: ../revisor/modreuseinstaller/__init__.py:67
#, python-format
@@ -3819,38 +3847,40 @@ 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
-#, fuzzy, python-format
+#, python-format
msgid "Copying %s/%s to %s/%s"
-msgstr "a esto:"
+msgstr "Copiando %s/%s a %s/%s"
#: ../revisor/modreuseinstaller/__init__.py:88
-#, fuzzy, python-format
+#, python-format
msgid "Copying %s/.discinfo to %s/.discinfo"
-msgstr "a esto:"
+msgstr "Copiando %s/.discinfo a %s/.discinfo"
#: ../revisor/modreuseinstaller/__init__.py:91
-#, fuzzy, python-format
+#, python-format
msgid "Copying %s/.treeinfo to %s/.treeinfo"
-msgstr "a esto:"
+msgstr "Copiando %s/.treeinfo a %s/.treeinfo"
#: ../revisor/modserver/__init__.py:87
msgid "Use the server mode for XML-RPC"
-msgstr ""
+msgstr "Use el modo servidor para XML-RPC"
#: ../revisor/modserver/__init__.py:92
msgid "Port to start Server on."
-msgstr ""
+msgstr "Puerto para iniciar Servidor en él."
#: ../revisor/modserver/__init__.py:98
msgid "Start the XML-RPC server and fork."
-msgstr ""
+msgstr "Inicie el servidor XML-RPC e inicie proceso"
#: ../revisor/modvirt/__init__.py:86
#, fuzzy
msgid "Virtualization Media Options"
-msgstr "Uso de las Opciones de Arranque"
+msgstr "Opciones de Medios de Virtualización"
#: ../revisor/modvirt/__init__.py:93
msgid "Build Xen virtual machine. (not implemented yet)"
@@ -3917,34 +3947,34 @@ msgstr "Error al crear sistema de archivo ext3"
#: ../revisor/modvirt/__init__.py:501
#, fuzzy, python-format
msgid "Failed to mount '%s' to '%s'"
-msgstr "mount /mnt/cdrom"
+msgstr "Falló el montar '%s' a '%s'"
#: ../revisor/modvirt/__init__.py:519 ../revisor/modvirt/__init__.py:541
+#, fuzzy
msgid "Starting the virtual guest provision..."
-msgstr ""
+msgstr "Inicie el invitado virtual..."
#: ../revisor/modwui/modwui/controllers.py:75
#, python-format
msgid "The path %s cannot be found"
-msgstr ""
+msgstr "La ruta %s no puede ser encontrada"
#: ../revisor/modwui/modwui/grids.py:22
-#, fuzzy
msgid "Name"
-msgstr "Nombre:"
+msgstr "Nombre"
#: ../revisor/modwui/modwui/grids.py:23
#, fuzzy
msgid "Description"
-msgstr "Descripción:"
+msgstr "Descripción"
#: ../revisor/modwui/modwui/options.py:90
msgid "Submit"
-msgstr ""
+msgstr "Mandar"
#: ../conf/revisor.desktop.in.h:2
msgid "Revisor, Pimp your distro"
-msgstr ""
+msgstr "Revisor, Enchula tu distro"
#~ msgid ""
#~ "Force Revisor to use the GUI. Does not fallback to CLI and thus shows GUI "
commit d9aee23cb6bd2ec502b823b74a443aa574d8f514
Author: Izaac Zavaleta <jorge.izaac(a)gmail.com>
Date: Wed Feb 25 21:37:10 2009 +0000
Updated Spanish translation
Transmitted-via: Transifex (translate.fedoraproject.org)
diff --git a/po/Changelog b/po/Changelog
index 6c38715..18e4ba2 100644
--- a/po/Changelog
+++ b/po/Changelog
@@ -1,5 +1,7 @@
Updated Spanish translation
+Transmitted-via: Transifex (translate.fedoraproject.org)Updated Spanish translation
+
Transmitted-via: Transifex (translate.fedoraproject.org)Updated Polish translation
Transmitted-via: Transifex (translate.fedoraproject.org)Updated Polish translation
diff --git a/po/es.po b/po/es.po
index a025b0d..8bab43e 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: revisor\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-02-18 01:36+0000\n"
-"PO-Revision-Date: 2009-02-24 13:30-0700\n"
+"PO-Revision-Date: 2009-02-25 14:30-0700\n"
"Last-Translator: Izaac Zavaleta <izaac(a)fedoraproject.org>\n"
"Language-Team: fedora spanish <fedora-trans-es(a)redhat.com>\n"
"MIME-Version: 1.0\n"
@@ -52,6 +52,18 @@ msgid ""
"Translators:\n"
"\t* First Last (nick) <email(a)domain.com>"
msgstr ""
+"\n"
+"Desarrollo del Programa:\n"
+"\t* Jonathan Steffan (daMaestro) <jon(a)fedoraunity.org>\n"
+"\t* Jeroen van Meeuwen (kanarip) <kanarip(a)fedoraunity.org>\n"
+"\n"
+"Diseñadores de Interfaz:\n"
+"\t* Stewart Adam (firewing1) <s.adam(a)diffingo.com>\n"
+"\t* Jonathan Steffan (daMaestro) <jon(a)fedoraunity.org>\n"
+"\t* Jeroen van Meeuwen (kanarip) <kanarip(a)fedoraunity.org>\n"
+"\n"
+"Traductores:\n"
+"\t* Nombre Apellido (pseudónimo) <email(a)dominio.com>"
#: ../revisor/modgui/glade/base_screen.glade.in.h:32
msgid "<b>More information about:</b>"
@@ -67,7 +79,7 @@ msgstr "<span weight=\"bold\">Revisor</span> es un producto de Fedora Unity."
#: ../revisor/modgui/glade/base_screen.glade.in.h:35
msgid "<u><span color=\"blue\">http://revisor.fedoraunity.org</span></u>"
-msgstr ""
+msgstr "<u><span color=\"blue\">http://revisor.fedoraunity.org</span></u>"
#: ../revisor/modgui/glade/base_screen.glade.in.h:36
#: ../revisor/modgui/glade/revisor.glade.h:38
@@ -81,7 +93,7 @@ msgstr "Autores"
#: ../revisor/modgui/glade/base_screen.glade.in.h:38
msgid "Fedora Unity:"
-msgstr ""
+msgstr "Fedora Unity:"
#: ../revisor/modgui/glade/base_screen.glade.in.h:39
#, fuzzy
@@ -100,10 +112,9 @@ msgstr "Revisor"
#: ../revisor/modgui/glade/base_screen.glade.in.h:42
msgid "Revisor _Homepage"
-msgstr "Página de Inicio del Revisor"
+msgstr "Página de Revisor"
#: ../revisor/modgui/glade/base_screen.glade.in.h:43
-#, fuzzy
msgid "Revisor:"
msgstr "Revisor:"
@@ -129,9 +140,8 @@ msgid "Total Progress:"
msgstr "Progreso Total:"
#: ../revisor/modgui/glade/build_type.glade.h:1
-#, fuzzy
msgid "Client / _Server"
-msgstr "Cliente / Servidor"
+msgstr "Cliente / _Servidor"
#: ../revisor/modgui/glade/build_type.glade.h:2
#, fuzzy
@@ -589,14 +599,12 @@ msgid "Firewall configuration is not applicable on upgrades."
msgstr "La configuración del cortafuego no es aplicable en actualizaciones."
#: ../revisor/modgui/glade/lm_security.glade.h:7
-#, fuzzy
msgid "SELinux:"
-msgstr "SELinux"
+msgstr "SELinux:"
#: ../revisor/modgui/glade/lm_security.glade.h:8
-#, fuzzy
msgid "Security level:"
-msgstr "Nivel de distorsión"
+msgstr "Nivel de Seguridad:"
#: ../revisor/modgui/glade/lm_security.glade.h:9
msgid "Warn"
@@ -609,16 +617,15 @@ msgstr "Personalizar su Medio Vivo"
#: ../revisor/modgui/glade/lm_usercustomize.glade.h:6
msgid "Add user to the group \"wheel\""
-msgstr "Agregar usuario al grupo \"whell\""
+msgstr "Agregar usuario al grupo \"wheel\""
#: ../revisor/modgui/glade/lm_usercustomize.glade.h:7
msgid "Automatically login this user to the Desktop"
msgstr "Automáticamente ingresar este usuario al Escritorio"
#: ../revisor/modgui/glade/lm_usercustomize.glade.h:9
-#, fuzzy
msgid "Create User Account:"
-msgstr "Pantalla de Usuario del Sistema"
+msgstr "Crear Cuenta de Usuario:"
#: ../revisor/modgui/glade/lm_usercustomize.glade.h:11
msgid "Dump current user profile (and omit /etc/skel)"
@@ -629,17 +636,14 @@ msgid "Enable \"wheel\" group to sudo without password"
msgstr "Habilitar el grupo \"wheel\" para sudo sin contraseña"
#: ../revisor/modgui/glade/lm_usercustomize.glade.h:13
-#, fuzzy
msgid "Full Name:"
-msgstr "Nombre del proyecto"
+msgstr "Nombre Completo:"
#: ../revisor/modgui/glade/lm_usercustomize.glade.h:14
-#, fuzzy
msgid "Password"
-msgstr "Contraseña:"
+msgstr "Contraseña"
#: ../revisor/modgui/glade/lm_usercustomize.glade.h:15
-#, fuzzy
msgid "Username:"
msgstr "Nombre de Usuario:"
@@ -661,14 +665,12 @@ msgid "Include Kickstart file on Installation Media"
msgstr "Incluir el archivo Kickstart en el Medio de Instalación"
#: ../revisor/modgui/glade/load_kickstart.glade.h:5
-#, fuzzy
msgid "Kickstart Configuration File:"
-msgstr "ubicacion/archivo-kickstart.cfg"
+msgstr "Archivo de Configuración de Kickstart:"
#: ../revisor/modgui/glade/load_kickstart.glade.h:6
-#, fuzzy
msgid "Load Kickstart Data"
-msgstr "Instalación kickstart mejorada"
+msgstr "Cargar Información de Kickstart"
#: ../revisor/modgui/glade/load_kickstart.glade.h:7
msgid ""
@@ -686,7 +688,7 @@ msgstr ""
#: ../revisor/modgui/glade/load_kickstart.glade.h:10
msgid "Set installer to boot with kickstart by default"
-msgstr "Hacer que el instalador arranque por defecto con el kickstart"
+msgstr "Hacer que el instalador arranque por defecto con kickstart"
#: ../revisor/modgui/glade/load_kickstart.glade.h:11
msgid "Use package manifest from kickstart data"
@@ -697,33 +699,28 @@ msgid "Use repositories configured in the kickstart file"
msgstr "Usar los repositorios configurados en el archivo kickstart"
#: ../revisor/modgui/glade/package_selection.glade.h:1
-#, fuzzy
msgid "By Category"
-msgstr "Agrupado por categoría"
+msgstr "Por categoría"
#: ../revisor/modgui/glade/package_selection.glade.h:2
-#, fuzzy
msgid "Deselect"
-msgstr "deseleccionar todo"
+msgstr "Deseleccionar"
#: ../revisor/modgui/glade/package_selection.glade.h:3
msgid "Deselect all optional packages"
msgstr "Deseleccionar todos los paquetes opcionales"
#: ../revisor/modgui/glade/package_selection.glade.h:4
-#, fuzzy
msgid "List"
-msgstr "Lista de Módulos"
+msgstr "Lista"
#: ../revisor/modgui/glade/package_selection.glade.h:5
-#, fuzzy
msgid "Optional Packages... "
-msgstr "Instalación de Paquetes"
+msgstr "Paquetes Opcionales... "
#: ../revisor/modgui/glade/package_selection.glade.h:6
-#, fuzzy
msgid "Package Selection"
-msgstr "Pantalla de Selección de Grupos de Paquetes"
+msgstr "Selección de Paquetes"
#: ../revisor/modgui/glade/package_selection.glade.h:7
msgid "Please select the software you want to be available on your media:"
@@ -731,24 +728,20 @@ msgstr ""
"Por favor, elija el software que quiere que esté disponible en su medio:"
#: ../revisor/modgui/glade/package_selection.glade.h:8
-#, fuzzy
msgid "Search"
msgstr "Buscar"
#: ../revisor/modgui/glade/package_selection.glade.h:9
-#, fuzzy
msgid "Search Criteria:"
-msgstr "Buscar traducciones"
+msgstr "Criterio de Búsqueda:"
#: ../revisor/modgui/glade/package_selection.glade.h:10
-#, fuzzy
msgid "Select"
-msgstr "Herramienta de selección"
+msgstr "Selecciona"
#: ../revisor/modgui/glade/package_selection.glade.h:11
-#, fuzzy
msgid "Select All"
-msgstr "seleccionar todo"
+msgstr "Seleccionar Todo"
#: ../revisor/modgui/glade/package_selection.glade.h:12
msgid "Select all optional packages"
@@ -769,9 +762,8 @@ msgid "dialog1"
msgstr "dialogo1"
#: ../revisor/modgui/glade/ready_screen.glade.h:1
-#, fuzzy
msgid "<b>Number of Packages:</b>"
-msgstr "Instalación de Paquetes"
+msgstr "<b>Número de Paquetes:</b>"
#: ../revisor/modgui/glade/ready_screen.glade.h:2
msgid "<b>Package Set Size (Live/Installed):</b>"
@@ -780,26 +772,23 @@ msgstr "<b>Tamaño del Conjunto de Paquetes (Vivo/Instalado):</b>"
#: ../revisor/modgui/glade/ready_screen.glade.h:3
#, fuzzy
msgid "<b>RPM Package Payload Size:</b>"
-msgstr "Este paquete contiene las biblioteca compartidas RPM."
+msgstr "<b>Tamaño neto de Paquete RPM:</b>"
#: ../revisor/modgui/glade/ready_screen.glade.h:5
msgid "Build Unattended Install Media"
msgstr "Construir Medio de Instalación No Atendida"
#: ../revisor/modgui/glade/ready_screen.glade.h:6
-#, fuzzy
msgid "Not Calculated, Yet"
-msgstr "No hay ayuda aún"
+msgstr "Todavía no calculado"
#: ../revisor/modgui/glade/ready_screen.glade.h:7
-#, fuzzy
msgid "Package Details"
-msgstr "Diálogo de Detalles de Grupo de Paquetes"
+msgstr "Detalles de Paquete"
#: ../revisor/modgui/glade/ready_screen.glade.h:8
-#, fuzzy
msgid "Ready to Compose Images"
-msgstr "Grabando Imágenes ISO en un Disco"
+msgstr "Listo para componer Imágenes"
#: ../revisor/modgui/glade/ready_screen.glade.h:9
msgid ""
@@ -812,7 +801,7 @@ msgstr ""
#: ../revisor/modgui/glade/ready_screen.glade.h:10
#, fuzzy
msgid "Send to Build Server:"
-msgstr "enviar esta página al servidor"
+msgstr "Enviar a Servidor de Construcción:"
#: ../revisor/modgui/glade/revisor.glade.h:1
msgid ""
@@ -856,6 +845,24 @@ msgid ""
"this program; if not, write to the Free Software Foundation, Inc., 51 "
"Franklin St, Fifth Floor, Boston, MA 02110-1301 USA\n"
msgstr ""
+"\n"
+"Revisor, un producto de Fedora Unity\n"
+"Copyright (C) 2005 - 2008 Fedora Unity\n"
+"\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public\n"
+"License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin St, Fifth Floor, Boston, MA 02110-1301 USA\n"
+
#: ../revisor/modgui/glade/revisor.glade.h:22
msgid ""
@@ -864,27 +871,25 @@ msgid ""
"\t* First Last (nick) <email(a)domain.com>\n"
msgstr ""
"\n"
-"Translators:\n"
+"Traductores:\n"
"\t* Nombre Apellido (pseudónimo) <email(a)dominio.com>\n"
#: ../revisor/modgui/glade/revisor.glade.h:26
msgid " "
-msgstr ""
+msgstr " "
#: ../revisor/modgui/glade/revisor.glade.h:28
#, no-c-format
msgid "0%"
-msgstr ""
+msgstr "0%"
#: ../revisor/modgui/glade/revisor.glade.h:29
-#, fuzzy
msgid "<b>Installation Media</b>"
-msgstr "<b>Medios CD/DVD</b>"
+msgstr "<b>Medio de Instalación</b>"
#: ../revisor/modgui/glade/revisor.glade.h:30
-#, fuzzy
msgid "<b>Live Media</b>"
-msgstr "<b>Medios CD/DVD</b>"
+msgstr "<b>Medio en Vivo</b>"
#: ../revisor/modgui/glade/revisor.glade.h:31
msgid "<i>Initializing GUI</i>"
@@ -892,27 +897,27 @@ msgstr "<i>Inicializando Interfaz Gráfica</i>"
#: ../revisor/modgui/glade/revisor.glade.h:32
msgid "<span color=\"blue\"><u>http://revisor.fedoraunity.org</u></span>"
-msgstr ""
+msgstr "<span color=\"blue\"><u>http://revisor.fedoraunity.org</u></span>"
#: ../revisor/modgui/glade/revisor.glade.h:33
msgid "<span size=\"large\" weight=\"bold\">Title</span>"
-msgstr ""
+msgstr "<span size=\"large\" weight=\"bold\">Title</span>"
#: ../revisor/modgui/glade/revisor.glade.h:34
msgid "<span size=\"small\">(C) 2006 - 2008 Fedora Unity</span>"
-msgstr ""
+msgstr "<span size=\"small\">(C) 2006 - 2008 Fedora Unity</span>"
#: ../revisor/modgui/glade/revisor.glade.h:35
msgid "<span size=\"x-large\" weight=\"bold\">Please Wait...</span>"
-msgstr ""
+msgstr "<span size=\"x-large\" weight=\"bold\">Please Wait...</span>"
#: ../revisor/modgui/glade/revisor.glade.h:36
msgid "<span size=\"xx-large\" weight=\"bold\">Revisor v[autoset]</span>"
-msgstr ""
+msgstr "<span size=\"xx-large\" weight=\"bold\">Revisor v[autoset]</span>"
#: ../revisor/modgui/glade/revisor.glade.h:37
msgid "A Fedora Spin Designer"
-msgstr "Diseñador de Fedora Spin"
+msgstr "Un Diseñador de Spins Fedora"
#: ../revisor/modgui/glade/revisor.glade.h:40
#: ../revisor/modgui/glade/revisor_configuration.glade.h:9
@@ -925,8 +930,9 @@ msgid "Destination Directory:"
msgstr "Directorio Destino:"
#: ../revisor/modgui/glade/revisor.glade.h:42
+#, fuzzy
msgid "Dynamically Set Header Label"
-msgstr ""
+msgstr "Poner dinámicamente Etiqueta de Cabecera"
#: ../revisor/modgui/glade/revisor.glade.h:44
msgid "Message"
@@ -943,15 +949,13 @@ msgid "Please select the type(s) of media you want to compose:"
msgstr "Por favor, seleccione el/los tipo(s) de medio que desea componer:"
#: ../revisor/modgui/glade/revisor.glade.h:46
-#, fuzzy
msgid "Progress - Revisor"
-msgstr "Configurar impresoras"
+msgstr "Progreso - Revisor"
#: ../revisor/modgui/glade/revisor.glade.h:48
#: ../revisor/modgui/glade/revisor_configuration.glade.h:21
-#, fuzzy
msgid "Revisor Configuration:"
-msgstr "Cambios en la Configuración de X"
+msgstr "Configuración de Revisor:"
#: ../revisor/modgui/glade/revisor.glade.h:49
#, fuzzy
@@ -972,56 +976,57 @@ msgid "Revisor is initializing."
msgstr "Revisor está inicializando"
#: ../revisor/modgui/glade/revisor.glade.h:53
-#, fuzzy
msgid "Select Media Types"
msgstr "Selecciona tipo de Medios"
#: ../revisor/modgui/glade/revisor.glade.h:54
-#, fuzzy
msgid "Select Repositories:"
msgstr "Selecciona Repositorios:"
#: ../revisor/modgui/glade/revisor.glade.h:55
msgid "Spin Target:"
-msgstr ""
+msgstr "Objetivo de Spin:"
#: ../revisor/modgui/glade/revisor.glade.h:56
msgid "Translators"
msgstr "Traductores"
#: ../revisor/modgui/glade/revisor.glade.h:57
+#, fuzzy
msgid "Use _advanced interface"
-msgstr ""
+msgstr "Usar interfaz _avanzada"
#: ../revisor/modgui/glade/revisor.glade.h:58
msgid "Welcome"
-msgstr ""
+msgstr "Bienvenido"
#: ../revisor/modgui/glade/revisor.glade.h:59
+#, fuzzy
msgid "_Browse"
-msgstr ""
+msgstr "Navegar"
#: ../revisor/modgui/glade/revisor.glade.h:60
#, fuzzy
msgid "_CD Set"
-msgstr "fijar escalado"
+msgstr "_CD"
#: ../revisor/modgui/glade/revisor.glade.h:61
#, fuzzy
msgid "_DVD Set"
-msgstr "fijar escalado"
+msgstr "_DVD"
#: ../revisor/modgui/glade/revisor.glade.h:62
msgid "_File"
msgstr "_Archivo"
#: ../revisor/modgui/glade/revisor.glade.h:64
+#, fuzzy
msgid "_Optical (CD/DVD)"
-msgstr ""
+msgstr "(CD/DVD) _Optico"
#: ../revisor/modgui/glade/revisor.glade.h:65
msgid "_USB"
-msgstr ""
+msgstr "_USB"
#: ../revisor/modgui/glade/revisor_configuration.glade.h:1
msgid "<b>Please fill out the repository information</b>"
@@ -1032,37 +1037,30 @@ msgid "<small><i>Base URL or Mirror List Mandatory</i></small>"
msgstr "<small><i>Es obligatorio la URL Base o la Lista de Espejos</i></small>"
#: ../revisor/modgui/glade/revisor_configuration.glade.h:3
-#, fuzzy
msgid "<small><i>GPG Options</i></small>"
-msgstr "Uso de las Opciones de Arranque"
+msgstr "<small><i>Opciones GPG</i></small>"
#: ../revisor/modgui/glade/revisor_configuration.glade.h:4
-#, fuzzy
msgid "<small><i>Optional</i></small>"
-msgstr "Menú Opcional"
+msgstr "<small><i>Opcional</i></small>"
#: ../revisor/modgui/glade/revisor_configuration.glade.h:5
-#, fuzzy
msgid "<small><i>Other Options</i></small>"
-msgstr "<b>Otras Opciones (Avanzado)</b>"
+msgstr "<small><i>Otras Opciones</i></small>"
#: ../revisor/modgui/glade/revisor_configuration.glade.h:6
-#, fuzzy
msgid "Add Repository"
msgstr "Agregar Repositorio"
#: ../revisor/modgui/glade/revisor_configuration.glade.h:7
-#, fuzzy
msgid "Base URL:"
-msgstr "Bugzilla·URL"
+msgstr "URL Base:"
#: ../revisor/modgui/glade/revisor_configuration.glade.h:8
-#, fuzzy
msgid "Configuration Section to Use:"
msgstr "Sección de configuración a usar:"
#: ../revisor/modgui/glade/revisor_configuration.glade.h:10
-#, fuzzy
msgid "Description:"
msgstr "Descripción:"
@@ -1072,32 +1070,26 @@ msgstr ""
"Habilitar/Deshabilitar los Repositorios desde la Configuración de Selección:"
#: ../revisor/modgui/glade/revisor_configuration.glade.h:13
-#, fuzzy
msgid "Exclude Packages:"
-msgstr "Paquetes Excluídos:"
+msgstr "Paquetes a Excluír:"
#: ../revisor/modgui/glade/revisor_configuration.glade.h:14
-#, fuzzy
msgid "GPG Check"
-msgstr "Chequeo de firma digital GPG"
+msgstr "Chequeo GPG"
#: ../revisor/modgui/glade/revisor_configuration.glade.h:15
-#, fuzzy
msgid "GPG Key File:"
-msgstr "Abra el menú \"Archivo\""
+msgstr "Archivo Clave GPG:"
#: ../revisor/modgui/glade/revisor_configuration.glade.h:16
-#, fuzzy
msgid "Include Packages:"
msgstr "Incluye Paquetes:"
#: ../revisor/modgui/glade/revisor_configuration.glade.h:17
-#, fuzzy
msgid "Mirror List:"
msgstr "Lista de espejos:"
#: ../revisor/modgui/glade/revisor_configuration.glade.h:18
-#, fuzzy
msgid "Name:"
msgstr "Nombre:"
@@ -1106,34 +1098,28 @@ msgid "Protect"
msgstr "Proteger"
#: ../revisor/modgui/glade/revisor_configuration.glade.h:20
-#, fuzzy
msgid "Repository Information"
-msgstr "Información del módulo"
+msgstr "Información del repositorio"
#: ../revisor/modgui/glade/revisor_configuration.glade.h:22
-#, fuzzy
msgid "Save to Configuration"
-msgstr "Guardar en miniTamTam"
+msgstr "Guardar en Configuración"
#: ../revisor/modgui/glade/select_media_advanced.glade.h:1
-#, fuzzy
msgid "<b>Compose Options</b>"
msgstr "<b>Opciones de composición</b>"
#: ../revisor/modgui/glade/select_media_advanced.glade.h:2
-#, fuzzy
msgid "<b>Media Types</b>"
msgstr "<b>Tipos de medios</b>"
#: ../revisor/modgui/glade/select_media_advanced.glade.h:3
-#, fuzzy
msgid "Installation Media Types"
msgstr "Tipos de medios de instalación"
#: ../revisor/modgui/glade/select_media_advanced.glade.h:4
-#, fuzzy
msgid "Live Media Types"
-msgstr "Tipos de Medios Live"
+msgstr "Tipos de Medios en Vivo"
#: ../revisor/modgui/glade/select_media_advanced.glade.h:6
#, fuzzy
@@ -1141,57 +1127,49 @@ msgid "Rebrand Media"
msgstr "Renombra Medios"
#: ../revisor/modgui/glade/select_media_advanced.glade.h:7
-#, fuzzy
msgid "Rescue / Utility Media"
-msgstr "Medio arrancable mínimo en CD"
+msgstr "Medio Rescate / Utilitario"
#: ../revisor/modgui/glade/select_media_advanced.glade.h:8
#: ../revisor/modgui/glade/select_media.glade.h:7
-#, fuzzy
msgid "Select Media Type(s)"
msgstr "Selecciona Tipo(s) de Medio(s)"
#: ../revisor/modgui/glade/select_media_advanced.glade.h:9
-#, fuzzy
msgid "Virtualization Media"
msgstr "Medios de Virtualización"
#: ../revisor/modgui/glade/select_media.glade.h:1
#: ../revisor/modgui/glade/select_media_installation.glade.h:1
-#, fuzzy
msgid "<b>Installation Media Types</b>"
msgstr "<b>Tipos de Medio de Instalación</b>"
#: ../revisor/modgui/glade/select_media.glade.h:2
#: ../revisor/modgui/glade/select_media_live.glade.h:1
-#, fuzzy
msgid "<b>Live Media Types</b>"
-msgstr "<b>Tipos de Medios Live</b>"
+msgstr "<b>Tipos de Medios en Vivo</b>"
#: ../revisor/modgui/glade/select_media.glade.h:3
#: ../revisor/modgui/glade/select_media_installation.glade.h:2
#, fuzzy
msgid "CD Set"
-msgstr "Conjunto de CD"
+msgstr "CD"
#: ../revisor/modgui/glade/select_media.glade.h:4
#: ../revisor/modgui/glade/select_media_installation.glade.h:3
#, fuzzy
msgid "DVD Set"
-msgstr "Conjunto de DVD"
+msgstr "DVD"
#: ../revisor/modgui/glade/select_media.glade.h:5
-#, fuzzy
msgid "Optical Live Media"
-msgstr "Medios Ópticos Live"
+msgstr "Medios Ópticos en Vivo"
#: ../revisor/modgui/glade/select_media.glade.h:8
-#, fuzzy
msgid "USB Live Media"
-msgstr "USB Live"
+msgstr "USB en Vivo"
#: ../revisor/modgui/glade/select_media_installation.glade.h:4
-#, fuzzy
msgid "Installation Tree"
msgstr "Árbol de Instalación"
@@ -1201,12 +1179,10 @@ msgid "PXE Payload"
msgstr "Solución a Problemas con PXE"
#: ../revisor/modgui/glade/select_media_installation.glade.h:7
-#, fuzzy
msgid "Select Installation Media Type(s)"
msgstr "Selecciona Tipo(s) de Medio(s) de Instalación"
#: ../revisor/modgui/glade/select_media_installation.glade.h:8
-#, fuzzy
msgid "Unified ISO Image"
msgstr "Imagen ISO Unificada"
@@ -1219,22 +1195,18 @@ msgid "Select Live Media Type(s)"
msgstr "Seleccione el/los Tipo(s) de Medio Vivo"
#: ../revisor/modgui/glade/select_media_live.glade.h:5
-#, fuzzy
msgid "USB Hard Disk"
msgstr "Disco Duro USB"
#: ../revisor/modgui/glade/select_media_live.glade.h:6
-#, fuzzy
msgid "USB Thumb Drive"
msgstr "Memoria USB"
#: ../revisor/modgui/glade/select_media_utility.glade.h:1
-#, fuzzy
msgid "<b>Utility Media Types</b>"
msgstr "<b>Tipos de Medios Utilitarios</b>"
#: ../revisor/modgui/glade/select_media_utility.glade.h:3
-#, fuzzy
msgid "Rescue Image"
msgstr "Imagen de Rescate"
@@ -1243,12 +1215,10 @@ msgid "Select Utility Media Type(s)"
msgstr "Seleccione el/los Tipo(s) de Utilitario de Medio"
#: ../revisor/modgui/glade/select_media_virtualization.glade.h:1
-#, fuzzy
msgid "<b>Virtualization Media Types</b>"
msgstr "<b>Tipos de Medios de Virtualización</b>"
#: ../revisor/modgui/glade/select_media_virtualization.glade.h:2
-#, fuzzy
msgid "KVM Guest"
msgstr "Huésped KVM"
@@ -1261,17 +1231,14 @@ msgid "VMWare Appliance"
msgstr "Aplicación VMWare"
#: ../revisor/modgui/glade/select_media_virtualization.glade.h:6
-#, fuzzy
msgid "VMWare Guest"
msgstr "Huésped VMWare"
#: ../revisor/modgui/glade/select_media_virtualization.glade.h:7
-#, fuzzy
msgid "Xen Guest"
msgstr "Huésped Xen"
#: ../revisor/modgui/glade/welcome_buttons.glade.h:1
-#, fuzzy
msgid "Get Started"
msgstr "A iniciar"
@@ -1292,7 +1259,7 @@ msgstr "Mostrar la Configuración y Opciones Avanzada"
#: ../revisor/modgui/glade/welcome_screen.glade.h:3
msgid "Welcome to Revisor, by Fedora Unity"
-msgstr "Bienvenido a Revisor, por Unidad Fedora (Unity)"
+msgstr "Bienvenido a Revisor, por Fedora Unity"
#: ../revisor.py:34
msgid "Cannot find anaconda-runtime in /usr/lib/anaconda-runtime"
@@ -1304,19 +1271,16 @@ msgid "Running Revisor in CLI mode..."
msgstr "Corriendo Revisor en modo CLI..."
#: ../revisor/base.py:112
-#, fuzzy
msgid "Running Revisor in Hub mode..."
-msgstr "Corriendo Revisor en modo CLI..."
+msgstr "Corriendo Revisor en modo Hub..."
#: ../revisor/base.py:117
-#, fuzzy
msgid "Running Revisor in Composer mode..."
-msgstr "Corriendo Revisor en modo CLI..."
+msgstr "Corriendo Revisor en modo Composición..."
#: ../revisor/base.py:122
-#, fuzzy
msgid "Running Revisor in RPC Server mode..."
-msgstr "Corriendo Revisor en modo CLI..."
+msgstr "Corriendo Revisor en modo Servidor RPC..."
#: ../revisor/base.py:126 ../revisor/base.py:132
msgid "Running Revisor in GUI mode..."
@@ -1339,9 +1303,8 @@ msgid "Cannot show Help in CLI mode, use %s%s"
msgstr "No se puede mostrar Ayuda en modo CLI, use %s%s"
#: ../revisor/base.py:201
-#, fuzzy
msgid "Loading Repositories"
-msgstr "cargando proyecto"
+msgstr "Cargando Repositorios"
#: ../revisor/base.py:203
#, fuzzy, python-format
@@ -1369,12 +1332,12 @@ msgstr ""
#: ../revisor/base.py:215
#, python-format
msgid "Bumping YUMs debuglevel (%d) to our debuglevel (%d)"
-msgstr ""
+msgstr "Cambiando nivel de depuración de YUM (%d) al nuestro (%d)"
#: ../revisor/base.py:217
#, python-format
msgid "YUMs debuglevel now %d"
-msgstr ""
+msgstr "Nivel de depuración de YUM es ahora %d"
#: ../revisor/base.py:252
msgid "Another application is running which is accessing software information."
@@ -1383,9 +1346,8 @@ msgstr ""
"software."
#: ../revisor/base.py:257
-#, fuzzy
msgid "Fatal Error: Unable to retrieve software information.\n"
-msgstr "información de la versión en uso"
+msgstr "Error Fatal: No se pudo obtener información de software.\n"
#: ../revisor/base.py:258
msgid "\tThis could be caused by one of the following:\n"
@@ -1400,23 +1362,21 @@ msgid "\t - Server refusing connections,\n"
msgstr "\t - Servidor rechazando conexiones,\n"
#: ../revisor/base.py:261
-#, fuzzy
msgid "\t - Using a mirror that isn't fully synchronized,\n"
msgstr "\t - Usando un servidor espejo que no está totalmente sincronizado,\n"
#: ../revisor/base.py:262
-#, fuzzy
msgid "\t - Misconfigured repositories."
msgstr "\t - Repositorios mal configurados."
#: ../revisor/base.py:267
-#, fuzzy
msgid "Setting up a Transaction Set"
msgstr "Preparando el conjunto de Transacciones"
#: ../revisor/base.py:274
+#, fuzzy
msgid "Getting myself a piece of the RPMDB"
-msgstr ""
+msgstr "Obteniendome una pieza de RPMDB"
#: ../revisor/base.py:281
msgid ""
@@ -1427,17 +1387,15 @@ msgstr ""
"decir eso por la forma en que yum configuró la Base de Datos RPM)"
#: ../revisor/base.py:284
-#, fuzzy
msgid "Getting Repository Information"
msgstr "Obteniendo Información de Repositorio"
#: ../revisor/base.py:291
-#, fuzzy, python-format
+#, python-format
msgid "Arch list = %s"
msgstr "Lista de arquitecturas = %s"
#: ../revisor/base.py:293
-#, fuzzy
msgid "Getting the Package Sacks"
msgstr "Obteniendo Bolsas de Paquetes"
@@ -1458,7 +1416,6 @@ msgid "Kickstart mode: respin"
msgstr "Modo Kickstart: respin"
#: ../revisor/base.py:324
-#, fuzzy
msgid "Kickstart mode: normal"
msgstr "Modo Kickstart: normal"
@@ -1468,16 +1425,18 @@ msgid ""
"What we're getting from pykickstart is: %d groups, %d packages and %d "
"excluded packages. %d packages are being explicitly ignored."
msgstr ""
+"Lo que estamos obteniendo de pykickstart es: %d grupos, %d paquetes y %d"
+"paquetes excluídos. %d paquetes estan siendo explícitamente ignorados."
#: ../revisor/base.py:342 ../revisor/base.py:638
-#, fuzzy
msgid "Select kickstart packages"
msgstr "Selecciona paquetes kickstart"
#: ../revisor/base.py:350
#, python-format
msgid "Using pkgsack excludes, the list of packages to exclude is now: %r"
-msgstr ""
+msgstr "Usando exclusiones pkggsack, la lista de paquetes a excluir es "
+"ahora: %r"
#: ../revisor/base.py:367 ../revisor/base.py:666
msgid "Appending group @core"
@@ -1488,7 +1447,7 @@ msgid "Appending group @base"
msgstr "Agregando grupo @base"
#: ../revisor/base.py:401 ../revisor/base.py:698
-#, fuzzy, python-format
+#, python-format
msgid "Found group: %s"
msgstr "Grupo encontrado: %s"
@@ -1498,7 +1457,7 @@ msgid "Repository metadata cannot be found: %s: %s"
msgstr "Metadata de repositorio no puede ser encontrada: %s: %s"
#: ../revisor/base.py:410
-#, fuzzy, python-format
+#, python-format
msgid "Group not found: %s"
msgstr "Grupo no encontrado: %s"
@@ -1514,17 +1473,17 @@ msgid "Including %s"
msgstr "Incluyendo %s"
#: ../revisor/base.py:436
-#, fuzzy, python-format
+#, python-format
msgid "From Groups (required): Adding %s-%s:%s-%s.%s to transaction"
msgstr "Desde los Grupos (requerido): Agregando %s-%s:%s-%s.%s a la transacción"
#: ../revisor/base.py:443
#, python-format
msgid "Selecting default packages for group %s"
-msgstr "Seleccionando los paquetes predeterminados del grupo %s"
+msgstr "Seleccionando los paquetes predeterminados para grupo %s"
#: ../revisor/base.py:456
-#, fuzzy, python-format
+#, python-format
msgid "From Groups (default): Adding %s-%s:%s-%s.%s to transaction"
msgstr "Desde los Grupos (default): Agregando %s-%s:%s-%s.%s a la transacción"
@@ -1534,9 +1493,9 @@ msgid "Selecting optional packages for group %s"
msgstr "Seleccionando los paquetes opcionales del grupo %s"
#: ../revisor/base.py:477 ../revisor/base.py:496
-#, fuzzy, python-format
+#, python-format
msgid "From Groups (optional): Adding %s-%s:%s-%s.%s to transaction"
-msgstr "Desde los Grupos (optional): Agregando %s-%s:%s-%s.%s a la transacción"
+msgstr "Desde los Grupos (opcional): Agregando %s-%s:%s-%s.%s a la transacción"
#: ../revisor/base.py:483
#, python-format
@@ -1544,12 +1503,12 @@ msgid "No include parameter for group %s, using defaults"
msgstr "No se incluye parámetro para el grupo %s, usando los predeterminados"
#: ../revisor/base.py:505 ../revisor/base.py:715
-#, fuzzy, python-format
+#, python-format
msgid "Testing condition: %s / %s"
msgstr "Probando condición: %s / %s"
#: ../revisor/base.py:519
-#, fuzzy, python-format
+#, python-format
msgid "From package list, including: %s"
msgstr "Desde lista de paquetes, incluyendo: %s"
@@ -1559,7 +1518,6 @@ msgid "Package %s is in excludeList, continuing"
msgstr "Paquete %s está en lista de excluídos, continuando"
#: ../revisor/base.py:530
-#, fuzzy
msgid "No packages found!"
msgstr "No se encontraron paquetes!"
@@ -1569,12 +1527,12 @@ msgid "From Packages: Adding %s-%s:%s-%s.%s to transaction"
msgstr "Desde los Paquetes: Agregando %s-%s:%s-%s.%s a la transacción"
#: ../revisor/base.py:542
-#, fuzzy, python-format
+#, python-format
msgid "Could not find package '%s', searching..."
msgstr "No se pudo encontrar paquete '%s', buscando..."
#: ../revisor/base.py:555
-#, fuzzy, python-format
+#, python-format
msgid "Found packages matching '%s': %s"
msgstr "Encontrados paquetes similares '%s': %s"
@@ -1590,14 +1548,16 @@ msgid ""
"More then one package found for %s-%s-%s.%s - going to add them all to the "
"transaction"
msgstr ""
+"Más de un paquete encontrado para %s-%s-%s.%s - se agregarán todos a la "
+"transacción"
#: ../revisor/base.py:579
-#, fuzzy, python-format
+#, python-format
msgid "Could not find package %s-%s-%s.%s"
msgstr "No se pudo encontrar paquete %s-%s-%s.%s"
#: ../revisor/base.py:582
-#, fuzzy, python-format
+#, 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"
@@ -1612,6 +1572,8 @@ 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"
#: ../revisor/base.py:611
#, python-format
@@ -1625,10 +1587,18 @@ msgid ""
"You can continue with these minor errors but obviously the results may not "
"be what you expected."
msgstr ""
+"\n"
+"Los siguientes errores ocurrieron al seleccionar grupos y paquetes de "
+"kickstart:\n"
+"\n"
+"- %s\n"
+"\n"
+"Puede continuar con estos errores menores, pero obviamente los resultados "
+"pueden no ser los esperados."
#: ../revisor/base.py:617
msgid "This is what was selected to be installed:"
-msgstr "Esto es lo que selecciono para instalar:"
+msgstr "Esto es lo que se selecciono para instalar:"
#: ../revisor/base.py:630
#, python-format
@@ -1636,19 +1606,22 @@ msgid ""
"What we're getting from pykickstart is: %d groups, %d packages and %d "
"excluded packages."
msgstr ""
+"Lo que estamos obteniendo de pykickstart es: %d grupos, %d paquetes y "
+"%d paquetes excluídos."
#: ../revisor/base.py:649
#, python-format
msgid "Using pkgsack excludes, excluded packages is now: %r"
-msgstr ""
+msgstr "Usando exclusiones pkgsack, paquetes excluídos es ahora: "
+"%r"
#: ../revisor/base.py:695
-#, fuzzy, python-format
+#, python-format
msgid "No such group %s"
msgstr "No hay grupo %s"
#: ../revisor/base.py:752
-#, fuzzy, python-format
+#, python-format
msgid "Adding %s-%s:%s-%s.%s"
msgstr "Agregando %s-%s:%s-%s.%s"
@@ -1662,13 +1635,13 @@ msgstr ""
"Aparentemente todavía no se ha ingresado a la escena de Construcción de Medio"
#: ../revisor/base.py:820 ../revisor/misc.py:185
-#, fuzzy, python-format
+#, python-format
msgid "Checking dependencies for %s.%s"
msgstr "Checando dependencias para %s.%s"
#. pbar.cur_task += 1.0
#: ../revisor/base.py:842 ../revisor/misc.py:211
-#, fuzzy, python-format
+#, python-format
msgid "Unresolvable dependency %s %s %s in %s.%s"
msgstr "Dependencia no resuelta %s %s %s in %s.%s"
@@ -1694,6 +1667,9 @@ msgid ""
"but were included for dependency resolving:\n"
" - %s"
msgstr ""
+"Los siguientes paquetes fueron excluídos usando el manifiesto de paquetes "
+"kickstart, pero fueron incluídos por resolución de dependencias:\n"
+" - %s"
#: ../revisor/base.py:881
msgid ""
@@ -1715,7 +1691,6 @@ msgstr ""
#. End of dependency resolving
#: ../revisor/base.py:913 ../revisor/image.py:97
-#, fuzzy
msgid "Unable to build transaction"
msgstr "No se puede construir transacción"
@@ -1740,19 +1715,21 @@ msgid ""
"The package set after dependency resolving does not match the packages "
"selected in the kickstart manifest"
msgstr ""
+"El conjunto de paquetes despues de la resolución de dependencias no "
+"coincide con los paquetes seleccionades en el manifiesto kickstart"
#: ../revisor/base.py:960
-#, fuzzy, python-format
+#, python-format
msgid "No such repository: %s"
msgstr "No hay repositorio: %s"
#: ../revisor/base.py:962
-#, fuzzy, python-format
+#, python-format
msgid "Enabling %s repository"
msgstr "Activando el Repositorio %s"
#: ../revisor/base.py:981
-#, fuzzy, python-format
+#, python-format
msgid "Disabling %s repository"
msgstr "Desactivando el Repositorio %s"
@@ -1765,9 +1742,9 @@ msgid "Source RPM PO already in the list"
msgstr "Fuente PO de RPM ya está en la lista"
#: ../revisor/base.py:1005
-#, python-format
+#, fuzzy, python-format
msgid "Source RPM found in non-source repository %s"
-msgstr ""
+msgstr "RPM fuente encontrado en repositorio no de fuentes %s"
#: ../revisor/base.py:1007
#, python-format
@@ -1776,25 +1753,23 @@ msgstr "Error: no se pudo encontrar el rpm fuente de %s"
#: ../revisor/base.py:1009 ../revisor/modgui/build_media.py:106
#: ../revisor/modgui/build_media.py:142 ../revisor/modgui/build_media.py:219
-#, fuzzy
msgid "Downloading Source Packages"
msgstr "Descargando Paquetes Fuente"
#: ../revisor/base.py:1038 ../revisor/progress.py:441
-#, fuzzy, python-format
+#, python-format
msgid "Downloading %s"
msgstr "Descargando %s"
#: ../revisor/base.py:1068 ../revisor/modgui/build_media.py:101
#: ../revisor/modgui/build_media.py:214
-#, fuzzy
msgid "Downloading Packages"
-msgstr "Instalación de Paquetes"
+msgstr "Descargando Paquetes"
#: ../revisor/base.py:1077
#, python-format
msgid "Using local copy of %s-%s-%s.%s at %s"
-msgstr ""
+msgstr "Usando copia local de %s-%s-%s.%s en %s"
#: ../revisor/base.py:1087
msgid "Unable to find a suitable mirror."
@@ -1813,23 +1788,23 @@ msgstr ""
"paquetes del usuario para %s..."
#: ../revisor/base.py:1154
-#, fuzzy, python-format
+#, python-format
msgid "Adding required package %s-%s:%s-%s.%s"
msgstr "Agregandos paquete requerido %s-%s:%s-%s.%s"
#. This list has already been resolved
#: ../revisor/base.py:1157
-#, fuzzy, python-format
+#, python-format
msgid "%s. This is a required package."
msgstr "%s. Este es un paquete requerido."
#: ../revisor/base.py:1169
-#, fuzzy, python-format
+#, python-format
msgid "Adding suggested package %s-%s:%s-%s.%s"
msgstr "Agregando paquete sugerido %s-%s:%s-%s.%s"
#: ../revisor/base.py:1180
-#, fuzzy, python-format
+#, python-format
msgid "Adding all-arch package %s-%s:%s-%s.%s"
msgstr "Añadiendo paquete de arq. independiente %s-%s:%s-%s.%s"
@@ -1838,40 +1813,39 @@ msgid "Did not succeed in adding in all required packages"
msgstr "No se tuvo éxito en agregar todos los paquetes requeridos"
#: ../revisor/base.py:1250
-#, fuzzy
msgid "Populating statistics"
msgstr "Reuniendo estadísticas"
#: ../revisor/base.py:1266
-#, fuzzy, python-format
+#, python-format
msgid "Package %s-%s:%s-%s.%s does not seem to have a archivesize header"
msgstr ""
"El paquete %s-%s:%s-%s.%s no parece tener una cabecera de tamaño de archivo"
#: ../revisor/base.py:1274
-#, fuzzy, python-format
+#, python-format
msgid "Package %s-%s:%s-%s.%s does not seem to have a installedsize header"
msgstr ""
"El paquete %s-%s:%s-%s.%s no parece tener una cabecera de tamaño de instalación"
#: ../revisor/base.py:1282
-#, fuzzy, python-format
+#, python-format
msgid "Package %s-%s:%s-%s.%s does not seem to have a packagesize header"
msgstr ""
"El paquete %s-%s:%s-%s.%s no parece tener una cabecera de tamaño de paquete"
#: ../revisor/base.py:1292
-#, fuzzy, python-format
+#, python-format
msgid "Total size of all packages (archivesize): %s %s"
msgstr "Tamaño total de todos los paquetes (tamaño de archivo): %s %s"
#: ../revisor/base.py:1293
-#, fuzzy, python-format
+#, python-format
msgid "Total size of all packages, (installedsize): %s %s"
msgstr "Tamaño total de todos los paquetes, (tamaño instalados): %s %s "
#: ../revisor/base.py:1294
-#, fuzzy, python-format
+#, python-format
msgid "Total size of all packages, (packagesize): %s %s"
msgstr "Tamaño total de todos los paquetes, (tamaño de paquete): %s %s"
@@ -1881,14 +1855,13 @@ msgid "Report of the %d most space consuming packages"
msgstr "Reporte de los %d paquetes que ocupan más espacio"
#: ../revisor/base.py:1424 ../revisor/base.py:1438 ../revisor/base.py:2068
-#, fuzzy, python-format
+#, python-format
msgid "Creating pkgdir: %s"
msgstr "Creando pkgdir: %s"
#. Now for each txmbr in
#. Link the localPkg() result into the build tree
#: ../revisor/base.py:1447
-#, fuzzy
msgid "Linking in packages"
msgstr "Enlazando en paquetes"
@@ -1898,19 +1871,18 @@ msgid "Package hard link failed: %s: %s"
msgstr "El enlace rígido del paquete falló: %s: %s"
#: ../revisor/base.py:1471 ../revisor/base.py:2097
-#, fuzzy, python-format
+#, python-format
msgid "Copying: %s to %s"
msgstr "Copiando: %s a %s"
#: ../revisor/base.py:1474 ../revisor/base.py:2100
-#, fuzzy, python-format
+#, python-format
msgid "Symlinking: %s to %s"
msgstr "Enlace simbólico: %s a %s"
#: ../revisor/base.py:1477 ../revisor/base.py:2103
-#, fuzzy
msgid "Package symlink succeeded"
-msgstr "El Administrador de Paquetes RPM"
+msgstr "Enlazado simbólico de paquete exitoso"
#: ../revisor/base.py:1479 ../revisor/base.py:1486 ../revisor/base.py:2105
#: ../revisor/base.py:2112
@@ -1919,33 +1891,29 @@ msgid "Package link failed, trying copy: %s: %s"
msgstr "Falló el enlace del paquete, intentando copiar: %s: %s"
#: ../revisor/base.py:1496
-#, fuzzy
msgid "Creating Repository Information"
-msgstr "información de la versión en uso"
+msgstr "Creando Información de Repositorio"
#. FIXME: Optionally recompose installer images
#: ../revisor/base.py:1511
-#, fuzzy
msgid "Building Installation Images"
-msgstr "Imágenes Viva de Fedora"
+msgstr "Construyendo Imágenes de Instalación"
#: ../revisor/base.py:1528
-#, fuzzy
msgid "Using already existing installer images"
msgstr "Usando imagen de instalador ya existentes"
#: ../revisor/base.py:1542
-#, fuzzy
msgid "Linking in release notes"
-msgstr "Notas de la Versión de Fedora Core 6"
+msgstr "Enlazando en notas de lanzamiento"
#: ../revisor/base.py:1554
-#, fuzzy, python-format
+#, python-format
msgid "Copying updates.img from %s to %s"
msgstr "Copiando updates.img de %s a %s"
#: ../revisor/base.py:1563 ../revisor/pungi.py:417
-#, fuzzy, python-format
+#, python-format
msgid "copy_dir '%s' not accessible"
msgstr "copy_dir '%s' no accesible"
@@ -1963,24 +1931,23 @@ msgid "Running pkgorder"
msgstr "Ejecutando pkgorder"
#: ../revisor/base.py:1685
-#, fuzzy, python-format
+#, python-format
msgid "Running with grouplist: %r"
msgstr "Ejecutando con grouplist: %r"
#: ../revisor/base.py:1688
-#, fuzzy, python-format
+#, python-format
msgid "Running with packagelist: %r"
msgstr "Ejecutando con packagelist: %r"
#: ../revisor/base.py:1695
-#, fuzzy
msgid "Appending group core and base"
msgstr "Añadiendo grupo core y base"
#: ../revisor/base.py:1707
#, fuzzy, python-format
msgid "Appending default group %s"
-msgstr "Agregando grupo predeterminado s%"
+msgstr "Agregando grupo default s%"
#. Do not do this because the installer still has all the groups available
#. if group not in groupList:
@@ -2001,10 +1968,10 @@ msgstr "Agregando grupo de soporte no predeterminado %s"
#: ../revisor/base.py:1805
#, python-format
msgid "Not running package ordering, using file %s instead"
-msgstr ""
+msgstr "No ejecutando ordenación de paquete, usando archivo %s "
+"en su lugar"
#: ../revisor/base.py:1807
-#, fuzzy
msgid "Not running package ordering"
msgstr "No ejecutando ordenamiento de paquete"
@@ -2015,23 +1982,23 @@ msgstr "^Instalar usando kickstart"
#. Split Tree
#: ../revisor/base.py:1862
-#, fuzzy, python-format
+#, python-format
msgid "Splitting Build Tree (%s)"
msgstr "Dividiendo Árbol de Construcción (%s)"
#. Split repo
#: ../revisor/base.py:1868
-#, fuzzy, python-format
+#, python-format
msgid "Splitting Repository (%s)"
msgstr "Dividiendo Repositorio (%s)"
#: ../revisor/base.py:1882 ../revisor/modgui/build_media.py:244
-#, fuzzy, python-format
+#, python-format
msgid "Creating %s ISO Image #%d"
msgstr "Creando %s Imagen ISO #%d"
#: ../revisor/base.py:1887 ../revisor/modgui/build_media.py:248
-#, fuzzy, python-format
+#, python-format
msgid "Creating %s ISO Image"
msgstr "Creando %s Imagen ISO"
@@ -2050,36 +2017,36 @@ msgstr "Implantando md5 en la Imágen ISO: %s"
#: ../revisor/base.py:1915
msgid "Cannot implant ISO md5sum"
-msgstr ""
+msgstr "No se puede implantar md5sum a ISO"
#. Do some SHA1SUMMONING
#: ../revisor/base.py:1923
-#, fuzzy
msgid "Creating SHA1SUMs for Images"
msgstr "Creando SHA1SUMs para Imagenes"
#: ../revisor/base.py:1939
-#, fuzzy
msgid "Creating Rescue ISO Image"
msgstr "Creando Imagen ISO de Rescate"
#: ../revisor/base.py:1999
-#, fuzzy, python-format
+#, python-format
msgid "Copying %s to %s (%d files)"
msgstr "Copipando %s a %s (%d archivos)"
#: ../revisor/base.py:2003
-#, fuzzy, python-format
+#, python-format
msgid "Moving %s to %s (%d files)"
msgstr "Moviendo %s a %s (%d archivos)"
#: ../revisor/base.py:2006
-#, fuzzy, python-format
+#, python-format
msgid ""
"Moving of the source tree failed (trying copy):\n"
"\n"
"%s"
msgstr "Movimiento del árbol fuente falló (intentando copiar):\n"
+"\n"
+"%s"
#: ../revisor/base.py:2009
#, python-format
@@ -2092,12 +2059,12 @@ msgstr "Copiado del árbol fuente falló:\n"
"%s"
#: ../revisor/base.py:2014 ../revisor/pungi.py:413
-#, fuzzy, python-format
+#, python-format
msgid "Copying %s to %s"
msgstr "Copiando %s a %s"
#: ../revisor/base.py:2018
-#, fuzzy, python-format
+#, python-format
msgid ""
"Copying of the installation tree failed:\n"
"\n"
@@ -2107,24 +2074,21 @@ msgstr "Copiado del árbol de instalación falló:\n"
"%s"
#: ../revisor/base.py:2024
-#, fuzzy
msgid "Creating ext3 filesystem"
msgstr "Creando sistema de archivos ext3"
#: ../revisor/base.py:2031
-#, fuzzy
msgid "Configuring System"
msgstr "Configurando el Sistema"
#. Now for each txmbr in
#. Link the localPkg() result into the build tree
#: ../revisor/base.py:2077
-#, fuzzy
msgid "Linking in Source packages"
msgstr "Enlazando en paquetes Fuente"
#: ../revisor/base.py:2132
-#, fuzzy, python-format
+#, python-format
msgid "Setting rundir to %s"
msgstr "Configurando rundir a %s"
@@ -2134,12 +2098,12 @@ msgid "Directory %s could not be created. Aborting"
msgstr "El directorio %s no pudo ser creado. Abortando"
#: ../revisor/base.py:2140
-#, fuzzy, python-format
+#, python-format
msgid "Running command: %s"
msgstr "Comando de ejecución: %s"
#: ../revisor/base.py:2141
-#, fuzzy, python-format
+#, python-format
msgid "Extra information: %s %s %s"
msgstr "Información extra: %s %s %s"
@@ -2149,14 +2113,14 @@ msgid "Got an error from %s (return code %s)"
msgstr "Se obtuvo error de %s (código devuelto %s)"
#: ../revisor/cfg.py:73
-#, fuzzy, python-format
+#, python-format
msgid "Setting %s to %r"
msgstr "Configurando %s a %r"
#: ../revisor/cfg.py:152 ../revisor/cfg.py:210
-#, fuzzy, python-format
+#, python-format
msgid "No group data found for %s"
-msgstr "Información de grupo no encontrada para: %s"
+msgstr "Información de grupo no encontrada para %s"
#: ../revisor/cfg.py:155 ../revisor/cfg.py:213
#, python-format
@@ -2164,7 +2128,6 @@ msgid "Why is yum throwing AttributeErrors? %s"
msgstr "Porqué yum está lanzando AtributeErrors? %s"
#: ../revisor/cfg.py:243
-#, fuzzy
msgid "Checking working directories"
msgstr "Checando directorios de trabajo"
@@ -2207,7 +2170,7 @@ msgstr ""
"Por favor, resuelva esto y continúe."
#: ../revisor/cfg.py:279
-#, fuzzy, python-format
+#, python-format
msgid "%s%s%s is not a mount"
msgstr "%s%s%s no es un montaje"
@@ -2227,12 +2190,11 @@ msgstr ""
"Por favor, resuelva esto y continúe."
#: ../revisor/cfg.py:316
-#, fuzzy
msgid "Checking destination directories"
msgstr "Checando directorios de destino"
#: ../revisor/cfg.py:320
-#, fuzzy, python-format
+#, python-format
msgid "Set destination directory to %s"
msgstr "Poner el directorio de destino a %s"
@@ -2245,9 +2207,9 @@ msgstr ""
"nuevamente."
#: ../revisor/cfg.py:403
-#, fuzzy, python-format
+#, python-format
msgid "Architecture list: %r"
-msgstr "Lista de arquitectura: %r"
+msgstr "Lista de arquitecturas: %r"
#: ../revisor/cfg.py:435
#, python-format
@@ -2279,7 +2241,7 @@ msgid ""
"You cannot choose the system's yum configuration file /etc/yum.conf for use "
"with Revisor. Aborting."
msgstr ""
-"NO se puede elegir el archivo de configuración de yum del sistema /etc/yum."
+"No puedes elegir el archivo de configuración de yum del sistema /etc/yum."
"conf para usar con Revisor. Abortando."
#: ../revisor/cfg.py:561
@@ -2312,9 +2274,9 @@ msgstr ""
"compone el medio de instalación, esto es FATAL."
#: ../revisor/cfg.py:593
-#, fuzzy, python-format
+#, python-format
msgid "The updates.img specified isn't readable: %s"
-msgstr "Esta impresora compartida no es accesible."
+msgstr "El updates.img especificado no se puede leer: %s"
#: ../revisor/cfg.py:598
msgid "Updates.img seems to not be a file... Is it an URL?"
@@ -2329,6 +2291,8 @@ msgid ""
"The version you selected as a base for pykickstart compatibility and "
"required package sets does not exist"
msgstr ""
+"La versión que seleccionaste como base para compatibilidad pykickstart "
+"y conjunto de paquetes requeridos no existen"
#: ../revisor/cfg.py:633
#, python-format
@@ -2336,18 +2300,20 @@ msgid ""
"You have selected a model with architecture %s which doesn't compose on the "
"system architecture %s."
msgstr ""
+"Ha seleccionado un modelo con arquitectura %s la cual no se puede componer "
+"en la arquitectura %s."
#: ../revisor/cfg.py:641
msgid "Setting options from configuration file"
msgstr "Poniendo las opciones desde el archivo de configuración"
#: ../revisor/cfg.py:669
-#, fuzzy, python-format
+#, python-format
msgid "No model %s in configuration file %s"
msgstr "No hay tal modelo %s en el archivo de configuración %s"
#: ../revisor/cfg.py:671
-#, fuzzy, python-format
+#, python-format
msgid "Setting model to %s"
msgstr "Configurando modelo a %s"
@@ -2358,6 +2324,8 @@ msgid ""
"No model specified on the command line and no existing model configuration "
"in %s"
msgstr ""
+"No modelo especificado en línea de comando y no existe modelo de "
+"configuración en %s"
#: ../revisor/cfg.py:682
#, python-format
@@ -2365,9 +2333,11 @@ msgid ""
"Model %s configured in configuration file %s, but there is no such model "
"configuration"
msgstr ""
+"Modelo %s configurado en archivo de configuracin %s, pero no hay tal "
+"modelo de configuración"
#: ../revisor/cfg.py:696
-#, fuzzy, python-format
+#, python-format
msgid "Tried to load model %s but it doesn't exist inconfiguration file %s"
msgstr "No hay tal modelo %s en el archivo de configuración %s"
@@ -2378,7 +2348,7 @@ msgstr "Modelo %s no tiene directiva de configuración 'main' la cual es "
"requerida"
#: ../revisor/cfg.py:716
-#, fuzzy, python-format
+#, python-format
msgid "Testing for configuration parameter %s"
msgstr "Comprobando parámetro de configuración %s"
@@ -2388,22 +2358,22 @@ msgid "Setting %s to %r (from configuration file model %s)"
msgstr "Poniendo %s a %r (desde el modelo de archivo de configuración %s)"
#: ../revisor/cfg.py:779
-#, fuzzy, python-format
+#, python-format
msgid "Configuration file %s not readable"
-msgstr "Modelo inválido %s, el archivo de configuración %s no es legible"
+msgstr "Archivo de configuración %s, no se puede leer"
#: ../revisor/cfg.py:782 ../revisor/modgui/configuration.py:465
-#, fuzzy, python-format
+#, python-format
msgid "Reading configuration file %s"
msgstr "Leyendo archivo de configuración %s"
#: ../revisor/cfg.py:786
-#, fuzzy, python-format
+#, python-format
msgid "Invalid configuration file %s"
msgstr "Archivo de configuración inválido %s"
#: ../revisor/cfg.py:789
-#, fuzzy, python-format
+#, python-format
msgid "No master configuration section [revisor] in configuration file %s"
msgstr "No hay sección de configuración maestra [revisor] en archivo de "
"configuración %s"
@@ -2418,7 +2388,7 @@ msgid "Setting options from command-line"
msgstr "Poniendo opciones desde la línea de comando"
#: ../revisor/cfg.py:841 ../revisor/cfg.py:848
-#, fuzzy, python-format
+#, python-format
msgid "Setting %s to %r (from command line)"
msgstr "Poniendo %s a %r (desde el archivo de configuración)"
@@ -2428,12 +2398,12 @@ msgid "Checked setting %s through plugin"
msgstr "Checando configuración %s a través de plugin"
#: ../revisor/cfg.py:846
-#, python-format
+#, fuzzy, python-format
msgid "No check_setting_%s()"
-msgstr ""
+msgstr "No check_setting_%s()"
#: ../revisor/cfg.py:850
-#, fuzzy, python-format
+#, python-format
msgid "Not setting %s to %r (command line matches default)"
msgstr "No se pone %s a %r (linea de comando coincide con default)"
@@ -2446,12 +2416,11 @@ msgstr ""
"updates-img o construya también el medio de instalación."
#: ../revisor/cfg.py:897
-#, fuzzy
msgid "Kickstart failed"
msgstr "Kickstart falló"
#: ../revisor/cfg.py:904 ../revisor/cfg.py:909
-#, fuzzy, python-format
+#, python-format
msgid "Kickstart file %s not readable"
msgstr "No se pudo leer el archivo kickstart %s."
@@ -2463,12 +2432,10 @@ msgstr ""
"predeterminados"
#: ../revisor/cfg.py:914
-#, fuzzy
msgid "No kickstart file specified"
-msgstr "ubicacion/archivo-kickstart.cfg"
+msgstr "No se especificó archivo kickstart"
#: ../revisor/cfg.py:917 ../revisor/cfg.py:938
-#, fuzzy
msgid "No media specified"
msgstr "No se especificó medio"
@@ -2483,9 +2450,9 @@ msgstr ""
"múltiples, como cd, dvd, etc."
#: ../revisor/cfg.py:965
-#, python-format
+#, fuzzy, python-format
msgid "pulling self.packages_list[%r][%r][%r][%r]"
-msgstr ""
+msgstr "jalando self.packages_list[%r][%r][%r][%r]"
#: ../revisor/cfg.py:970
#, fuzzy, python-format
@@ -2493,7 +2460,6 @@ msgid "returning pkg_list: %r"
msgstr "regresando pkg_list: %r"
#: ../revisor/cfg.py:1092
-#, fuzzy
msgid "Run from image"
msgstr "Correr desde la imagen"
@@ -2513,28 +2479,27 @@ msgstr ""
"%s"
#: ../revisor/image.py:93
-#, fuzzy
msgid "Running package installation"
msgstr "Ejecutando paquete de instalación"
#. self.cfg.yumobj.ts.check()
#. self.cfg.yumobj.ts.order()
#: ../revisor/image.py:107
-#, fuzzy
msgid "Installing Software"
msgstr "Instalando el Software"
#: ../revisor/image.py:142
-#, fuzzy
msgid "SELinux requested but not enabled on host"
msgstr "SELinux pedido pero no habilitado en el sistema anfitrión."
#: ../revisor/image.py:194
-#, python-format
+#, fuzzy, python-format
msgid ""
"Setting self.cfg.payload_livemedia to %s (from 'part /' command in "
"kickstart, instead of %s)"
msgstr ""
+"Poniendo self.cfg.payload_livemedia de %s (desde 'part /' comando en"
+"kickstart, en lugar de %s)"
#: ../revisor/image.py:199
#, python-format
@@ -2542,14 +2507,15 @@ 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"
#. #
#. # Runtime Options
#. #
#: ../revisor/__init__.py.in:89
-#, fuzzy
msgid "Runtime Options"
-msgstr "Opciones de tiempo de ejecución:"
+msgstr "Opciones de tiempo de ejecución"
#: ../revisor/__init__.py.in:94
msgid "Use the CLI rather then GUI"
@@ -2586,31 +2552,40 @@ msgstr "Reporta los tamaños de todos los RPMs seleccionados "
"en la lista"
#: ../revisor/__init__.py.in:127
+#, fuzzy
msgid ""
"Force Revisor to interpret the package manifest as complete package nevra "
"(name, epoch, version, release and architecture). Implies --kickstart-exact"
msgstr ""
+"Forzar Revisor a interpretar el manifiesto de paquetes como paquete "
+"completo \"nevra\" (name, epoch, version, release, y architecture). "
+"Implica --kickstart-exact"
#: ../revisor/__init__.py.in:133
+#, fuzzy
msgid ""
"Tells Revisor to ignore @core and @base (or %packages --nobase) and only add "
"what is in the package manifest"
msgstr ""
+"Le dice a Revisor ignorar @core y @base (o %packages --nobase) y sólo "
+"añadir lo que está en el manifiesto de paquetes"
#: ../revisor/__init__.py.in:140
+#, fuzzy
msgid ""
"Should Revisor not clean up at all (0), clean up it's temporary build data "
"(1), or everything -this includes the yum cache (2)"
msgstr ""
+"Revisor devería no limpiar nada (0), limpiar sus datos temporales de "
+"construcción(1), o todo -esto incluye el cache yum (2)"
#: ../revisor/__init__.py.in:147
msgid "Size of the USB Thumb Drive. Default to 4G."
-msgstr ""
+msgstr "Tamaño de Memoria USB. Default a 4G."
#: ../revisor/__init__.py.in:156
-#, fuzzy
msgid "Set debugging level (0 by default)"
-msgstr "Cambios a nivel de sistema"
+msgstr "Poniendo nivel de depuración (0 predeterminado)"
#: ../revisor/__init__.py.in:165
msgid "Answer all questions as 'yes'"
@@ -2620,20 +2595,18 @@ msgstr "Responder 'si' a todas las preguntas"
#. # Configuration Options
#. #
#: ../revisor/__init__.py.in:170
-#, fuzzy
msgid "Configuration Options"
-msgstr "Otras opciones:"
+msgstr "Opciones de Configuración:"
#. Might be disabled for testing purposes
#. default = os.path.join(BASE_CONFD_DIR,"fedora-7-gold.cfg"),
#: ../revisor/__init__.py.in:177
-#, fuzzy
msgid "Use kickstart file"
-msgstr "ubicacion/archivo-kickstart.cfg"
+msgstr "Usar archivo kickstart"
#: ../revisor/__init__.py.in:184
msgid "Save options to given file (as a kickstart)"
-msgstr ""
+msgstr "Guardar opciones a archivo dado (como kickstart)"
#: ../revisor/__init__.py.in:191
msgid "Revisor configuration file to use"
@@ -2650,7 +2623,7 @@ msgstr "Directorio destino para los productos"
#: ../revisor/__init__.py.in:211
#, fuzzy
msgid "Working directory"
-msgstr "ORGANIZACIÓN DEL DIRECTORIO"
+msgstr "Directorio de trabajo"
#: ../revisor/__init__.py.in:218
msgid "Model to use for composing"
@@ -2665,10 +2638,12 @@ msgid ""
"Sometimes, it's better to copy local data rather then (sym)linking it. If "
"you have enough space..."
msgstr ""
+"A veces, es mejor copiar información local en lugar de enlazarla "
+"simbólicamente. Si tuviera espacio suficiente..."
#: ../revisor/__init__.py.in:237
msgid "Directory to copy onto the media"
-msgstr ""
+msgstr "Directorio a copiar en el medio"
#. #
#. # Installation Media Options
@@ -2679,65 +2654,62 @@ msgid "Installation Media Options"
msgstr "Uso de las Opciones de Arranque"
#: ../revisor/__init__.py.in:247
-#, fuzzy
msgid "Create Installation Media CDs (Capacity per disc: 685MB)"
-msgstr "Crear DVDs de Instalación dual-layered"
+msgstr "Crear CDs de Instalación (Capacidad por disco: 685MB)"
#: ../revisor/__init__.py.in:253
-#, fuzzy
msgid "Create Installation Media DVDs (Capacity per disc: 4.3GB)"
-msgstr "discos de instalación CD o DVD"
+msgstr "Crear DVDs de Instalacin (Capacidad por disco: 4.3GB)"
#: ../revisor/__init__.py.in:259
-#, fuzzy
msgid "Create Installation Media Dual-Layered DVDs (Capacity per disc: 8.5GB)"
-msgstr "Crear DVDs de Instalación dual-layered"
+msgstr "Crear DVDs de Instalación (Capacidad por disco: 8.5GB)"
#: ../revisor/__init__.py.in:265
-#, fuzzy
msgid "Create Installation Media Blu-Ray Discs (Capacity per disc: 25GB)"
-msgstr "Crear DVDs de Instalación dual-layered"
+msgstr "Crear Discos Blu-Ray de Instalación (Capacidad por disco: 25GB)"
#: ../revisor/__init__.py.in:271
-#, fuzzy
msgid ""
"Create Installation Media Duallayer Blu-Ray Discs (Capacity per disc: 50GB)"
-msgstr "Crear DVDs de Instalación dual-layered"
+msgstr ""
+"Crear Discos de Instalación Blu-Ray de Doble Capa (Capacidad por disco: 50GB)"
#: ../revisor/__init__.py.in:277
msgid "Create Unified ISO from install tree"
msgstr "Crear ISO Unificado desde el árbol de instalación"
#: ../revisor/__init__.py.in:290
-#, fuzzy
msgid "Create the Installation Tree."
-msgstr "Guía de Instalación"
+msgstr "Crear Árbol de Instalación"
#: ../revisor/__init__.py.in:296
msgid "Create Media without graphical installer."
-msgstr ""
+msgstr "Crear Medio sin instalador gráfico."
#: ../revisor/__init__.py.in:302
-#, fuzzy
msgid "Include kickstart file on media or in the tree"
-msgstr "Incluir el archivo kickstart en el medio"
+msgstr "Incluir el archivo kickstart en el medio ó en el árbol"
#: ../revisor/__init__.py.in:308
msgid ""
"In the bootloader menu (isolinux.cfg), set kickstart to boot by default "
"(works with --kickstart-include)"
-msgstr ""
+msgstr ""
+"En el menú del cargador de arranque (isolinux.cfg), poner kickstart para "
+"arrancar por defecto (funciona con --kickstart-include)"
#: ../revisor/__init__.py.in:314
msgid "Filter anything from comps that is not in the package set"
-msgstr ""
+msgstr "Filtrar todo desde comps que no esté en la colección de "
+"paquetes"
#: ../revisor/__init__.py.in:320
msgid "Use Revisor's comps file instead of those from the repositories"
-msgstr ""
+msgstr "Usar archivo comps de Revisor en lugar de aquellos de los "
+"repositorios"
#: ../revisor/__init__.py.in:326
-#, fuzzy
msgid "Comps file to include on the installation media"
msgstr "Incluir el archivo Kickstart en el Medio de Instalación"
@@ -2746,61 +2718,60 @@ msgid "Include specified updates.img on installation media."
msgstr "Incluir el updates.img especificado en el medio de instalación."
#: ../revisor/__init__.py.in:339
-#, fuzzy
msgid "Product Name"
-msgstr "No se especificó un Nombre de Producto"
+msgstr "Nombre del Producto"
#: ../revisor/__init__.py.in:345
msgid ""
"Product Path (e.g. Fedora/ or Packages/ -but without the appending slash)"
msgstr ""
+"Path del Producto (ejemplo Fedora/ o Paquetes/ -pero sin agregar diagonal)"
#: ../revisor/__init__.py.in:351
msgid ""
"ISO Label Base. Note that other things are appended but that the length can "
"be 32 chars maximum."
msgstr ""
+"Etiqueta Base ISO. Note que otras cosas son añadidas pero el tamaño puede ser"
+" de 32 caractéres máximo."
#: ../revisor/__init__.py.in:357
-#, fuzzy
msgid "The base name for the ISOs"
-msgstr "No se especificó el nombre base para el/los ISO(s)"
+msgstr "El nombre base para los ISOs"
#: ../revisor/__init__.py.in:363
msgid "Product Version"
-msgstr ""
+msgstr "Versión del Producto"
#: ../revisor/__init__.py.in:369
msgid ""
"Base Product Version - relevant to required packages and pykickstart "
"compatibility"
msgstr ""
+"Versión Base de Producto - relevante para paquetes requeridos y "
+"compatibilidad pykickstart"
#. #
#. # Utility Media Options
#. #
#: ../revisor/__init__.py.in:374
-#, fuzzy
msgid "Utility Media Options"
-msgstr "Uso de las Opciones de Arranque"
+msgstr "Opciones de Medio Utilitario"
#: ../revisor/__init__.py.in:379
-#, fuzzy
msgid "Create Rescue Media"
-msgstr "Preparación de CD o DVD"
+msgstr "Crear Medio de Rescate"
#. #
#. # Live Media Options
#. #
#: ../revisor/__init__.py.in:384
-#, fuzzy
msgid "Live Media Options"
-msgstr "Uso de las Opciones de Arranque"
+msgstr "Opciones de Medio en Vivo"
#: ../revisor/__init__.py.in:389
-#, fuzzy
msgid "Create Live Media CD/DVD"
-msgstr "Preparación de CD o DVD"
+msgstr "Crear CD/DVD en Vivo"
#: ../revisor/__init__.py.in:395
msgid "Create Live Media Thumb Drive Image (will be depreciated)"
@@ -2822,7 +2793,7 @@ msgstr ""
#: ../revisor/__init__.py.in:419
#, fuzzy
msgid "Skip file system compression."
-msgstr "Utilitarios para el Sistema de Archivos ext3"
+msgstr "Omitir compresión de sistema de archivos."
#: ../revisor/__init__.py.in:425
msgid "Skip prelinking the contents of the filesystem."
@@ -2841,33 +2812,33 @@ msgid "Set the preferred kernel. One of normal, PAE, xen or debug."
msgstr "Configurar el kernel preferido. Uno entre normal, PAE, xen o debug."
#: ../revisor/__init__.py.in:478
-#, fuzzy, python-format
+#, python-format
msgid " %s - No Description"
-msgstr "Descripción:"
+msgstr " %s - No hay Descripción"
#: ../revisor/__init__.py.in:504
msgid "Interrupted by user"
-msgstr ""
+msgstr "Interrumpido por usuario"
#: ../revisor/__init__.py.in:510
+#, fuzzy
msgid ""
"Traceback occurred, please report a bug at http://fedorahosted.org/revisor"
msgstr ""
+"Ocurrió señal de error, por favor reporte el bug en "
+"http://fedorahosted.org/revisor"
#: ../revisor/logger.py:86
-#, fuzzy
msgid "Error"
msgstr "Error"
#: ../revisor/logger.py:101
-#, fuzzy
msgid "Warning"
-msgstr "ATENCION"
+msgstr "Advertencia"
#: ../revisor/logger.py:114 ../revisor/logger.py:123
-#, fuzzy
msgid "Do you want to continue? [Y/n]"
-msgstr "desea romper el existente"
+msgstr "¿Desea continuar? [Y/n]"
#: ../revisor/logger.py:117 ../revisor/logger.py:126
msgid "Abort! Abort! Abort!"
@@ -2879,10 +2850,13 @@ msgstr "Esta herramienta debe correr con los privilegios de root. Abortando"
#. SELinux in enforcing mode
#: ../revisor/misc.py:50
+#, fuzzy
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 anfitrión. Composición de medio "
+"fallará. Por favor configure SELinux en modo permisivo."
#: ../revisor/misc.py:55
msgid ""
@@ -2890,125 +2864,132 @@ msgid ""
"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:141 ../revisor/misc.py:148
#, python-format
msgid "Resolved %s"
-msgstr ""
+msgstr "Resuelto %s"
#: ../revisor/misc.py:151
-#, python-format
+#, fuzzy, 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."
#. If the group is not in the kickstart groups, skip it
#. if not group in self.cfg.ksobj._get("packages","groupList"):
#. continue
#: ../revisor/pkgorder.py:85
-#, fuzzy, python-format
+#, python-format
msgid "Adding group: %s"
-msgstr "no encontrado"
+msgstr "Añadiendo grupo: %s"
#: ../revisor/pkgorder.py:93
-#, fuzzy, python-format
+#, python-format
msgid "Adding conditional: %s / %s"
-msgstr "Prueba de los Discos"
+msgstr "Añadiendo condicional: %s / %s"
#: ../revisor/pkgorder.py:96
-#, fuzzy, python-format
+#, python-format
msgid "The following packages are in group %s: %r"
-msgstr "Seleccionando los paquetes predeterminados del grupo %s"
+msgstr "Los siguientes paquetes están en el grupo %s: %r"
#: ../revisor/pkgorder.py:103
-#, fuzzy, python-format
+#, python-format
msgid "Adding %s-%s:%s-%s.%s to transaction"
-msgstr "Desde los Grupos --optional: Agregando %s-%s:%s-%s.%s a la transacción"
+msgstr "Agregando %s-%s:%s-%s.%s a la transacción"
#: ../revisor/pkgorder.py:110
-#, fuzzy, python-format
+#, python-format
msgid "%d dependencies already resolved"
-msgstr "carta(s) agregadas"
+msgstr "%d dependencias ya resueltas"
#: ../revisor/pkgorder.py:120
-#, fuzzy, python-format
+#, python-format
msgid "Adding package(s): %r"
-msgstr "Instalación de Paquetes"
+msgstr "Añadiendo paquete(s): %r"
#: ../revisor/pkgorder.py:165
-#, python-format
+#, fuzzy, python-format
msgid "Unable to create yum configuration file for package ordering at %s"
-msgstr ""
+msgstr "No se pudo crear archivo de configuración yum para orden de paquete en "
+"%s"
#: ../revisor/pkgorder.py:173
-#, fuzzy, python-format
+#, python-format
msgid "-> package %s"
-msgstr "Paquetes"
+msgstr "-> paquete %s"
#: ../revisor/plugins.py:60 ../revisor/plugins.py:77
#, fuzzy, python-format
msgid "Plugin %s failed to load (%s: %s)"
-msgstr "No se puede cargar el archivo kickstart %s"
+msgstr "Plugin %s falló al cargar (%s: %s)"
#: ../revisor/plugins.py:71
#, python-format
msgid "ImportError for plugin %s: %s"
-msgstr ""
+msgstr "ImportError para plugin %s: %s"
#: ../revisor/plugins.py:74
#, fuzzy, python-format
msgid "RuntimeError for plugin %s: %s"
-msgstr "Error de ejecución al iniciar GUI: %s"
+msgstr "RuntimeError para plugin %s: %s"
#: ../revisor/plugins.py:94 ../revisor/plugins.py:96
#, python-format
msgid "Cannot set defaults for plugin %s: %s"
-msgstr ""
+msgstr "No se puede poner predeterminados para plugin %s: %s"
#: ../revisor/plugins.py:98
#, python-format
msgid "Cannot set defaults for plugin %s: Unknown Error"
-msgstr ""
+msgstr "No se pueden poner predeterminados para plugin %s: Error Desconocido"
#: ../revisor/plugins.py:101
#, python-format
msgid "Not setting defaults for plugin %s: No function 'set_defaults()'"
-msgstr ""
+msgstr "No se ponen predeterminados para plugin %s: No hay función "
+"'set_defaults()'"
#: ../revisor/plugins.py:118
-#, python-format
+#, fuzzy, python-format
msgid "Cannot set runtime for plugin %s: %s"
-msgstr ""
+msgstr "No se puede poner ejecución para plugin %s: %s"
#: ../revisor/plugins.py:120
-#, python-format
+#, fuzzy, python-format
msgid "Not setting runtime for plugin %s: No function 'set_runtime()'"
-msgstr ""
+msgstr "No se pone ejecución de plugin %s: No hay función 'set_runtime()'"
#: ../revisor/plugins.py:137
#, python-format
msgid "Cannot add options for plugin %s: %s"
-msgstr ""
+msgstr "No se añaden opciones para plugin %s: %s"
#: ../revisor/plugins.py:139
#, python-format
msgid "Not adding options for plugin %s: No function 'add_options()'"
-msgstr ""
+msgstr "No se añaden opciones para plugin %s: No hay función 'add_options()'"
#: ../revisor/plugins.py:157
#, python-format
msgid "Cannot check options for plugin %s: %s"
-msgstr ""
+msgstr "No se pueden verificar opciones para plugin %s: %s"
#: ../revisor/plugins.py:159
#, python-format
msgid "Not checking options for plugin %s: No function 'check_options()'"
-msgstr ""
+msgstr "No se verifican opciones para plugin %s: No hay funcion "
+"'check_options()'"
#: ../revisor/plugins.py:195
-#, python-format
+#, fuzzy, python-format
msgid "Cannot execute hook %s for plugin %s: %s"
-msgstr ""
+msgstr "No se puede ejecutar \"hook\" %s para plugin %s: %s"
#: ../revisor/progress.py:79 ../revisor/modgui/build_media.py:89
#: ../revisor/modgui/build_media.py:95 ../revisor/modgui/build_media.py:99
@@ -3035,7 +3016,6 @@ msgstr ""
#: ../revisor/modgui/build_media.py:267 ../revisor/modgui/build_media.py:271
#: ../revisor/modgui/build_media.py:274 ../revisor/modgui/build_media.py:278
#: ../revisor/modgui/build_media.py:282 ../revisor/modgui/build_media.py:291
-#, fuzzy
msgid "Pending..."
msgstr "Pendiente"
@@ -3050,7 +3030,6 @@ msgstr "Ejecutando..."
#: ../revisor/modgui/build_media.py:214 ../revisor/modgui/build_media.py:219
#: ../revisor/modgui/build_media.py:224 ../revisor/modgui/build_media.py:225
#: ../revisor/modgui/build_media.py:226 ../revisor/modgui/build_media.py:227
-#, fuzzy
msgid "Done"
msgstr "Hecho"
@@ -3060,25 +3039,25 @@ msgid "Preparing transaction"
msgstr "Preparación de los Medios"
#: ../revisor/progress.py:202 ../revisor/progress.py:366
-#, fuzzy, python-format
+#, python-format
msgid "Unable to open %s: %s"
-msgstr "abrir para arrastrar y soltar"
+msgstr "No se puede abrir %s: %s"
#: ../revisor/progress.py:203 ../revisor/progress.py:204
#: ../revisor/progress.py:367
-#, fuzzy, python-format
+#, python-format
msgid "Installing %s"
-msgstr "INSTALANDO"
+msgstr "Instalando %s"
#: ../revisor/progress.py:226 ../revisor/progress.py:387
-#, fuzzy, python-format
+#, python-format
msgid "Updated: %s"
-msgstr "Instantáneas actualizadas."
+msgstr "Actualizado: %s"
#: ../revisor/progress.py:228 ../revisor/progress.py:389
-#, fuzzy, python-format
+#, python-format
msgid "Installed: %s"
-msgstr "Software Instalado Manualmente"
+msgstr "Instalado: %s"
#: ../revisor/progress.py:241
#, python-format
@@ -3091,8 +3070,8 @@ msgid "Erased: %s"
msgstr "Borrado: %s"
#: ../revisor/progress.py:541
-#, fuzzy, python-format
-msgid "%s: %s"
+#, python-format
+msgid "Borrado: %s"
msgstr "Borrado: %s"
#: ../revisor/pungi.py:61
@@ -3111,9 +3090,8 @@ msgid "Error: Cannot recreate destination dir %s"
msgstr "Error: No se puede recrear directorio destino %s"
#: ../revisor/pungi.py:342
-#, fuzzy
msgid "Getting relnotes..."
-msgstr "OBTENIENDO AYUDA"
+msgstr "Obteniendo notas de lanzamiento..."
#: ../revisor/pungi.py:363
#, python-format
@@ -3126,12 +3104,12 @@ msgid "Copying %s"
msgstr "Copiando %s"
#: ../revisor/pungi.py:378
-#, fuzzy, python-format
+#, python-format
msgid "Copying release note file %s"
-msgstr "Notas de la Versión de Fedora Core 6"
+msgstr "Copiando archivo de notas de lanzamiento %s"
#: ../revisor/pungi.py:382
-#, fuzzy, python-format
+#, python-format
msgid "File %s not readable"
msgstr "No se pudo leer el archivo kickstart %s."
@@ -3155,51 +3133,52 @@ msgstr "Creando %s"
#: ../revisor/pungi.py:460
#, python-format
msgid "Disc %s #%d is oversized (%r > %r)"
-msgstr ""
+msgstr "Disco %s #%d sobrepasa tamaño (%r > %r)"
#: ../revisor/pungi.py:464
-#, fuzzy, python-format
+#, python-format
msgid "Removing tree %s"
-msgstr "a esto:"
+msgstr "Removiendo arbol %s"
#: ../revisor/pungi.py:472
#, python-format
msgid "Disc %s #%d is OK in size (%r <= %r)"
-msgstr ""
+msgstr "Disco %s #%d con tamaño adecuado (%r <= %r)"
#: ../revisor/pungi.py:523
msgid ""
"Hacking anaconda's .discinfo because it'll shit itself if it reads it's own "
"output"
-msgstr ""
+msgstr ""
+"Hackeando .discinfo de anaconda porque se fregará si lee su propia salida"
#: ../revisor/modcobbler/__init__.py:69 ../revisor/modcobbler/__init__.py:219
#: ../revisor/modcobbler/__init__.py:256
#, python-format
msgid "There is a problem connecting to %s"
-msgstr ""
+msgstr "Hay un problema conectando a %s"
#: ../revisor/modcobbler/__init__.py:83
#, python-format
msgid ""
" Distro: %s\n"
" Existing Profiles:"
-msgstr ""
+msgstr ""
+" Distro: %s\n"
+" Perfiles existentes:"
#: ../revisor/modcobbler/__init__.py:83
-#, fuzzy
msgid "name"
-msgstr "Nombre:"
+msgstr "nombre"
#: ../revisor/modcobbler/__init__.py:85
#, python-format
msgid " Profile: %s"
-msgstr ""
+msgstr " Perfil: %s"
#: ../revisor/modcobbler/__init__.py:87
-#, fuzzy
msgid "No listing found on cobbler server."
-msgstr "Usar un servidor cobbler remoto."
+msgstr "No listando servidor cobbler encontrado."
#: ../revisor/modcobbler/__init__.py:104
msgid "Add compose to a Cobbler server as both a Distribution and Profile."
@@ -3214,7 +3193,6 @@ msgstr ""
"--cobbler-use-distro]"
#: ../revisor/modcobbler/__init__.py:118
-#, fuzzy
msgid "Use a Cobbler distro as source for package data."
msgstr "Usar una distro Cobbler como fuente para paquetes."
@@ -3231,7 +3209,6 @@ msgid "Use remote cobbler server."
msgstr "Usar un servidor cobbler remoto."
#: ../revisor/modcobbler/__init__.py:144
-#, fuzzy
msgid "Remote cobbler server port."
msgstr "Usar un servidor cobbler remoto."
@@ -3245,18 +3222,18 @@ msgstr ""
"profile."
#: ../revisor/modcobbler/__init__.py:226
-#, fuzzy, python-format
+#, python-format
msgid "The distro '%s' does not exist."
-msgstr "archivo vacio: la url no existe"
+msgstr "La distro '%s' no existe."
#: ../revisor/modcobbler/__init__.py:240 ../revisor/modcobbler/__init__.py:263
#, fuzzy, python-format
msgid "The profile '%s' does not exist."
-msgstr "archivo vacio: la url no existe"
+msgstr "El perfil '%s' no existe."
#: ../revisor/moddelta/__init__.py:36
msgid "Package deltarpm not installed"
-msgstr ""
+msgstr "Paquete deltarpm no instalado"
#: ../revisor/moddelta/__init__.py:70
msgid ""
@@ -3270,116 +3247,107 @@ msgstr ""
#: ../revisor/modjigdo/__init__.py:46
msgid "Package jigdo not installed"
-msgstr ""
+msgstr "Paquete jugdo no instalado"
#: ../revisor/modjigdo/__init__.py:61
+#, fuzzy
msgid "Generate Jigdo files and templates using the installation tree"
-msgstr ""
+msgstr "Generando archivos jugdo y templates usando arbol de instalación"
#: ../revisor/modjigdo/__init__.py:67
+#, fuzzy
msgid ""
"Generate Jigdo files against the Revisor YUM Cache (labels different "
"repositories)."
msgstr ""
+"Generando archivos Jugdo con la Cache de Revisor YUM (etiqueta diferentes "
+"repositorios)."
#: ../revisor/modjigdo/__init__.py:77
+#, fuzzy
msgid ""
"You cannot use both the installation tree and the yum cache to build Jigdo "
"templates against."
msgstr ""
+"No puede usar el arbol de instalación ni el cache yum para construir "
+"templates Jigdo con ellos."
#: ../revisor/modgui/build_media.py:89 ../revisor/modgui/build_media.py:199
#, fuzzy
msgid "Retrieve Software Information"
-msgstr "información de la versión en uso"
+msgstr "Recupera Información de Software"
#: ../revisor/modgui/build_media.py:95 ../revisor/modgui/build_media.py:209
-#, fuzzy
msgid "Select Packages from Kickstart"
-msgstr "Usar el manifiesto de paquetes desde los datos de kickstart"
+msgstr "Selecciona Paquetes desde Kickstart"
#: ../revisor/modgui/build_media.py:99 ../revisor/modgui/build_media.py:205
msgid "Resolve Dependencies"
msgstr "Resolver Dependencias"
#: ../revisor/modgui/build_media.py:100 ../revisor/modgui/build_media.py:213
-#, fuzzy
msgid "Populating Statistics"
-msgstr "estadísticas de la máquina virtual"
+msgstr "Reuninendo Estadísticas"
#: ../revisor/modgui/build_media.py:111 ../revisor/modgui/build_media.py:224
-#, fuzzy
msgid "Linking in Packages"
-msgstr "Pantalla de Instalación de Paquetes"
+msgstr "Enlazando Paquetes"
#: ../revisor/modgui/build_media.py:112 ../revisor/modgui/build_media.py:225
-#, fuzzy
msgid "Create Repository Information"
-msgstr "información de la versión en uso"
+msgstr "Crear Información de Repositorio"
#: ../revisor/modgui/build_media.py:113 ../revisor/modgui/build_media.py:226
msgid "Build isolinux and Installer"
msgstr "Construir isolinux y el Instalador"
#: ../revisor/modgui/build_media.py:114 ../revisor/modgui/build_media.py:227
-#, fuzzy
msgid "Linking in Release Notes"
-msgstr "Notas de la Versión de Fedora Core 6"
+msgstr "Enlazando Notas de Versión"
#: ../revisor/modgui/build_media.py:119
-#, fuzzy
msgid "Creating CD ISO Images"
-msgstr "Grabando Imágenes ISO en un Disco"
+msgstr "Creando Imágenes ISO para CD"
#: ../revisor/modgui/build_media.py:124
-#, fuzzy
msgid "Creating DVD ISO Images"
-msgstr "FC-6-i386-DVD.iso"
+msgstr "Creando Imágenes ISO para DVD"
#: ../revisor/modgui/build_media.py:136 ../revisor/modgui/build_media.py:253
-#, fuzzy
msgid "Resolve Dependencies for Installation"
-msgstr "Preparar el sistema para la instalación."
+msgstr "Resuelve Dependencias para Instalación"
#: ../revisor/modgui/build_media.py:137 ../revisor/modgui/build_media.py:254
-#, fuzzy
msgid "Downloading Extra Packages"
-msgstr "Pantalla de Instalación de Paquetes"
+msgstr "Descargando Paquetes Extra"
#: ../revisor/modgui/build_media.py:147 ../revisor/modgui/build_media.py:255
-#, fuzzy
msgid "Creating ext3 Filesystem"
-msgstr "50 GB ext3"
+msgstr "Creando sistema de archivos ext3"
#: ../revisor/modgui/build_media.py:148 ../revisor/modgui/build_media.py:256
-#, fuzzy
msgid "Installing packages"
-msgstr "Instalación de Paquetes"
+msgstr "Instalando Paquetes"
#: ../revisor/modgui/build_media.py:149 ../revisor/modgui/build_media.py:257
-#, fuzzy
msgid "Configure System"
-msgstr "Herramientas del Sistema"
+msgstr "Configurar Sistema"
#: ../revisor/modgui/build_media.py:150 ../revisor/modgui/build_media.py:258
-#, fuzzy
msgid "Configure Networking"
-msgstr "Configurar impresoras"
+msgstr "Configurar Red"
#: ../revisor/modgui/build_media.py:151 ../revisor/modgui/build_media.py:259
-#, fuzzy
msgid "Create RAM Filesystem"
-msgstr "Crear un sistema de archivo en el volúmen encriptado"
+msgstr "Crear sistema de archivos de RAM"
#: ../revisor/modgui/build_media.py:152 ../revisor/modgui/build_media.py:260
-#, fuzzy
msgid "Relabel System"
-msgstr "Herramientas del Sistema"
+msgstr "Re-Etiquetar Sistema"
#: ../revisor/modgui/build_media.py:153 ../revisor/modgui/build_media.py:261
-#, fuzzy
msgid "Configure Bootloader"
-msgstr "Configurar impresoras"
+msgstr "Configurar Cargador de Arranque"
#: ../revisor/modgui/build_media.py:156
msgid "Launch shell"
@@ -3390,14 +3358,12 @@ msgid "Unmounting filesystems"
msgstr "Desmontando sistemas de archivos"
#: ../revisor/modgui/build_media.py:163 ../revisor/modgui/build_media.py:271
-#, fuzzy
msgid "Compressing Image"
-msgstr "Fuente de Imágen"
+msgstr "Comprimiendo Imágen"
#: ../revisor/modgui/build_media.py:166
-#, fuzzy
msgid "Creating ISO Image"
-msgstr "image-file.iso"
+msgstr "Creando Imágen ISO"
#: ../revisor/modgui/build_media.py:173 ../revisor/modgui/build_media.py:278
msgid "Dumping ISO Image to USB Media"
@@ -3408,29 +3374,26 @@ msgid "Cleaning up Build Environment"
msgstr "Limpiando el Entorno de Construcción"
#: ../revisor/modgui/build_media.py:232
-#, fuzzy
msgid "Ordering Packages"
-msgstr "Instalación de Paquetes"
+msgstr "Ordenando Paquetes"
#: ../revisor/modgui/build_media.py:239
-#, fuzzy, python-format
+#, python-format
msgid "Splitting Packages for %s Media"
-msgstr "Los medios de soporte para el arranque de Fedora incluyen:"
+msgstr "Dividiendo Paquetes para Medio %s"
#: ../revisor/modgui/build_media.py:240
-#, fuzzy, python-format
+#, python-format
msgid "Splitting Repository Information for %s Media"
-msgstr "Información general para medios CD y DVD"
+msgstr "Dividiendo Información de Repositosio para Medio %s"
#: ../revisor/modgui/build_media.py:264
-#, fuzzy
msgid "Launching shell"
msgstr "Iniciando Shell"
#: ../revisor/modgui/build_media.py:274
-#, fuzzy
msgid "Creating Live ISO Image"
-msgstr "image-file.iso"
+msgstr "Creando Imágen ISO en Vivo"
#: ../revisor/modgui/configuration.py:123
msgid "You have not specified a Base URL or Mirror List"
@@ -3444,12 +3407,12 @@ msgstr ""
#: ../revisor/modgui/configuration.py:139
#, python-format
msgid "ValueError in baseurl: %s"
-msgstr ""
+msgstr "ValueError en url base: %s"
#: ../revisor/modgui/configuration.py:145
#, python-format
msgid "ValueError in mirrorlist: %s"
-msgstr ""
+msgstr "ValueError en lista de espejos: %s"
#: ../revisor/modgui/configuration.py:218
#, python-format
@@ -3508,33 +3471,30 @@ msgid "Could not read configuration file %s"
msgstr "No se pudo leer el archivo de configuración %s"
#: ../revisor/modgui/finished_screen.py:48
-#, fuzzy
msgid "Check current directory."
-msgstr "Directorio a usar"
+msgstr "Verifica directorio actual."
#: ../revisor/modgui/__init__.py:122
msgid "GUI Mode didn't get RevisorBase instance, which is fatal."
-msgstr ""
+msgstr "Modo GUI no tiene instancia RevisorBase, lo cual es fatal."
#: ../revisor/modgui/__init__.py:191
-#, fuzzy, python-format
+#, python-format
msgid "Opening up /usr/bin/sudo -u %s /usr/bin/xdg-open %s"
-msgstr "Abriendo /usr/bin/htmlview %s"
+msgstr "Abriendo /usr/bin/sudo -u %s /usr/bin/xdg-open %s"
#: ../revisor/modgui/__init__.py:324
-#, fuzzy
msgid "Error downloading packages"
-msgstr "Pantalla de Instalación de Paquetes"
+msgstr "Error descargando paquetes"
#: ../revisor/modgui/__init__.py:339
-#, fuzzy
msgid "Continue"
msgstr "Continuar"
#: ../revisor/modgui/__init__.py:340
#, fuzzy
msgid "Dependencies added"
-msgstr "carta(s) agregadas"
+msgstr "Dependencias agregadas"
#: ../revisor/modgui/__init__.py:341
msgid ""
@@ -3545,19 +3505,16 @@ msgstr ""
"para que funcionen adecuadamente"
#: ../revisor/modgui/__init__.py:350
-#, fuzzy
msgid "Adding for dependencies:\n"
-msgstr "Alias para FCVER"
+msgstr "Añadiendo por dependencias:\n"
#: ../revisor/modgui/__init__.py:351
-#, fuzzy
msgid "Removing for dependencies:\n"
-msgstr "Alias para FCVER"
+msgstr "Removiendo por dependencias:\n"
#: ../revisor/modgui/__init__.py:352
-#, fuzzy
msgid "Updating for dependencies:\n"
-msgstr "Alias para FCVER"
+msgstr "Actualizando por dependencias:\n"
#: ../revisor/modgui/lm_basic.py:164 ../revisor/modgui/lm_basic.py:169
#: ../revisor/modgui/lm_basic.py:175 ../revisor/modgui/lm_basic.py:277
@@ -3572,7 +3529,7 @@ msgstr "Estas contraseñas con coinciden"
#: ../revisor/modgui/lm_basic.py:296
#, fuzzy
msgid "Please select a root password."
-msgstr "Pantalla para Poner la Clave de Root"
+msgstr "Por favor seleccione la clave de Root"
#: ../revisor/modgui/lm_basic.py:300
msgid "You should really select a more complex root password."
@@ -3583,14 +3540,13 @@ msgstr "Realmente debe elegir una contraseña de root más compleja."
#: ../revisor/modgui/lm_network.py:386 ../revisor/modgui/lm_network.py:433
#, fuzzy
msgid "DHCP"
-msgstr "DHCP y Servidores"
+msgstr "DHCP"
#: ../revisor/modgui/lm_network.py:113 ../revisor/modgui/lm_network.py:165
#: ../revisor/modgui/lm_network.py:236 ../revisor/modgui/lm_network.py:296
#: ../revisor/modgui/lm_network.py:435
-#, fuzzy
msgid "Static IP"
-msgstr "Dirección IP"
+msgstr "Dirección IP estática"
#: ../revisor/modgui/lm_network.py:115 ../revisor/modgui/lm_network.py:223
#: ../revisor/modgui/lm_network.py:285 ../revisor/modgui/lm_network.py:388
@@ -3613,14 +3569,12 @@ msgstr ""
#. create table with custom checklists
#: ../revisor/modgui/lm_security.py:61
-#, fuzzy
msgid "Trusted devices:"
-msgstr "Dispositivos de Red"
+msgstr "Dispositivos de confianza:"
#: ../revisor/modgui/lm_security.py:93
-#, fuzzy
msgid "Trusted services:"
-msgstr "La Lista de Servicios"
+msgstr "Servicios de confianza:"
#: ../revisor/modgui/lm_security.py:125
msgid "Other ports: (1029:tcp)"
@@ -3634,12 +3588,12 @@ msgstr "no se pudo grabar el archivo"
#: ../revisor/modgui/load_kickstart.py:147
#, fuzzy
msgid "Kickstart file not good."
-msgstr "no se pudo grabar el archivo"
+msgstr "Archivo kickstart no es bueno."
#: ../revisor/modgui/package_selection.py:154
#, fuzzy
msgid "Selecting all packages"
-msgstr "Pantalla de Instalación de Paquetes"
+msgstr "Seleccionar todos los paquetes"
#: ../revisor/modgui/package_selection.py:409
#, python-format
@@ -3667,10 +3621,14 @@ msgid ""
"\n"
"%s: %s"
msgstr ""
+"Errores encontrados:\n"
+"\n"
+"%s: %s"
-#: ../revisor/modgui/package_selection.py:469
+#: ../revisor/modgui/package_selection.py:469
+#, fuzzy
msgid "Cannot pass check_options"
-msgstr ""
+msgstr "No se pueden pasar check_options"
#: ../revisor/modgui/package_selection.py:475
#: ../revisor/modgui/select_media.py:475
@@ -3692,24 +3650,23 @@ msgid "Uncategorized"
msgstr "No categorizado"
#: ../revisor/modgui/package_selection.py:798
-#, fuzzy, python-format
+#, python-format
msgid "Packages in %s"
-msgstr "En el idioma:"
+msgstr "Paquetes en %s"
#: ../revisor/modgui/package_selection.py:846
-#, fuzzy
msgid "Building Packages List"
-msgstr "de una lista alfabética"
+msgstr "Construyendo Lista de Paquetes"
#: ../revisor/modgui/package_selection.py:855
-#, fuzzy, python-format
+#, python-format
msgid "%s packages"
-msgstr "Paquetes"
+msgstr "%s paquetes"
#: ../revisor/modgui/package_selection.py:890
#, fuzzy, python-format
msgid "For %s-%s:%s-%s.%s, we find %d matches"
-msgstr "No hay coincidencias para \""
+msgstr "Para %s-%s:%s-%s.%s, encontramos %d coincidencias"
#: ../revisor/modgui/select_media.py:75
msgid "No media selected. Please select at least one media type to compose."
@@ -3770,9 +3727,8 @@ msgid "No version number specified"
msgstr "No se especificó el número de versión"
#: ../revisor/modgui/select_media.py:521
-#, fuzzy
msgid "No comps no glory"
-msgstr "No se encontraron coincidencias. :-("
+msgstr "Sin comps no hay gloria"
#: ../revisor/modgui/select_media.py:524
msgid "Unable to find comps file. No comps no glory"
@@ -3780,31 +3736,33 @@ msgstr "No se pudo encontrar el archivo comps. Sin comps no hay gloria"
#: ../revisor/modisolinux/__init__.py:48
msgid "Custom isolinux.cfg to replace the standard isolinux.cfg with."
-msgstr ""
+msgstr "Personalizar isolinux.cfg para reemplazar isolinux.cfg convencional"
#: ../revisor/modisolinux/__init__.py:57 ../revisor/modisolinux/__init__.py:64
msgid ""
"Both --kickstart-default and --isolinux-cfg have been specified, while they "
"are mutually exclusive. --isolinux-cfg is going to be used."
msgstr ""
+"--kickstart-default y --isolinux-cfg deben ser especificados, cuando son "
+"mutuamente exclusivos. --isolinux-cfg será usado."
#: ../revisor/modisolinux/__init__.py:73
-#, fuzzy, python-format
+#, python-format
msgid "File %s is not readable"
-msgstr "Esta impresora compartida no es accesible."
+msgstr "Archivo %s no se puede leer"
#: ../revisor/modisolinux/__init__.py:78
msgid "How come isolinux_cfg is set to False?"
-msgstr ""
+msgstr "¿Como pudo isolinux_cfg ser puesto a Falso?"
#: ../revisor/modisolinux/__init__.py:81
msgid "How come isolinux_cfg is an empty string?"
-msgstr ""
+msgstr "¿Como puede ser que isolinux_cfg sea una cadena vacía?"
#: ../revisor/modisolinux/__init__.py:84
#, python-format
msgid "Going to replace isolinux/isolinux.cfg with %s"
-msgstr ""
+msgstr "Se reemplazara isolinux/isolinux.cfg con %s"
#: ../revisor/modisolinux/__init__.py:87
msgid "Deleted the old isolinux.cfg"
commit 6f3931b3f9ca18ea870cb04d30e109d33b6e1199
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Wed Feb 25 22:34:30 2009 +0100
Add a rpms.log file
diff --git a/unity/scripts/respin.sh b/unity/scripts/respin.sh
index 03ddfb7..b415582 100755
--- a/unity/scripts/respin.sh
+++ b/unity/scripts/respin.sh
@@ -29,6 +29,14 @@
# # (optional)
# config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/var/tmp/revisor-yumcache/', '/var/tmp/revisor-yumcache/' ))
#
+##
+## Wishlist
+##
+# - diff different versions of live media
+# - enable rawhide composes
+# - jigdofying and torrentifying installation media
+# - torrentifying live media
+#
function usage() {
echo "$0 [options]"
@@ -171,7 +179,7 @@ for version in $VERSIONS; do
if [ $LIVE -eq 1 ]; then
cd ${revisor_cwd}
- for spin in `${revisor_cmd} --config /etc/revisor-unity/f$version-live-respin.conf --list-models | grep "^ f$version-$arch-" | awk '{print $1}'`; do
+ for spin in `${revisor_cmd} --config /etc/revisor-unity/f$version-live-respin.conf --list-models | grep "^ f$version-$arch-" | awk '{print $1}' | head -n 1`; do
echo "Creating $spin"
@@ -204,6 +212,20 @@ for version in $VERSIONS; do
sudo mkdir -p /srv/revisor/$datestamp/$spin/log/
sudo mv revisor-$spin.log /srv/revisor/$datestamp/$spin/log/
+ # Now that it is done, run some more reporting on the spin
+ isoimage=`find /srv/revisor/$datestamp/$spin/live/ -name "*.iso"`
+ if [ ! -z "${isoimage}" ]; then
+ sudo mkdir -p /tmp/{loopmount_iso,loopmount_squashfs,loopmount_ext3fs}
+ sudo mount -o loop,ro ${isoimage} /tmp/loopmount_iso && \
+ sudo mount -o loop,ro /tmp/loopmount_iso/LiveOS/squashfs.img /tmp/loopmount_squashfs && \
+ sudo mount -o loop,ro /tmp/loopmount_squashfs/LiveOS/ext3fs.img /tmp/loopmount_ext3fs && \
+ sudo chroot /tmp/loopmount_ext3fs/ rpm -qa --qf "%{SIZE}\t%{NAME}\n" | sort -n -r > rpms-$spin.log && \
+ sudo mv rpms-$spin.log /srv/revisor/$datestamp/$spin/log/
+ sudo umount /tmp/loopmount_ext3fs && \
+ sudo umount /tmp/loopmount_squashfs && \
+ sudo umount /tmp/loopmount_iso
+ fi
+
sleep 10
done
fi
commit 4640fc5dff2a1547e9ef5b1548637b87d5d282fe
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Wed Feb 25 17:28:47 2009 +0100
Update the arch list
diff --git a/revisor/image.py b/revisor/image.py
index d1a4276..c5f67a0 100644
--- a/revisor/image.py
+++ b/revisor/image.py
@@ -272,7 +272,7 @@ class ppc64LiveImageCreator(ppcLiveImageCreator):
# The LiveImageCreator object
arch = rpmUtils.arch.getBaseArch()
-if arch in ("i386", "x86_64"):
+if arch in ("i386", "i586", "i686", "x86_64"):
LiveImageCreator = x86LiveImageCreator
elif arch in ("ppc",):
LiveImageCreator = ppcLiveImageCreator
commit 744282694f4f8083e71df0aaf07d6ce899e9d0a8
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Wed Feb 25 17:28:32 2009 +0100
Update description on these spins
diff --git a/unity/conf/f10-live-respin.conf b/unity/conf/f10-live-respin.conf
index 1731c9c..a388480 100644
--- a/unity/conf/f10-live-respin.conf
+++ b/unity/conf/f10-live-respin.conf
@@ -31,7 +31,7 @@ kickstart_uses_pkgsack_exclude = 1
##
[f10-i386-live-aos-respin]
-description = Fedora Unity Live AOS Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live AOS Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-aos-respin.conf
iso_basename = Fedora-Unity-AOS-$datestamp
iso_label = FU Live $datestamp
@@ -39,7 +39,7 @@ architecture = i386
kickstart_file = /usr/share/spin-kickstarts/fedora-aos.ks
[f10-i386-live-broffice.org-respin]
-description = Fedora Unity Live BrOffice.Org Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live BrOffice.Org Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-broffice.org-respin.conf
iso_basename = Fedora-Unity-BrOffice.Org-$datestamp
iso_label = FU Live $datestamp
@@ -47,7 +47,7 @@ architecture = i386
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-broffice.org.ks
[f10-i386-live-desktop-default-respin]
-description = Fedora Unity Live Desktop Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Desktop Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-desktop-respin.conf
iso_basename = Fedora-Unity-Desktop-$datestamp
iso_label = FU Live $datestamp
@@ -55,7 +55,7 @@ architecture = i386
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-desktop-default.ks
[f10-i386-live-desktop-de_CH-respin]
-description = Fedora Unity Live Desktop de_CH Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Desktop de_CH Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-desktop-respin.conf
iso_basename = Fedora-Unity-Desktop-de_CH-$datestamp
iso_label = FU Live $datestamp
@@ -63,7 +63,7 @@ architecture = i386
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-desktop-de_CH.ks
[f10-i386-live-desktop-de_DE-respin]
-description = Fedora Unity Live Desktop de_DE Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Desktop de_DE Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-desktop-respin.conf
iso_basename = Fedora-Unity-Desktop-de_DE-$datestamp
iso_label = FU Live $datestamp
@@ -71,7 +71,7 @@ architecture = i386
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-desktop-de_DE.ks
[f10-i386-live-desktop-nl_NL-respin]
-description = Fedora Unity Live Desktop nl_NL Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Desktop nl_NL Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-desktop-respin.conf
iso_basename = Fedora-Unity-Desktop-nl_NL-$datestamp
iso_label = FU Live $datestamp
@@ -79,7 +79,7 @@ architecture = i386
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-desktop-nl_NL.ks
[f10-i386-live-desktop-pt_BR-respin]
-description = Fedora Unity Live Desktop pt_BR Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Desktop pt_BR Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-desktop-respin.conf
iso_basename = Fedora-Unity-Desktop-pt_BR-$datestamp
iso_label = FU Live $datestamp
@@ -87,7 +87,7 @@ architecture = i386
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-desktop-pt_BR.ks
[f10-i386-live-desktop-pt_PT-respin]
-description = Fedora Unity Live Desktop pt_PT Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Desktop pt_PT Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-desktop-respin.conf
iso_basename = Fedora-Unity-Desktop-pt_PT-$datestamp
iso_label = FU Live $datestamp
@@ -95,7 +95,7 @@ architecture = i386
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-desktop-pt_PT.ks
[f10-i386-live-developer-respin]
-description = Fedora Unity Live Developer Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Developer Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-developer-respin.conf
iso_basename = Fedora-Unity-Developer-$datestamp
iso_label = FU Live Developer $datestamp
@@ -103,7 +103,7 @@ architecture = i386
kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-developer.ks
[f10-i386-live-developer-de_CH-respin]
-description = Fedora Unity Live Developer de_CH Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Developer de_CH Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-developer-respin.conf
iso_basename = Fedora-Unity-Developer-de_CH-$datestamp
iso_label = FU Live Developer $datestamp
@@ -111,7 +111,7 @@ architecture = i386
kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-developer-de_CH.ks
[f10-i386-live-developer-nl_NL-respin]
-description = Fedora Unity Live Developer nl_NL Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Developer nl_NL Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-developer-respin.conf
iso_basename = Fedora-Unity-Developer-nl_NL-$datestamp
iso_label = FU Live Developer $datestamp
@@ -119,7 +119,7 @@ architecture = i386
kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-developer-nl_NL.ks
[f10-i386-live-developer-pt_PT-respin]
-description = Fedora Unity Live Developer pt_PT Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Developer pt_PT Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-developer-respin.conf
iso_basename = Fedora-Unity-Developer-pt_PT-$datestamp
iso_label = FU Live Developer $datestamp
@@ -127,7 +127,7 @@ architecture = i386
kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-developer-pt_PT.ks
[f10-i386-live-education-math-respin]
-description = Fedora Unity Live Education Math Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Education Math Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-education-math-respin.conf
iso_basename = Fedora-Unity-Education-Math-$datestamp
iso_label = FU Live E-Math $datestamp
@@ -135,7 +135,7 @@ architecture = i386
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-education-math.ks
[f10-i386-live-electronic-lab-respin]
-description = Fedora Unity Live Electronic Lab DVD Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Electronic Lab DVD Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-electronic-lab-respin.conf
iso_basename = Fedora-Unity-EL-$datestamp
iso_label = FU Live EL $datestamp
@@ -143,7 +143,7 @@ architecture = i386
kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-electronic-lab.ks
[f10-i386-live-electronic-de_CH-lab-respin]
-description = Fedora Unity Live Electronic Lab de_CH DVD Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Electronic Lab de_CH DVD Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-electronic-lab-respin.conf
iso_basename = Fedora-Unity-EL-de_CH-$datestamp
iso_label = FU Live EL $datestamp
@@ -151,7 +151,7 @@ architecture = i386
kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-electronic-lab-de_CH.ks
[f10-i386-live-electronic-nl_NL-lab-respin]
-description = Fedora Unity Live Electronic Lab nl_NL DVD Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Electronic Lab nl_NL DVD Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-electronic-lab-respin.conf
iso_basename = Fedora-Unity-EL-nl_NL-$datestamp
iso_label = FU Live EL $datestamp
@@ -159,7 +159,7 @@ architecture = i386
kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-electronic-lab-nl_NL.ks
[f10-i386-live-electronic-pt_PT-lab-respin]
-description = Fedora Unity Live Electronic Lab pt_PT DVD Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Electronic Lab pt_PT DVD Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-electronic-lab-respin.conf
iso_basename = Fedora-Unity-EL-pt_PT-$datestamp
iso_label = FU Live EL $datestamp
@@ -167,7 +167,7 @@ architecture = i386
kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-electronic-lab-pt_PT.ks
[f10-i386-live-games-respin]
-description = Fedora Unity Live Games Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Games Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-games-respin.conf
iso_basename = Fedora-Unity-Games-$datestamp
iso_label = FU Live Games $datestamp
@@ -175,7 +175,7 @@ architecture = i386
kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-games.ks
[f10-i386-live-games-de_CH-respin]
-description = Fedora Unity Live Games de_CH Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Games de_CH Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-games-respin.conf
iso_basename = Fedora-Unity-Games-de_CH-$datestamp
iso_label = FU Live Games $datestamp
@@ -183,7 +183,7 @@ architecture = i386
kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-games-de_CH.ks
[f10-i386-live-games-nl_NL-respin]
-description = Fedora Unity Live Games nl_NL Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Games nl_NL Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-games-respin.conf
iso_basename = Fedora-Unity-Games-nl_NL-$datestamp
iso_label = FU Live Games $datestamp
@@ -191,7 +191,7 @@ architecture = i386
kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-games-nl_NL.ks
[f10-i386-live-games-pt_PT-respin]
-description = Fedora Unity Live Games pt_PT Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Games pt_PT Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-games-respin.conf
iso_basename = Fedora-Unity-Games-pt_PT-$datestamp
iso_label = FU Live Games $datestamp
@@ -199,7 +199,7 @@ architecture = i386
kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-games-pt_PT.ks
[f10-i386-live-kde-respin]
-description = Fedora Unity Live KDE Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live KDE Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-kde-respin.conf
iso_basename = Fedora-Unity-KDE-$datestamp
iso_label = FU Live KDE $datestamp
@@ -207,7 +207,7 @@ architecture = i386
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-kde.ks
[f10-i386-live-kde-de_CH-respin]
-description = Fedora Unity Live KDE de_CH Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live KDE de_CH Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-kde-respin.conf
iso_basename = Fedora-Unity-KDE-de_CH-$datestamp
iso_label = FU Live KDE $datestamp
@@ -215,7 +215,7 @@ architecture = i386
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-kde-de_CH.ks
[f10-i386-live-kde-de_DE-respin]
-description = Fedora Unity Live KDE de_DE Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live KDE de_DE Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-kde-respin.conf
iso_basename = Fedora-Unity-KDE-de_DE-$datestamp
iso_label = FU Live KDE $datestamp
@@ -223,7 +223,7 @@ architecture = i386
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-kde-de_DE.ks
[f10-i386-live-kde-nl_NL-respin]
-description = Fedora Unity Live KDE nl_NL Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live KDE nl_NL Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-kde-respin.conf
iso_basename = Fedora-Unity-KDE-nl_NL-$datestamp
iso_label = FU Live KDE $datestamp
@@ -231,7 +231,7 @@ architecture = i386
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-kde-nl_NL.ks
[f10-i386-live-kde-pt_PT-respin]
-description = Fedora Unity Live KDE pt_PT Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live KDE pt_PT Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-kde-respin.conf
iso_basename = Fedora-Unity-KDE-pt_PT-$datestamp
iso_label = FU Live KDE $datestamp
@@ -239,7 +239,7 @@ architecture = i386
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-kde-pt_PT.ks
[f10-i386-live-xfce-respin]
-description = Fedora Unity Live XFCE Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live XFCE Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-xfce-respin.conf
iso_basename = Fedora-Unity-XFCE-$datestamp
iso_label = FU Live XFCE $datestamp
@@ -247,7 +247,7 @@ architecture = i386
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-xfce.ks
[f10-i386-live-xfce-de_CH-respin]
-description = Fedora Unity Live XFCE de_CH Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live XFCE de_CH Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-xfce-respin.conf
iso_basename = Fedora-Unity-XFCE-de_CH-$datestamp
iso_label = FU Live XFCE $datestamp
@@ -255,7 +255,7 @@ architecture = i386
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-xfce-de_CH.ks
[f10-i386-live-xfce-nl_NL-respin]
-description = Fedora Unity Live XFCE nl_NL Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live XFCE nl_NL Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-xfce-respin.conf
iso_basename = Fedora-Unity-XFCE-nl_NL-$datestamp
iso_label = FU Live XFCE $datestamp
@@ -263,7 +263,7 @@ architecture = i386
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-xfce-nl_NL.ks
[f10-i386-live-xfce-pt_PT-respin]
-description = Fedora Unity Live XFCE pt_PT Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live XFCE pt_PT Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-xfce-respin.conf
iso_basename = Fedora-Unity-XFCE-pt_PT-$datestamp
iso_label = FU Live XFCE $datestamp
@@ -271,7 +271,7 @@ architecture = i386
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-xfce-pt_PT.ks
[f10-x86_64-live-aos-respin]
-description = Fedora Unity Live AOS Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live AOS Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-aos-respin.conf
iso_basename = Fedora-Unity-AOS-$datestamp
iso_label = FU Live $datestamp
@@ -279,7 +279,7 @@ architecture = x86_64
kickstart_file = /usr/share/spin-kickstarts/fedora-aos.ks
[f10-x86_64-live-broffice.org-respin]
-description = Fedora Unity Live BrOffice.Org Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live BrOffice.Org Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-broffice.org-respin.conf
iso_basename = Fedora-Unity-BrOffice.Org-$datestamp
iso_label = FU Live $datestamp
@@ -287,7 +287,7 @@ architecture = x86_64
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-broffice.org.ks
[f10-x86_64-live-desktop-default-respin]
-description = Fedora Unity Live Desktop Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Desktop Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-desktop-respin.conf
iso_basename = Fedora-Unity-Desktop-$datestamp
iso_label = FU Live $datestamp
@@ -295,7 +295,7 @@ architecture = x86_64
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-desktop-default.ks
[f10-x86_64-live-desktop-de_CH-respin]
-description = Fedora Unity Live Desktop de_CH Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Desktop de_CH Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-desktop-respin.conf
iso_basename = Fedora-Unity-Desktop-de_CH-$datestamp
iso_label = FU Live $datestamp
@@ -303,7 +303,7 @@ architecture = x86_64
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-desktop-de_CH.ks
[f10-x86_64-live-desktop-de_DE-respin]
-description = Fedora Unity Live Desktop de_DE Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Desktop de_DE Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-desktop-respin.conf
iso_basename = Fedora-Unity-Desktop-de_DE-$datestamp
iso_label = FU Live $datestamp
@@ -311,7 +311,7 @@ architecture = x86_64
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-desktop-de_DE.ks
[f10-x86_64-live-desktop-nl_NL-respin]
-description = Fedora Unity Live Desktop nl_NL Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Desktop nl_NL Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-desktop-respin.conf
iso_basename = Fedora-Unity-Desktop-nl_NL-$datestamp
iso_label = FU Live $datestamp
@@ -319,7 +319,7 @@ architecture = x86_64
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-desktop-nl_NL.ks
[f10-x86_64-live-desktop-pt_BR-respin]
-description = Fedora Unity Live Desktop pt_BR Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Desktop pt_BR Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-desktop-respin.conf
iso_basename = Fedora-Unity-Desktop-pt_BR-$datestamp
iso_label = FU Live $datestamp
@@ -327,7 +327,7 @@ architecture = x86_64
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-desktop-pt_BR.ks
[f10-x86_64-live-desktop-pt_PT-respin]
-description = Fedora Unity Live Desktop pt_PT Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Desktop pt_PT Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-desktop-respin.conf
iso_basename = Fedora-Unity-Desktop-pt_PT-$datestamp
iso_label = FU Live $datestamp
@@ -335,7 +335,7 @@ architecture = x86_64
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-desktop-pt_PT.ks
[f10-x86_64-live-developer-respin]
-description = Fedora Unity Live Developer Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Developer Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-developer-respin.conf
iso_basename = Fedora-Unity-Developer-$datestamp
iso_label = FU Live Developer $datestamp
@@ -343,7 +343,7 @@ architecture = x86_64
kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-developer.ks
[f10-x86_64-live-developer-de_CH-respin]
-description = Fedora Unity Live Developer de_CH Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Developer de_CH Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-developer-respin.conf
iso_basename = Fedora-Unity-Developer-de_CH-$datestamp
iso_label = FU Live Developer $datestamp
@@ -351,7 +351,7 @@ architecture = x86_64
kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-developer-de_CH.ks
[f10-x86_64-live-developer-nl_NL-respin]
-description = Fedora Unity Live Developer nl_NL Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Developer nl_NL Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-developer-respin.conf
iso_basename = Fedora-Unity-Developer-nl_NL-$datestamp
iso_label = FU Live Developer $datestamp
@@ -359,7 +359,7 @@ architecture = x86_64
kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-developer-nl_NL.ks
[f10-x86_64-live-developer-pt_PT-respin]
-description = Fedora Unity Live Developer pt_PT Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Developer pt_PT Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-developer-respin.conf
iso_basename = Fedora-Unity-Developer-pt_PT-$datestamp
iso_label = FU Live Developer $datestamp
@@ -367,7 +367,7 @@ architecture = x86_64
kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-developer-pt_PT.ks
[f10-x86_64-live-education-math-respin]
-description = Fedora Unity Live Education Math Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Education Math Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-education-math-respin.conf
iso_basename = Fedora-Unity-Education-Math-$datestamp
iso_label = FU Live E-Math $datestamp
@@ -375,7 +375,7 @@ architecture = x86_64
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-education-math.ks
[f10-x86_64-live-electronic-lab-respin]
-description = Fedora Unity Live Electronic Lab DVD Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Electronic Lab DVD Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-electronic-lab-respin.conf
iso_basename = Fedora-Unity-EL-$datestamp
iso_label = FU Live EL $datestamp
@@ -383,7 +383,7 @@ architecture = x86_64
kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-electronic-lab.ks
[f10-x86_64-live-electronic-de_CH-lab-respin]
-description = Fedora Unity Live Electronic Lab de_CH DVD Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Electronic Lab de_CH DVD Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-electronic-lab-respin.conf
iso_basename = Fedora-Unity-EL-de_CH-$datestamp
iso_label = FU Live EL $datestamp
@@ -391,7 +391,7 @@ architecture = x86_64
kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-electronic-lab-de_CH.ks
[f10-x86_64-live-electronic-nl_NL-lab-respin]
-description = Fedora Unity Live Electronic Lab nl_NL DVD Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Electronic Lab nl_NL DVD Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-electronic-lab-respin.conf
iso_basename = Fedora-Unity-EL-nl_NL-$datestamp
iso_label = FU Live EL $datestamp
@@ -399,7 +399,7 @@ architecture = x86_64
kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-electronic-lab-nl_NL.ks
[f10-x86_64-live-electronic-pt_PT-lab-respin]
-description = Fedora Unity Live Electronic Lab pt_PT DVD Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Electronic Lab pt_PT DVD Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-electronic-lab-respin.conf
iso_basename = Fedora-Unity-EL-pt_PT-$datestamp
iso_label = FU Live EL $datestamp
@@ -407,7 +407,7 @@ architecture = x86_64
kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-electronic-lab-pt_PT.ks
[f10-x86_64-live-games-respin]
-description = Fedora Unity Live Games Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Games Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-games-respin.conf
iso_basename = Fedora-Unity-Games-$datestamp
iso_label = FU Live Games $datestamp
@@ -415,7 +415,7 @@ architecture = x86_64
kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-games.ks
[f10-x86_64-live-games-de_CH-respin]
-description = Fedora Unity Live Games de_CH Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Games de_CH Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-games-respin.conf
iso_basename = Fedora-Unity-Games-de_CH-$datestamp
iso_label = FU Live Games $datestamp
@@ -423,7 +423,7 @@ architecture = x86_64
kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-games-de_CH.ks
[f10-x86_64-live-games-nl_NL-respin]
-description = Fedora Unity Live Games nl_NL Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Games nl_NL Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-games-respin.conf
iso_basename = Fedora-Unity-Games-nl_NL-$datestamp
iso_label = FU Live Games $datestamp
@@ -431,7 +431,7 @@ architecture = x86_64
kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-games-nl_NL.ks
[f10-x86_64-live-games-pt_PT-respin]
-description = Fedora Unity Live Games pt_PT Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Games pt_PT Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-games-respin.conf
iso_basename = Fedora-Unity-Games-pt_PT-$datestamp
iso_label = FU Live Games $datestamp
@@ -439,7 +439,7 @@ architecture = x86_64
kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-games-pt_PT.ks
[f10-x86_64-live-kde-respin]
-description = Fedora Unity Live KDE Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live KDE Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-kde-respin.conf
iso_basename = Fedora-Unity-KDE-$datestamp
iso_label = FU Live KDE $datestamp
@@ -447,7 +447,7 @@ architecture = x86_64
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-kde.ks
[f10-x86_64-live-kde-de_CH-respin]
-description = Fedora Unity Live KDE de_CH Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live KDE de_CH Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-kde-respin.conf
iso_basename = Fedora-Unity-KDE-de_CH-$datestamp
iso_label = FU Live KDE $datestamp
@@ -455,7 +455,7 @@ architecture = x86_64
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-kde-de_CH.ks
[f10-x86_64-live-kde-de_DE-respin]
-description = Fedora Unity Live KDE de_DE Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live KDE de_DE Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-kde-respin.conf
iso_basename = Fedora-Unity-KDE-de_DE-$datestamp
iso_label = FU Live KDE $datestamp
@@ -463,7 +463,7 @@ architecture = x86_64
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-kde-de_DE.ks
[f10-x86_64-live-kde-nl_NL-respin]
-description = Fedora Unity Live KDE nl_NL Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live KDE nl_NL Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-kde-respin.conf
iso_basename = Fedora-Unity-KDE-nl_NL-$datestamp
iso_label = FU Live KDE $datestamp
@@ -471,7 +471,7 @@ architecture = x86_64
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-kde-nl_NL.ks
[f10-x86_64-live-kde-pt_PT-respin]
-description = Fedora Unity Live KDE pt_PT Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live KDE pt_PT Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-kde-respin.conf
iso_basename = Fedora-Unity-KDE-pt_PT-$datestamp
iso_label = FU Live KDE $datestamp
@@ -479,7 +479,7 @@ architecture = x86_64
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-kde-pt_PT.ks
[f10-x86_64-live-xfce-respin]
-description = Fedora Unity Live XFCE Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live XFCE Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-xfce-respin.conf
iso_basename = Fedora-Unity-XFCE-$datestamp
iso_label = FU Live XFCE $datestamp
@@ -487,7 +487,7 @@ architecture = x86_64
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-xfce.ks
[f10-x86_64-live-xfce-de_CH-respin]
-description = Fedora Unity Live XFCE de_CH Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live XFCE de_CH Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-xfce-respin.conf
iso_basename = Fedora-Unity-XFCE-de_CH-$datestamp
iso_label = FU Live XFCE $datestamp
@@ -495,7 +495,7 @@ architecture = x86_64
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-xfce-de_CH.ks
[f10-x86_64-live-xfce-nl_NL-respin]
-description = Fedora Unity Live XFCE nl_NL Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live XFCE nl_NL Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-xfce-respin.conf
iso_basename = Fedora-Unity-XFCE-nl_NL-$datestamp
iso_label = FU Live XFCE $datestamp
@@ -503,7 +503,7 @@ architecture = x86_64
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-xfce-nl_NL.ks
[f10-x86_64-live-xfce-pt_PT-respin]
-description = Fedora Unity Live XFCE pt_PT Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live XFCE pt_PT Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-xfce-respin.conf
iso_basename = Fedora-Unity-XFCE-pt_PT-$datestamp
iso_label = FU Live XFCE $datestamp
@@ -511,7 +511,7 @@ architecture = x86_64
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-xfce-pt_PT.ks
[f10-ppc-live-aos-respin]
-description = Fedora Unity Live AOS Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live AOS Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-aos-respin.conf
iso_basename = Fedora-Unity-AOS-$datestamp
iso_label = FU Live $datestamp
@@ -519,7 +519,7 @@ architecture = ppc
kickstart_file = /usr/share/spin-kickstarts/fedora-aos.ks
[f10-ppc-live-broffice.org-respin]
-description = Fedora Unity Live BrOffice.Org Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live BrOffice.Org Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-broffice.org-respin.conf
iso_basename = Fedora-Unity-BrOffice.Org-$datestamp
iso_label = FU Live $datestamp
@@ -527,7 +527,7 @@ architecture = ppc
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-broffice.org.ks
[f10-ppc-live-desktop-default-respin]
-description = Fedora Unity Live Desktop Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Desktop Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-desktop-respin.conf
iso_basename = Fedora-Unity-Desktop-$datestamp
iso_label = FU Live $datestamp
@@ -535,7 +535,7 @@ architecture = ppc
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-desktop-default.ks
[f10-ppc-live-desktop-de_CH-respin]
-description = Fedora Unity Live Desktop de_CH Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Desktop de_CH Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-desktop-respin.conf
iso_basename = Fedora-Unity-Desktop-de_CH-$datestamp
iso_label = FU Live $datestamp
@@ -543,7 +543,7 @@ architecture = ppc
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-desktop-de_CH.ks
[f10-ppc-live-desktop-de_DE-respin]
-description = Fedora Unity Live Desktop de_DE Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Desktop de_DE Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-desktop-respin.conf
iso_basename = Fedora-Unity-Desktop-de_DE-$datestamp
iso_label = FU Live $datestamp
@@ -551,7 +551,7 @@ architecture = ppc
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-desktop-de_DE.ks
[f10-ppc-live-desktop-nl_NL-respin]
-description = Fedora Unity Live Desktop nl_NL Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Desktop nl_NL Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-desktop-respin.conf
iso_basename = Fedora-Unity-Desktop-nl_NL-$datestamp
iso_label = FU Live $datestamp
@@ -559,7 +559,7 @@ architecture = ppc
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-desktop-nl_NL.ks
[f10-ppc-live-desktop-pt_BR-respin]
-description = Fedora Unity Live Desktop pt_BR Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Desktop pt_BR Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-desktop-respin.conf
iso_basename = Fedora-Unity-Desktop-pt_BR-$datestamp
iso_label = FU Live $datestamp
@@ -567,7 +567,7 @@ architecture = ppc
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-desktop-pt_BR.ks
[f10-ppc-live-desktop-pt_PT-respin]
-description = Fedora Unity Live Desktop pt_PT Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Desktop pt_PT Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-desktop-respin.conf
iso_basename = Fedora-Unity-Desktop-pt_PT-$datestamp
iso_label = FU Live $datestamp
@@ -575,7 +575,7 @@ architecture = ppc
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-desktop-pt_PT.ks
[f10-ppc-live-developer-respin]
-description = Fedora Unity Live Developer Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Developer Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-developer-respin.conf
iso_basename = Fedora-Unity-Developer-$datestamp
iso_label = FU Live Developer $datestamp
@@ -583,7 +583,7 @@ architecture = ppc
kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-developer.ks
[f10-ppc-live-developer-de_CH-respin]
-description = Fedora Unity Live Developer de_CH Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Developer de_CH Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-developer-respin.conf
iso_basename = Fedora-Unity-Developer-de_CH-$datestamp
iso_label = FU Live Developer $datestamp
@@ -591,7 +591,7 @@ architecture = ppc
kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-developer-de_CH.ks
[f10-ppc-live-developer-nl_NL-respin]
-description = Fedora Unity Live Developer nl_NL Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Developer nl_NL Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-developer-respin.conf
iso_basename = Fedora-Unity-Developer-nl_NL-$datestamp
iso_label = FU Live Developer $datestamp
@@ -599,7 +599,7 @@ architecture = ppc
kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-developer-nl_NL.ks
[f10-ppc-live-developer-pt_PT-respin]
-description = Fedora Unity Live Developer pt_PT Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Developer pt_PT Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-developer-respin.conf
iso_basename = Fedora-Unity-Developer-pt_PT-$datestamp
iso_label = FU Live Developer $datestamp
@@ -607,7 +607,7 @@ architecture = ppc
kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-developer-pt_PT.ks
[f10-ppc-live-education-math-respin]
-description = Fedora Unity Live Education Math Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Education Math Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-education-math-respin.conf
iso_basename = Fedora-Unity-Education-Math-$datestamp
iso_label = FU Live E-Math $datestamp
@@ -615,7 +615,7 @@ architecture = ppc
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-education-math.ks
[f10-ppc-live-electronic-lab-respin]
-description = Fedora Unity Live Electronic Lab DVD Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Electronic Lab DVD Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-electronic-lab-respin.conf
iso_basename = Fedora-Unity-EL-$datestamp
iso_label = FU Live EL $datestamp
@@ -623,7 +623,7 @@ architecture = ppc
kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-electronic-lab.ks
[f10-ppc-live-electronic-de_CH-lab-respin]
-description = Fedora Unity Live Electronic Lab de_CH DVD Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Electronic Lab de_CH DVD Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-electronic-lab-respin.conf
iso_basename = Fedora-Unity-EL-de_CH-$datestamp
iso_label = FU Live EL $datestamp
@@ -631,7 +631,7 @@ architecture = ppc
kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-electronic-lab-de_CH.ks
[f10-ppc-live-electronic-nl_NL-lab-respin]
-description = Fedora Unity Live Electronic Lab nl_NL DVD Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Electronic Lab nl_NL DVD Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-electronic-lab-respin.conf
iso_basename = Fedora-Unity-EL-nl_NL-$datestamp
iso_label = FU Live EL $datestamp
@@ -639,7 +639,7 @@ architecture = ppc
kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-electronic-lab-nl_NL.ks
[f10-ppc-live-electronic-pt_PT-lab-respin]
-description = Fedora Unity Live Electronic Lab pt_PT DVD Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Electronic Lab pt_PT DVD Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-electronic-lab-respin.conf
iso_basename = Fedora-Unity-EL-pt_PT-$datestamp
iso_label = FU Live EL $datestamp
@@ -647,7 +647,7 @@ architecture = ppc
kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-electronic-lab-pt_PT.ks
[f10-ppc-live-games-respin]
-description = Fedora Unity Live Games Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Games Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-games-respin.conf
iso_basename = Fedora-Unity-Games-$datestamp
iso_label = FU Live Games $datestamp
@@ -655,7 +655,7 @@ architecture = ppc
kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-games.ks
[f10-ppc-live-games-de_CH-respin]
-description = Fedora Unity Live Games de_CH Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Games de_CH Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-games-respin.conf
iso_basename = Fedora-Unity-Games-de_CH-$datestamp
iso_label = FU Live Games $datestamp
@@ -663,7 +663,7 @@ architecture = ppc
kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-games-de_CH.ks
[f10-ppc-live-games-nl_NL-respin]
-description = Fedora Unity Live Games nl_NL Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Games nl_NL Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-games-respin.conf
iso_basename = Fedora-Unity-Games-nl_NL-$datestamp
iso_label = FU Live Games $datestamp
@@ -671,7 +671,7 @@ architecture = ppc
kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-games-nl_NL.ks
[f10-ppc-live-games-pt_PT-respin]
-description = Fedora Unity Live Games pt_PT Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Games pt_PT Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-games-respin.conf
iso_basename = Fedora-Unity-Games-pt_PT-$datestamp
iso_label = FU Live Games $datestamp
@@ -679,7 +679,7 @@ architecture = ppc
kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-games-pt_PT.ks
[f10-ppc-live-kde-respin]
-description = Fedora Unity Live KDE Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live KDE Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-kde-respin.conf
iso_basename = Fedora-Unity-KDE-$datestamp
iso_label = FU Live KDE $datestamp
@@ -687,7 +687,7 @@ architecture = ppc
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-kde.ks
[f10-ppc-live-kde-de_CH-respin]
-description = Fedora Unity Live KDE de_CH Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live KDE de_CH Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-kde-respin.conf
iso_basename = Fedora-Unity-KDE-de_CH-$datestamp
iso_label = FU Live KDE $datestamp
@@ -695,7 +695,7 @@ architecture = ppc
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-kde-de_CH.ks
[f10-ppc-live-kde-de_DE-respin]
-description = Fedora Unity Live KDE de_DE Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live KDE de_DE Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-kde-respin.conf
iso_basename = Fedora-Unity-KDE-de_DE-$datestamp
iso_label = FU Live KDE $datestamp
@@ -703,7 +703,7 @@ architecture = ppc
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-kde-de_DE.ks
[f10-ppc-live-kde-nl_NL-respin]
-description = Fedora Unity Live KDE nl_NL Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live KDE nl_NL Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-kde-respin.conf
iso_basename = Fedora-Unity-KDE-nl_NL-$datestamp
iso_label = FU Live KDE $datestamp
@@ -711,7 +711,7 @@ architecture = ppc
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-kde-nl_NL.ks
[f10-ppc-live-kde-pt_PT-respin]
-description = Fedora Unity Live KDE pt_PT Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live KDE pt_PT Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-kde-respin.conf
iso_basename = Fedora-Unity-KDE-pt_PT-$datestamp
iso_label = FU Live KDE $datestamp
@@ -719,7 +719,7 @@ architecture = ppc
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-kde-pt_PT.ks
[f10-ppc-live-xfce-respin]
-description = Fedora Unity Live XFCE Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live XFCE Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-xfce-respin.conf
iso_basename = Fedora-Unity-XFCE-$datestamp
iso_label = FU Live XFCE $datestamp
@@ -727,7 +727,7 @@ architecture = ppc
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-xfce.ks
[f10-ppc-live-xfce-de_CH-respin]
-description = Fedora Unity Live XFCE de_CH Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live XFCE de_CH Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-xfce-respin.conf
iso_basename = Fedora-Unity-XFCE-de_CH-$datestamp
iso_label = FU Live XFCE $datestamp
@@ -735,7 +735,7 @@ architecture = ppc
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-xfce-de_CH.ks
[f10-ppc-live-xfce-nl_NL-respin]
-description = Fedora Unity Live XFCE nl_NL Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live XFCE nl_NL Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-xfce-respin.conf
iso_basename = Fedora-Unity-XFCE-nl_NL-$datestamp
iso_label = FU Live XFCE $datestamp
@@ -743,7 +743,7 @@ architecture = ppc
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-xfce-nl_NL.ks
[f10-ppc-live-xfce-pt_PT-respin]
-description = Fedora Unity Live XFCE pt_PT Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live XFCE pt_PT Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-xfce-respin.conf
iso_basename = Fedora-Unity-XFCE-pt_PT-$datestamp
iso_label = FU Live XFCE $datestamp
@@ -751,7 +751,7 @@ architecture = ppc
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-xfce-pt_PT.ks
[f10-ppc64-live-aos-respin]
-description = Fedora Unity Live AOS Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live AOS Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-aos-respin.conf
iso_basename = Fedora-Unity-AOS-$datestamp
iso_label = FU Live $datestamp
@@ -759,7 +759,7 @@ architecture = ppc64
kickstart_file = /usr/share/spin-kickstarts/fedora-aos.ks
[f10-ppc64-live-broffice.org-respin]
-description = Fedora Unity Live BrOffice.Org Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live BrOffice.Org Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-broffice.org-respin.conf
iso_basename = Fedora-Unity-BrOffice.Org-$datestamp
iso_label = FU Live $datestamp
@@ -767,7 +767,7 @@ architecture = ppc64
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-broffice.org.ks
[f10-ppc64-live-desktop-default-respin]
-description = Fedora Unity Live Desktop Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Desktop Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-desktop-respin.conf
iso_basename = Fedora-Unity-Desktop-$datestamp
iso_label = FU Live $datestamp
@@ -775,7 +775,7 @@ architecture = ppc64
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-desktop-default.ks
[f10-ppc64-live-desktop-de_CH-respin]
-description = Fedora Unity Live Desktop de_CH Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Desktop de_CH Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-desktop-respin.conf
iso_basename = Fedora-Unity-Desktop-de_CH-$datestamp
iso_label = FU Live $datestamp
@@ -783,7 +783,7 @@ architecture = ppc64
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-desktop-de_CH.ks
[f10-ppc64-live-desktop-de_DE-respin]
-description = Fedora Unity Live Desktop de_DE Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Desktop de_DE Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-desktop-respin.conf
iso_basename = Fedora-Unity-Desktop-de_DE-$datestamp
iso_label = FU Live $datestamp
@@ -791,7 +791,7 @@ architecture = ppc64
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-desktop-de_DE.ks
[f10-ppc64-live-desktop-nl_NL-respin]
-description = Fedora Unity Live Desktop nl_NL Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Desktop nl_NL Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-desktop-respin.conf
iso_basename = Fedora-Unity-Desktop-nl_NL-$datestamp
iso_label = FU Live $datestamp
@@ -799,7 +799,7 @@ architecture = ppc64
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-desktop-nl_NL.ks
[f10-ppc64-live-desktop-pt_BR-respin]
-description = Fedora Unity Live Desktop pt_BR Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Desktop pt_BR Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-desktop-respin.conf
iso_basename = Fedora-Unity-Desktop-pt_BR-$datestamp
iso_label = FU Live $datestamp
@@ -807,7 +807,7 @@ architecture = ppc64
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-desktop-pt_BR.ks
[f10-ppc64-live-desktop-pt_PT-respin]
-description = Fedora Unity Live Desktop pt_PT Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Desktop pt_PT Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-desktop-respin.conf
iso_basename = Fedora-Unity-Desktop-pt_PT-$datestamp
iso_label = FU Live $datestamp
@@ -815,7 +815,7 @@ architecture = ppc64
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-desktop-pt_PT.ks
[f10-ppc64-live-developer-respin]
-description = Fedora Unity Live Developer Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Developer Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-developer-respin.conf
iso_basename = Fedora-Unity-Developer-$datestamp
iso_label = FU Live Developer $datestamp
@@ -823,7 +823,7 @@ architecture = ppc64
kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-developer.ks
[f10-ppc64-live-developer-de_CH-respin]
-description = Fedora Unity Live Developer de_CH Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Developer de_CH Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-developer-respin.conf
iso_basename = Fedora-Unity-Developer-de_CH-$datestamp
iso_label = FU Live Developer $datestamp
@@ -831,7 +831,7 @@ architecture = ppc64
kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-developer-de_CH.ks
[f10-ppc64-live-developer-nl_NL-respin]
-description = Fedora Unity Live Developer nl_NL Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Developer nl_NL Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-developer-respin.conf
iso_basename = Fedora-Unity-Developer-nl_NL-$datestamp
iso_label = FU Live Developer $datestamp
@@ -839,7 +839,7 @@ architecture = ppc64
kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-developer-nl_NL.ks
[f10-ppc64-live-developer-pt_PT-respin]
-description = Fedora Unity Live Developer pt_PT Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Developer pt_PT Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-developer-respin.conf
iso_basename = Fedora-Unity-Developer-pt_PT-$datestamp
iso_label = FU Live Developer $datestamp
@@ -847,7 +847,7 @@ architecture = ppc64
kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-developer-pt_PT.ks
[f10-ppc64-live-education-math-respin]
-description = Fedora Unity Live Education Math Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Education Math Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-education-math-respin.conf
iso_basename = Fedora-Unity-Education-Math-$datestamp
iso_label = FU Live E-Math $datestamp
@@ -855,7 +855,7 @@ architecture = ppc64
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-education-math.ks
[f10-ppc64-live-electronic-lab-respin]
-description = Fedora Unity Live Electronic Lab DVD Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Electronic Lab DVD Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-electronic-lab-respin.conf
iso_basename = Fedora-Unity-EL-$datestamp
iso_label = FU Live EL $datestamp
@@ -863,7 +863,7 @@ architecture = ppc64
kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-electronic-lab.ks
[f10-ppc64-live-electronic-de_CH-lab-respin]
-description = Fedora Unity Live Electronic Lab de_CH DVD Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Electronic Lab de_CH DVD Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-electronic-lab-respin.conf
iso_basename = Fedora-Unity-EL-de_CH-$datestamp
iso_label = FU Live EL $datestamp
@@ -871,7 +871,7 @@ architecture = ppc64
kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-electronic-lab-de_CH.ks
[f10-ppc64-live-electronic-nl_NL-lab-respin]
-description = Fedora Unity Live Electronic Lab nl_NL DVD Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Electronic Lab nl_NL DVD Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-electronic-lab-respin.conf
iso_basename = Fedora-Unity-EL-nl_NL-$datestamp
iso_label = FU Live EL $datestamp
@@ -879,7 +879,7 @@ architecture = ppc64
kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-electronic-lab-nl_NL.ks
[f10-ppc64-live-electronic-pt_PT-lab-respin]
-description = Fedora Unity Live Electronic Lab pt_PT DVD Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Electronic Lab pt_PT DVD Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-electronic-lab-respin.conf
iso_basename = Fedora-Unity-EL-pt_PT-$datestamp
iso_label = FU Live EL $datestamp
@@ -887,7 +887,7 @@ architecture = ppc64
kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-electronic-lab-pt_PT.ks
[f10-ppc64-live-games-respin]
-description = Fedora Unity Live Games Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Games Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-games-respin.conf
iso_basename = Fedora-Unity-Games-$datestamp
iso_label = FU Live Games $datestamp
@@ -895,7 +895,7 @@ architecture = ppc64
kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-games.ks
[f10-ppc64-live-games-de_CH-respin]
-description = Fedora Unity Live Games de_CH Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Games de_CH Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-games-respin.conf
iso_basename = Fedora-Unity-Games-de_CH-$datestamp
iso_label = FU Live Games $datestamp
@@ -903,7 +903,7 @@ architecture = ppc64
kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-games-de_CH.ks
[f10-ppc64-live-games-nl_NL-respin]
-description = Fedora Unity Live Games nl_NL Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Games nl_NL Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-games-respin.conf
iso_basename = Fedora-Unity-Games-nl_NL-$datestamp
iso_label = FU Live Games $datestamp
@@ -911,7 +911,7 @@ architecture = ppc64
kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-games-nl_NL.ks
[f10-ppc64-live-games-pt_PT-respin]
-description = Fedora Unity Live Games pt_PT Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live Games pt_PT Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-games-respin.conf
iso_basename = Fedora-Unity-Games-pt_PT-$datestamp
iso_label = FU Live Games $datestamp
@@ -919,7 +919,7 @@ architecture = ppc64
kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-games-pt_PT.ks
[f10-ppc64-live-kde-respin]
-description = Fedora Unity Live KDE Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live KDE Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-kde-respin.conf
iso_basename = Fedora-Unity-KDE-$datestamp
iso_label = FU Live KDE $datestamp
@@ -927,7 +927,7 @@ architecture = ppc64
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-kde.ks
[f10-ppc64-live-kde-de_CH-respin]
-description = Fedora Unity Live KDE de_CH Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live KDE de_CH Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-kde-respin.conf
iso_basename = Fedora-Unity-KDE-de_CH-$datestamp
iso_label = FU Live KDE $datestamp
@@ -935,7 +935,7 @@ architecture = ppc64
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-kde-de_CH.ks
[f10-ppc64-live-kde-de_DE-respin]
-description = Fedora Unity Live KDE de_DE Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live KDE de_DE Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-kde-respin.conf
iso_basename = Fedora-Unity-KDE-de_DE-$datestamp
iso_label = FU Live KDE $datestamp
@@ -943,7 +943,7 @@ architecture = ppc64
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-kde-de_DE.ks
[f10-ppc64-live-kde-nl_NL-respin]
-description = Fedora Unity Live KDE nl_NL Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live KDE nl_NL Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-kde-respin.conf
iso_basename = Fedora-Unity-KDE-nl_NL-$datestamp
iso_label = FU Live KDE $datestamp
@@ -951,7 +951,7 @@ architecture = ppc64
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-kde-nl_NL.ks
[f10-ppc64-live-kde-pt_PT-respin]
-description = Fedora Unity Live KDE pt_PT Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live KDE pt_PT Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-kde-respin.conf
iso_basename = Fedora-Unity-KDE-pt_PT-$datestamp
iso_label = FU Live KDE $datestamp
@@ -959,7 +959,7 @@ architecture = ppc64
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-kde-pt_PT.ks
[f10-ppc64-live-xfce-respin]
-description = Fedora Unity Live XFCE Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live XFCE Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-xfce-respin.conf
iso_basename = Fedora-Unity-XFCE-$datestamp
iso_label = FU Live XFCE $datestamp
@@ -967,7 +967,7 @@ architecture = ppc64
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-xfce.ks
[f10-ppc64-live-xfce-de_CH-respin]
-description = Fedora Unity Live XFCE de_CH Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live XFCE de_CH Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-xfce-respin.conf
iso_basename = Fedora-Unity-XFCE-de_CH-$datestamp
iso_label = FU Live XFCE $datestamp
@@ -975,7 +975,7 @@ architecture = ppc64
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-xfce-de_CH.ks
[f10-ppc64-live-xfce-nl_NL-respin]
-description = Fedora Unity Live XFCE nl_NL Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live XFCE nl_NL Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-xfce-respin.conf
iso_basename = Fedora-Unity-XFCE-nl_NL-$datestamp
iso_label = FU Live XFCE $datestamp
@@ -983,7 +983,7 @@ architecture = ppc64
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-xfce-nl_NL.ks
[f10-ppc64-live-xfce-pt_PT-respin]
-description = Fedora Unity Live XFCE pt_PT Re-Spin Model for Fedora (Rawhide)
+description = Fedora Unity Live XFCE pt_PT Re-Spin Model for Fedora 10
main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-xfce-respin.conf
iso_basename = Fedora-Unity-XFCE-pt_PT-$datestamp
iso_label = FU Live XFCE $datestamp
commit 909818007b30b7287c510e7c75169abbddb31e6d
Merge: ec8d392... 75e5210...
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Wed Feb 25 16:26:19 2009 +0100
Merge branch 'master' of ssh://git.fedorahosted.org/git/revisor
Conflicts:
unity/scripts/respin.sh
diff --cc unity/scripts/respin.sh
index 1ed5bbc,79208bc..03ddfb7
--- a/unity/scripts/respin.sh
+++ b/unity/scripts/respin.sh
@@@ -159,10 -169,10 +169,12 @@@ for version in $VERSIONS; d
for arch in $ARCHES; do
if [ $LIVE -eq 1 ]; then
+ cd ${revisor_cwd}
+
for spin in `${revisor_cmd} --config /etc/revisor-unity/f$version-live-respin.conf --list-models | grep "^ f$version-$arch-" | awk '{print $1}'`; do
+ echo "Creating $spin"
+
datestamp=`date +'%Y%m%d'`
[ $JUST_LIST -eq 1 ] && echo $spin && continue
commit 75e5210a5a5661199c9f655130ef8a6bb83373b7
Merge: b93198c... 3f39a07...
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Wed Feb 25 03:54:05 2009 +0100
Merge branch 'master' of ssh://git.fedorahosted.org/git/revisor
commit b93198cd1c3c3c21fce6d8a422e06430d06b077c
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Wed Feb 25 03:53:38 2009 +0100
Update respin.sh (again)
diff --git a/unity/scripts/respin.sh b/unity/scripts/respin.sh
index 55ede26..79208bc 100755
--- a/unity/scripts/respin.sh
+++ b/unity/scripts/respin.sh
@@ -120,45 +120,57 @@ done
## If that fails, we'll look for an installed RPM,
## Last but not least, we'll clone stuff ourselves and go at it
##
-if [ -d ~/devel/revisor/master ]; then
- cd ~/devel/revisor/master
- git pull git://git.fedorahosted.org/revisor master
- autoreconf -v && ./configure
- ./switchhere --yes
- revisor_cmd="sudo ./revisor.py --cli"
-elif [ ! -z "`rpm -qv revisor | grep -v 'not installed'`" ]; then
- revisor_cmd="sudo revisor --cli"
+if [ -z "`rpm -qv revisor-cli | grep -v 'not installed'`" ]; then
+ if [ -d /tmp/revisor ]; then
+ cd /tmp/revisor
+ git checkout master
+ git pull git://git.fedorahosted.org/revisor master
+ else
+ git clone git://git.fedorahosted.org/revisor /tmp/revisor
+ cd /tmp/revisor
+ fi
-else
- git clone git://git.fedorahosted.org/revisor /tmp/revisor
- cd /tmp/revisor
autoreconf -v && ./configure
./switchhere --yes
revisor_cmd="sudo ./revisor.py --cli"
+ revisor_cwd="/tmp/revisor/"
+
+else
+ revisor_cmd="sudo revisor"
+ revisor_cwd="/tmp/"
fi
-MESSAGE_END="\\n\\nGo to http://$HOSTNAME/revisor/%b/%b/ for more details.\\n\\nKind regards,\\n\\nJeroen van Meeuwen\n-kanarip"
+# If we're in the *.kanarip.com network, our webserver is called www.kanarip.com
+[ -z "`hostname | grep kanarip.com`" ] && WEB_HOSTNAME=$HOSTNAME || WEB_HOSTNAME="www.kanarip.com"
+
+MESSAGE_END="\\n\\nGo to http://$WEB_HOSTNAME/revisor/%b/%b/ for more details.\\n\\nKind regards,\\n\\nJeroen van Meeuwen\n-kanarip"
NOTIFICATION_FAILURE="kanarip(a)kanarip.com"
NOTIFICATION_SUCCESS="kanarip(a)kanarip.com"
NOTIFICATION_FROMADD="kanarip(a)kanarip.com"
# Cheat our way through spin-kickstarts
-[ -d /tmp/spin-kickstarts ] && sudo rm -rf /tmp/spin-kickstarts
-git clone git://git.fedorahosted.org/spin-kickstarts.git /tmp/spin-kickstarts
+if [ -d /tmp/spin-kickstarts ]; then
+ cd /tmp/spin-kickstarts
+ git checkout master
+ git pull git://git.fedorahosted.org/spin-kickstarts.git master
+else
+ git clone git://git.fedorahosted.org/spin-kickstarts.git /tmp/spin-kickstarts
+fi
for version in $VERSIONS; do
# Build the spin-kickstarts package for this version
ourwd=`pwd`
cd /tmp/spin-kickstarts
- [ ! -z "`git branch -la | grep '^ F-$version'`" ] && git checkout F-$version || git checkout --track -b F-$version origin/F-$version
+ [ ! -z "`git branch -la | grep \"^ F-$version\"`" ] && git checkout F-$version || git checkout --track -b F-$version origin/F-$version
autoreconf -v && ./configure --prefix=/usr && sudo make install
- cd $ourwd
for arch in $ARCHES; do
if [ $LIVE -eq 1 ]; then
+ cd ${revisor_cwd}
+
for spin in `${revisor_cmd} --config /etc/revisor-unity/f$version-live-respin.conf --list-models | grep "^ f$version-$arch-" | awk '{print $1}'`; do
datestamp=`date +'%Y%m%d'`
@@ -198,14 +210,6 @@ for version in $VERSIONS; do
spin_name="f$version-$arch-respin"
- mock -r fedora-$version-$arch clean | tee revisor-f$version-$arch-respin.log && \
- mock -r fedora-$version-$arch init | tee -a revisor-f$version-$arch-respin.log && \
- mock -r fedora-$version-$arch install $revisor_deps | tee -a revisor-f$version-$arch-respin.log && \
- echo -en "git clone git://git.fedorahosted.org/revisor\n" | mock -r fedora-$version-$arch shell | tee -a revisor-f$version-$arch-respin.log && \
- echo -en "cd /revisor; ./switchhere --yes\n" | mock -r fedora-$version-$arch shell | tee -a revisor-f$version-$arch-respin.log && \
- echo -en "cd /revisor; autoreconf && ./configure\n" | mock -r fedora-$version-$arch shell | tee -a revisor-f$version-$arch-respin.log && \
- echo -en "find /var/lib/rpm/ -name '__db.*' -delete\n" | mock -r fedora-$version-$arch shell | tee -a revisor-f$version-$arch-respin.log && \
-
datestamp=`date +'%Y%m%d'`
# Let's make sure we remove the entire directory before we attempt a respin.
@@ -213,7 +217,17 @@ for version in $VERSIONS; do
#
sudo rm -rf /srv/revisor/$datestamp/f$version-$arch-respin/log/
- echo -en "cd /revisor; ./revisor.py --cli --config /etc/revisor-unity/f$version-install-respin.conf --destination-directory /srv/revisor/$datestamp/ --model f$version-$arch-respin --debug 9 --clean-up $cleanup\n" | mock -r fedora-$version-$arch shell >> revisor-f$version-$arch-respin.log 2>&1
+ mock -v -r fedora-$version-$arch clean | tee revisor-f$version-$arch-respin.log && \
+ mock -v -r fedora-$version-$arch init | tee -a revisor-f$version-$arch-respin.log && \
+ mock -v -r fedora-$version-$arch install $revisor_deps | tee -a revisor-f$version-$arch-respin.log && \
+ echo -en "git clone git://git.fedorahosted.org/revisor; \\
+ cd /revisor; autoreconf && ./configure; \\
+ ./switchhere --yes; \\
+ find /var/lib/rpm/ -name '__db.*' -delete; \\
+ ./revisor.py --cli --config unity/conf/f$version-install-respin.conf \\
+ --destination-directory /srv/revisor/$datestamp/ \\
+ --model f$version-$arch-respin --debug 9 \\
+ --clean-up $cleanup\n" | mock -v -r fedora-$version-$arch shell | tee -a revisor-f$version-$arch-respin.log
[ $? -gt 0 ] && \
printf "Spin f$version-$arch-respin failed, log file attached.$MESSAGE_END" "$datestamp" "f$version-$arch-respin" \
commit ec8d3926f094564997c5a2f68df415b994c984ee
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Wed Feb 25 01:17:27 2009 +0100
Update respin.sh
* Sleep for a little while in between spins (10 seconds)
* Let stdout now which spin we're creating
diff --git a/unity/scripts/respin.sh b/unity/scripts/respin.sh
index abfb7de..1ed5bbc 100755
--- a/unity/scripts/respin.sh
+++ b/unity/scripts/respin.sh
@@ -161,6 +161,8 @@ for version in $VERSIONS; do
if [ $LIVE -eq 1 ]; then
for spin in `${revisor_cmd} --config /etc/revisor-unity/f$version-live-respin.conf --list-models | grep "^ f$version-$arch-" | awk '{print $1}'`; do
+ echo "Creating $spin"
+
datestamp=`date +'%Y%m%d'`
[ $JUST_LIST -eq 1 ] && echo $spin && continue
@@ -189,6 +191,8 @@ for version in $VERSIONS; do
sudo mkdir -p /srv/revisor/$datestamp/$spin/log/
sudo mv revisor-$spin.log /srv/revisor/$datestamp/$spin/log/
+
+ sleep 10
done
fi
@@ -198,6 +202,8 @@ for version in $VERSIONS; do
spin_name="f$version-$arch-respin"
+ echo "Creating $spin"
+
mock -r fedora-$version-$arch clean | tee revisor-f$version-$arch-respin.log && \
mock -r fedora-$version-$arch init | tee -a revisor-f$version-$arch-respin.log && \
mock -r fedora-$version-$arch install $revisor_deps | tee -a revisor-f$version-$arch-respin.log && \
@@ -206,6 +212,8 @@ for version in $VERSIONS; do
echo -en "cd /revisor; autoreconf && ./configure\n" | mock -r fedora-$version-$arch shell | tee -a revisor-f$version-$arch-respin.log && \
echo -en "find /var/lib/rpm/ -name '__db.*' -delete\n" | mock -r fedora-$version-$arch shell | tee -a revisor-f$version-$arch-respin.log && \
+ sleep 10
+
datestamp=`date +'%Y%m%d'`
# Let's make sure we remove the entire directory before we attempt a respin.
commit 5cbf5b19814a0a4cae55f63ead6f24832fba5b71
Merge: 392165c... 3f39a07...
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Wed Feb 25 01:00:13 2009 +0100
Merge branch 'master' of git://git.fedorahosted.org/revisor
commit 3f39a070645f8253c4fb7844d0d64b182618362d
Author: Izaac Zavaleta <jorge.izaac(a)gmail.com>
Date: Tue Feb 24 20:14:59 2009 +0000
Updated Spanish translation
Transmitted-via: Transifex (translate.fedoraproject.org)
diff --git a/po/Changelog b/po/Changelog
index ae88fe2..6c38715 100644
--- a/po/Changelog
+++ b/po/Changelog
@@ -1,4 +1,6 @@
-Updated Polish translation
+Updated Spanish translation
+
+Transmitted-via: Transifex (translate.fedoraproject.org)Updated Polish translation
Transmitted-via: Transifex (translate.fedoraproject.org)Updated Polish translation
diff --git a/po/es.po b/po/es.po
index a865072..a025b0d 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,11 +1,14 @@
+#: ../revisor/modgui/glade/lm_bootloader.glade.h:4
+#: ../revisor/modgui/glade/lm_bootloader.glade.h:10
#: ../revisor/modgui/glade/lm_usercustomize.glade.h:1
+#: ../revisor/modgui/glade/lm_usercustomize.glade.h:4
msgid ""
msgstr ""
"Project-Id-Version: revisor\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-04 18:11+0200\n"
-"PO-Revision-Date: 2007-10-29 10:33-0300\n"
-"Last-Translator: Domingo Becker <domingobecker(a)gmail.com>\n"
+"POT-Creation-Date: 2009-02-18 01:36+0000\n"
+"PO-Revision-Date: 2009-02-24 13:30-0700\n"
+"Last-Translator: Izaac Zavaleta <izaac(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"
@@ -52,15 +55,15 @@ msgstr ""
#: ../revisor/modgui/glade/base_screen.glade.in.h:32
msgid "<b>More information about:</b>"
-msgstr ""
+msgstr "<b>Más información sobre:</b>"
#: ../revisor/modgui/glade/base_screen.glade.in.h:33
msgid "<b>Version:</b> @VERSION@-@RELEASE@"
-msgstr ""
+msgstr "<b>Version:</b> @VERSION@-@RELEASE@"
#: ../revisor/modgui/glade/base_screen.glade.in.h:34
msgid "<span weight=\"bold\">Revisor</span> is a product of Fedora Unity."
-msgstr ""
+msgstr "<span weight=\"bold\">Revisor</span> es un producto de Fedora Unity."
#: ../revisor/modgui/glade/base_screen.glade.in.h:35
msgid "<u><span color=\"blue\">http://revisor.fedoraunity.org</span></u>"
@@ -69,12 +72,12 @@ msgstr ""
#: ../revisor/modgui/glade/base_screen.glade.in.h:36
#: ../revisor/modgui/glade/revisor.glade.h:38
msgid "About Revisor"
-msgstr "Acerca del Revisor"
+msgstr "Acerca de Revisor"
#: ../revisor/modgui/glade/base_screen.glade.in.h:37
#: ../revisor/modgui/glade/revisor.glade.h:39
msgid "Authors"
-msgstr ""
+msgstr "Autores"
#: ../revisor/modgui/glade/base_screen.glade.in.h:38
msgid "Fedora Unity:"
@@ -88,7 +91,7 @@ msgstr "_Archivo"
#: ../revisor/modgui/glade/base_screen.glade.in.h:40
#: ../revisor/modgui/glade/revisor.glade.h:43
msgid "License"
-msgstr ""
+msgstr "Licencia"
#: ../revisor/modgui/glade/base_screen.glade.in.h:41
#: ../revisor/modgui/glade/revisor.glade.h:47 ../conf/revisor.desktop.in.h:1
@@ -102,7 +105,7 @@ msgstr "Página de Inicio del Revisor"
#: ../revisor/modgui/glade/base_screen.glade.in.h:43
#, fuzzy
msgid "Revisor:"
-msgstr "Revisor"
+msgstr "Revisor:"
#: ../revisor/modgui/glade/base_screen.glade.in.h:44
msgid "_Details"
@@ -160,12 +163,12 @@ msgstr "Construcción Virtualizado"
#: ../revisor/modgui/glade/dialog_filechooser.glade.h:1
msgid "Choose a file or folder"
-msgstr ""
+msgstr "Elige un archivo o folder"
#: ../revisor/modgui/glade/finished_screen.glade.h:1
#, fuzzy
msgid "<b>Compose Results Location:</b>"
-msgstr "Ubicación de los Resultados de Componer:"
+msgstr "<b>Ubicación de los Resultados de Componer:</b>"
#: ../revisor/modgui/glade/finished_screen.glade.h:2
#: ../revisor/modgui/glade/load_kickstart.glade.h:1
@@ -411,6 +414,20 @@ msgstr "Parámetros de kernel personalizado:"
msgid "Provide optional kernel parameters."
msgstr "Provea los parámetros opcionales del kernel."
+#: ../revisor/modgui/glade/lm_bootloader.glade.h:6
+msgid "These could be as simple as 'noacpi' to disable advanced power control,"
+msgstr ""
+"Estos pueden ser tan simples como 'noacpi' para deshabilitar el control "
+"avanzado de energía,"
+
+#: ../revisor/modgui/glade/lm_bootloader.glade.h:8
+msgid "or any other relevant kernel parameters."
+msgstr "o cualquier otro parámetro de kernel relevante."
+
+#: ../revisor/modgui/glade/lm_bootloader.glade.h:12
+msgid "In most situations, the default should suffice."
+msgstr "En la mayoría de las situaciones, el predeterminado debe alcanzar."
+
#: ../revisor/modgui/glade/lm_display.glade.h:1
msgid "Color Depth"
msgstr "Profundidad del Color"
@@ -585,6 +602,11 @@ msgstr "Nivel de distorsión"
msgid "Warn"
msgstr "Advertir"
+#: ../revisor/modgui/glade/lm_usercustomize.glade.h:2
+#: ../revisor/modgui/glade/lm_usercustomize.glade.h:10
+msgid "Customize your Live Media"
+msgstr "Personalizar su Medio Vivo"
+
#: ../revisor/modgui/glade/lm_usercustomize.glade.h:6
msgid "Add user to the group \"wheel\""
msgstr "Agregar usuario al grupo \"whell\""
@@ -598,10 +620,6 @@ msgstr "Automáticamente ingresar este usuario al Escritorio"
msgid "Create User Account:"
msgstr "Pantalla de Usuario del Sistema"
-#: ../revisor/modgui/glade/lm_usercustomize.glade.h:10
-msgid "Customize your Live Media"
-msgstr "Personalizar su Medio Vivo"
-
#: ../revisor/modgui/glade/lm_usercustomize.glade.h:11
msgid "Dump current user profile (and omit /etc/skel)"
msgstr "Volcar el perfil del usuario actual (y omitir /etc/skel)"
@@ -808,6 +826,15 @@ msgid ""
"\t* Jonathan Steffan (daMaestro) <jon(a)fedoraunity.org>\n"
"\t* Jeroen van Meeuwen (kanarip) <kanarip(a)fedoraunity.org>\n"
msgstr ""
+"\n"
+"Desarrollo del Programa:\n"
+"\t* Jonathan Steffan (daMaestro) <jon(a)fedoraunity.org>\n"
+"\t* Jeroen van Meeuwen (kanarip) <kanarip(a)fedoraunity.org>\n"
+"\n"
+"Diseñadores de Interfaz:\n"
+"\t* Stewart Adam (firewing1) <s.adam(a)diffingo.com>\n"
+"\t* Jonathan Steffan (daMaestro) <jon(a)fedoraunity.org>\n"
+"\t* Jeroen van Meeuwen (kanarip) <kanarip(a)fedoraunity.org>\n"
#: ../revisor/modgui/glade/revisor.glade.h:11
msgid ""
@@ -836,6 +863,9 @@ msgid ""
"Translators:\n"
"\t* First Last (nick) <email(a)domain.com>\n"
msgstr ""
+"\n"
+"Translators:\n"
+"\t* Nombre Apellido (pseudónimo) <email(a)dominio.com>\n"
#: ../revisor/modgui/glade/revisor.glade.h:26
msgid " "
@@ -849,16 +879,16 @@ msgstr ""
#: ../revisor/modgui/glade/revisor.glade.h:29
#, fuzzy
msgid "<b>Installation Media</b>"
-msgstr "Medios CD/DVD"
+msgstr "<b>Medios CD/DVD</b>"
#: ../revisor/modgui/glade/revisor.glade.h:30
#, fuzzy
msgid "<b>Live Media</b>"
-msgstr "Medios CD/DVD"
+msgstr "<b>Medios CD/DVD</b>"
#: ../revisor/modgui/glade/revisor.glade.h:31
msgid "<i>Initializing GUI</i>"
-msgstr ""
+msgstr "<i>Inicializando Interfaz Gráfica</i>"
#: ../revisor/modgui/glade/revisor.glade.h:32
msgid "<span color=\"blue\"><u>http://revisor.fedoraunity.org</u></span>"
@@ -882,19 +912,17 @@ msgstr ""
#: ../revisor/modgui/glade/revisor.glade.h:37
msgid "A Fedora Spin Designer"
-msgstr ""
+msgstr "Diseñador de Fedora Spin"
#: ../revisor/modgui/glade/revisor.glade.h:40
#: ../revisor/modgui/glade/revisor_configuration.glade.h:9
-#, fuzzy
msgid "Configure Revisor"
-msgstr "Configurar impresoras"
+msgstr "Configurar Revisor"
#: ../revisor/modgui/glade/revisor.glade.h:41
#: ../revisor/modgui/glade/revisor_configuration.glade.h:11
-#, fuzzy
msgid "Destination Directory:"
-msgstr "ORGANIZACIÓN DEL DIRECTORIO"
+msgstr "Directorio Destino:"
#: ../revisor/modgui/glade/revisor.glade.h:42
msgid "Dynamically Set Header Label"
@@ -902,7 +930,7 @@ msgstr ""
#: ../revisor/modgui/glade/revisor.glade.h:44
msgid "Message"
-msgstr ""
+msgstr "Mensaje"
#: ../revisor/modgui/glade/revisor.glade.h:45
#: ../revisor/modgui/glade/select_media_advanced.glade.h:5
@@ -941,17 +969,17 @@ msgstr ""
#: ../revisor/modgui/glade/revisor.glade.h:52
msgid "Revisor is initializing."
-msgstr ""
+msgstr "Revisor está inicializando"
#: ../revisor/modgui/glade/revisor.glade.h:53
#, fuzzy
msgid "Select Media Types"
-msgstr "Tamaño y tipo"
+msgstr "Selecciona tipo de Medios"
#: ../revisor/modgui/glade/revisor.glade.h:54
#, fuzzy
msgid "Select Repositories:"
-msgstr "cargando proyecto"
+msgstr "Selecciona Repositorios:"
#: ../revisor/modgui/glade/revisor.glade.h:55
msgid "Spin Target:"
@@ -959,7 +987,7 @@ msgstr ""
#: ../revisor/modgui/glade/revisor.glade.h:56
msgid "Translators"
-msgstr ""
+msgstr "Traductores"
#: ../revisor/modgui/glade/revisor.glade.h:57
msgid "Use _advanced interface"
@@ -1021,7 +1049,7 @@ msgstr "<b>Otras Opciones (Avanzado)</b>"
#: ../revisor/modgui/glade/revisor_configuration.glade.h:6
#, fuzzy
msgid "Add Repository"
-msgstr "Pantalla de Agregar Repositorio"
+msgstr "Agregar Repositorio"
#: ../revisor/modgui/glade/revisor_configuration.glade.h:7
#, fuzzy
@@ -1031,7 +1059,7 @@ msgstr "Bugzilla·URL"
#: ../revisor/modgui/glade/revisor_configuration.glade.h:8
#, fuzzy
msgid "Configuration Section to Use:"
-msgstr "Use el diario para eliminar registros"
+msgstr "Sección de configuración a usar:"
#: ../revisor/modgui/glade/revisor_configuration.glade.h:10
#, fuzzy
@@ -1046,12 +1074,12 @@ msgstr ""
#: ../revisor/modgui/glade/revisor_configuration.glade.h:13
#, fuzzy
msgid "Exclude Packages:"
-msgstr "Instalación de Paquetes"
+msgstr "Paquetes Excluídos:"
#: ../revisor/modgui/glade/revisor_configuration.glade.h:14
#, fuzzy
msgid "GPG Check"
-msgstr "Chequeo de las Notas de la Versión"
+msgstr "Chequeo de firma digital GPG"
#: ../revisor/modgui/glade/revisor_configuration.glade.h:15
#, fuzzy
@@ -1061,12 +1089,12 @@ msgstr "Abra el menú \"Archivo\""
#: ../revisor/modgui/glade/revisor_configuration.glade.h:16
#, fuzzy
msgid "Include Packages:"
-msgstr "Instalación de Paquetes"
+msgstr "Incluye Paquetes:"
#: ../revisor/modgui/glade/revisor_configuration.glade.h:17
#, fuzzy
msgid "Mirror List:"
-msgstr "Lista de Módulos"
+msgstr "Lista de espejos:"
#: ../revisor/modgui/glade/revisor_configuration.glade.h:18
#, fuzzy
@@ -1090,27 +1118,27 @@ msgstr "Guardar en miniTamTam"
#: ../revisor/modgui/glade/select_media_advanced.glade.h:1
#, fuzzy
msgid "<b>Compose Options</b>"
-msgstr "Otras opciones:"
+msgstr "<b>Opciones de composición</b>"
#: ../revisor/modgui/glade/select_media_advanced.glade.h:2
#, fuzzy
msgid "<b>Media Types</b>"
-msgstr "Tipos de Virtualización"
+msgstr "<b>Tipos de medios</b>"
#: ../revisor/modgui/glade/select_media_advanced.glade.h:3
#, fuzzy
msgid "Installation Media Types"
-msgstr "Medios CD/DVD"
+msgstr "Tipos de medios de instalación"
#: ../revisor/modgui/glade/select_media_advanced.glade.h:4
#, fuzzy
msgid "Live Media Types"
-msgstr "Medios CD/DVD"
+msgstr "Tipos de Medios Live"
#: ../revisor/modgui/glade/select_media_advanced.glade.h:6
#, fuzzy
msgid "Rebrand Media"
-msgstr "Preparación de los Medios"
+msgstr "Renombra Medios"
#: ../revisor/modgui/glade/select_media_advanced.glade.h:7
#, fuzzy
@@ -1121,51 +1149,51 @@ msgstr "Medio arrancable mínimo en CD"
#: ../revisor/modgui/glade/select_media.glade.h:7
#, fuzzy
msgid "Select Media Type(s)"
-msgstr "Tamaño y tipo"
+msgstr "Selecciona Tipo(s) de Medio(s)"
#: ../revisor/modgui/glade/select_media_advanced.glade.h:9
#, fuzzy
msgid "Virtualization Media"
-msgstr "Preparación de los Medios"
+msgstr "Medios de Virtualización"
#: ../revisor/modgui/glade/select_media.glade.h:1
#: ../revisor/modgui/glade/select_media_installation.glade.h:1
#, fuzzy
msgid "<b>Installation Media Types</b>"
-msgstr "Medios CD/DVD"
+msgstr "<b>Tipos de Medio de Instalación</b>"
#: ../revisor/modgui/glade/select_media.glade.h:2
#: ../revisor/modgui/glade/select_media_live.glade.h:1
#, fuzzy
msgid "<b>Live Media Types</b>"
-msgstr "Medios CD/DVD"
+msgstr "<b>Tipos de Medios Live</b>"
#: ../revisor/modgui/glade/select_media.glade.h:3
#: ../revisor/modgui/glade/select_media_installation.glade.h:2
#, fuzzy
msgid "CD Set"
-msgstr "fijar escalado"
+msgstr "Conjunto de CD"
#: ../revisor/modgui/glade/select_media.glade.h:4
#: ../revisor/modgui/glade/select_media_installation.glade.h:3
#, fuzzy
msgid "DVD Set"
-msgstr "fijar escalado"
+msgstr "Conjunto de DVD"
#: ../revisor/modgui/glade/select_media.glade.h:5
#, fuzzy
msgid "Optical Live Media"
-msgstr "Medios CD/DVD"
+msgstr "Medios Ópticos Live"
#: ../revisor/modgui/glade/select_media.glade.h:8
#, fuzzy
msgid "USB Live Media"
-msgstr "medio almacenamiento USB"
+msgstr "USB Live"
#: ../revisor/modgui/glade/select_media_installation.glade.h:4
#, fuzzy
msgid "Installation Tree"
-msgstr "Guía de Instalación"
+msgstr "Árbol de Instalación"
#: ../revisor/modgui/glade/select_media_installation.glade.h:5
#, fuzzy
@@ -1175,16 +1203,16 @@ msgstr "Solución a Problemas con PXE"
#: ../revisor/modgui/glade/select_media_installation.glade.h:7
#, fuzzy
msgid "Select Installation Media Type(s)"
-msgstr "discos de instalación CD o DVD"
+msgstr "Selecciona Tipo(s) de Medio(s) de Instalación"
#: ../revisor/modgui/glade/select_media_installation.glade.h:8
#, fuzzy
msgid "Unified ISO Image"
-msgstr "image-file.iso"
+msgstr "Imagen ISO Unificada"
#: ../revisor/modgui/glade/select_media_live.glade.h:2
msgid "Optical"
-msgstr "Optico"
+msgstr "Óptico"
#: ../revisor/modgui/glade/select_media_live.glade.h:4
msgid "Select Live Media Type(s)"
@@ -1193,22 +1221,22 @@ msgstr "Seleccione el/los Tipo(s) de Medio Vivo"
#: ../revisor/modgui/glade/select_media_live.glade.h:5
#, fuzzy
msgid "USB Hard Disk"
-msgstr "Espacio en Disco Rígido"
+msgstr "Disco Duro USB"
#: ../revisor/modgui/glade/select_media_live.glade.h:6
#, fuzzy
msgid "USB Thumb Drive"
-msgstr "medio almacenamiento USB"
+msgstr "Memoria USB"
#: ../revisor/modgui/glade/select_media_utility.glade.h:1
#, fuzzy
msgid "<b>Utility Media Types</b>"
-msgstr "Medios CD/DVD"
+msgstr "<b>Tipos de Medios Utilitarios</b>"
#: ../revisor/modgui/glade/select_media_utility.glade.h:3
#, fuzzy
msgid "Rescue Image"
-msgstr "Fuente de Imágen"
+msgstr "Imagen de Rescate"
#: ../revisor/modgui/glade/select_media_utility.glade.h:4
msgid "Select Utility Media Type(s)"
@@ -1217,12 +1245,12 @@ msgstr "Seleccione el/los Tipo(s) de Utilitario de Medio"
#: ../revisor/modgui/glade/select_media_virtualization.glade.h:1
#, fuzzy
msgid "<b>Virtualization Media Types</b>"
-msgstr "Medios CD/DVD"
+msgstr "<b>Tipos de Medios de Virtualización</b>"
#: ../revisor/modgui/glade/select_media_virtualization.glade.h:2
#, fuzzy
msgid "KVM Guest"
-msgstr "Sistemas Operativos Invitados"
+msgstr "Huésped KVM"
#: ../revisor/modgui/glade/select_media_virtualization.glade.h:4
msgid "Select Virtualization Media Type(s)"
@@ -1230,22 +1258,22 @@ msgstr "Seleccione el/los Tipo(s) de Virtualización de Medio"
#: ../revisor/modgui/glade/select_media_virtualization.glade.h:5
msgid "VMWare Appliance"
-msgstr "Aparato VMWare"
+msgstr "Aplicación VMWare"
#: ../revisor/modgui/glade/select_media_virtualization.glade.h:6
#, fuzzy
msgid "VMWare Guest"
-msgstr "Sistemas Operativos Invitados"
+msgstr "Huésped VMWare"
#: ../revisor/modgui/glade/select_media_virtualization.glade.h:7
#, fuzzy
msgid "Xen Guest"
-msgstr "Sistemas Operativos Invitados"
+msgstr "Huésped Xen"
#: ../revisor/modgui/glade/welcome_buttons.glade.h:1
#, fuzzy
msgid "Get Started"
-msgstr "mosaicos a obtener..."
+msgstr "A iniciar"
#: ../revisor/modgui/glade/welcome_screen.glade.h:1
msgid ""
@@ -1271,56 +1299,66 @@ msgid "Cannot find anaconda-runtime in /usr/lib/anaconda-runtime"
msgstr ""
"No se puede encontrar el ejecutable de anaconda en /usr/lib/anaconda-runtime"
-#: ../revisor/base.py:104
+#: ../revisor/base.py:103
msgid "Running Revisor in CLI mode..."
msgstr "Corriendo Revisor en modo CLI..."
-#: ../revisor/base.py:110
+#: ../revisor/base.py:112
+#, fuzzy
+msgid "Running Revisor in Hub mode..."
+msgstr "Corriendo Revisor en modo CLI..."
+
+#: ../revisor/base.py:117
+#, fuzzy
+msgid "Running Revisor in Composer mode..."
+msgstr "Corriendo Revisor en modo CLI..."
+
+#: ../revisor/base.py:122
#, fuzzy
msgid "Running Revisor in RPC Server mode..."
msgstr "Corriendo Revisor en modo CLI..."
-#: ../revisor/base.py:114 ../revisor/base.py:119
+#: ../revisor/base.py:126 ../revisor/base.py:132
msgid "Running Revisor in GUI mode..."
msgstr "Corriendo Revisor en modo GUI..."
-#: ../revisor/base.py:174
+#: ../revisor/base.py:187
#, python-format
msgid "Opening up /usr/bin/htmlview %s%s"
msgstr "Abriendo /usr/bin/htmlview %s%s"
#. self.mode.base_buttons_xml.get_widget("button_information").set_sensitive(True)
-#: ../revisor/base.py:178
+#: ../revisor/base.py:191
#, python-format
msgid "Cannot fork process showing help, please use %s%s"
msgstr "No se puede crear proceso para mostrar ayuda, por favor use %s%s"
-#: ../revisor/base.py:180
+#: ../revisor/base.py:193
#, python-format
msgid "Cannot show Help in CLI mode, use %s%s"
msgstr "No se puede mostrar Ayuda en modo CLI, use %s%s"
-#: ../revisor/base.py:188
+#: ../revisor/base.py:201
#, fuzzy
msgid "Loading Repositories"
msgstr "cargando proyecto"
-#: ../revisor/base.py:190
+#: ../revisor/base.py:203
#, fuzzy, python-format
msgid "Getting configuration from %s"
-msgstr "Abra el menú \"Archivo\""
-
-#: ../revisor/base.py:197 ../revisor/base.py:258 ../revisor/base.py:265
-#: ../revisor/base.py:275 ../revisor/base.py:285 ../revisor/cfg.py:473
-#: ../revisor/cfg.py:484 ../revisor/cfg.py:497 ../revisor/pkgorder.py:172
-#: ../revisor/pkgorder.py:177 ../revisor/pkgorder.py:188
-#: ../revisor/pkgorder.py:191 ../revisor/pkgorder.py:200
-#: ../revisor/pkgorder.py:209
+msgstr "Tomando configuración de %s"
+
+#: ../revisor/base.py:210 ../revisor/base.py:271 ../revisor/base.py:278
+#: ../revisor/base.py:288 ../revisor/base.py:298 ../revisor/cfg.py:473
+#: ../revisor/cfg.py:484 ../revisor/cfg.py:497 ../revisor/pkgorder.py:190
+#: ../revisor/pkgorder.py:195 ../revisor/pkgorder.py:206
+#: ../revisor/pkgorder.py:209 ../revisor/pkgorder.py:218
+#: ../revisor/pkgorder.py:227
#, python-format
msgid "Using deprecated YUM function: %s()"
msgstr "Se está usando función YUM obsoleta: %s()"
-#: ../revisor/base.py:199
+#: ../revisor/base.py:212
#, python-format
msgid ""
"yum.YumBase.doConfigSetup failed, probably an invalid configuration file %s"
@@ -1328,37 +1366,59 @@ msgstr ""
"yum.YumBase.doConfigSetup falló, probablemente %s es un archivo de "
"configuración inválido."
-#: ../revisor/base.py:202
+#: ../revisor/base.py:215
#, python-format
msgid "Bumping YUMs debuglevel (%d) to our debuglevel (%d)"
msgstr ""
-#: ../revisor/base.py:204
+#: ../revisor/base.py:217
#, python-format
msgid "YUMs debuglevel now %d"
msgstr ""
-#: ../revisor/base.py:239
+#: ../revisor/base.py:252
msgid "Another application is running which is accessing software information."
msgstr ""
"Hay otra aplicación ejecutándose que está accediendo a la información del "
"software."
-#: ../revisor/base.py:244
+#: ../revisor/base.py:257
#, fuzzy
msgid "Fatal Error: Unable to retrieve software information.\n"
msgstr "información de la versión en uso"
-#: ../revisor/base.py:254
+#: ../revisor/base.py:258
+msgid "\tThis could be caused by one of the following:\n"
+msgstr "\tEsto puede ser causado por alguna de las siguientes razones:\n"
+
+#: ../revisor/base.py:259
+msgid "\t - not having a network connection available,\n"
+msgstr "\t - no hay conexión de red disponible,\n"
+
+#: ../revisor/base.py:260
+msgid "\t - Server refusing connections,\n"
+msgstr "\t - Servidor rechazando conexiones,\n"
+
+#: ../revisor/base.py:261
+#, fuzzy
+msgid "\t - Using a mirror that isn't fully synchronized,\n"
+msgstr "\t - Usando un servidor espejo que no está totalmente sincronizado,\n"
+
+#: ../revisor/base.py:262
+#, fuzzy
+msgid "\t - Misconfigured repositories."
+msgstr "\t - Repositorios mal configurados."
+
+#: ../revisor/base.py:267
#, fuzzy
msgid "Setting up a Transaction Set"
-msgstr "Preparación de los Medios"
+msgstr "Preparando el conjunto de Transacciones"
-#: ../revisor/base.py:261
+#: ../revisor/base.py:274
msgid "Getting myself a piece of the RPMDB"
msgstr ""
-#: ../revisor/base.py:268
+#: ../revisor/base.py:281
msgid ""
"Apparently we're running on an Enterprise Linux system (we can tell from the "
"way yum sets up the RPM Database)"
@@ -1366,189 +1426,194 @@ msgstr ""
"Aparentemente se está corriendo en un sistema Linux para Empresas (se puede "
"decir eso por la forma en que yum configuró la Base de Datos RPM)"
-#: ../revisor/base.py:271
+#: ../revisor/base.py:284
#, fuzzy
msgid "Getting Repository Information"
-msgstr "información de la versión en uso"
+msgstr "Obteniendo Información de Repositorio"
-#: ../revisor/base.py:278
+#: ../revisor/base.py:291
#, fuzzy, python-format
msgid "Arch list = %s"
-msgstr "Arquitectura Destino:"
+msgstr "Lista de arquitecturas = %s"
-#: ../revisor/base.py:280
+#: ../revisor/base.py:293
#, fuzzy
msgid "Getting the Package Sacks"
-msgstr "Instalación de Paquetes"
+msgstr "Obteniendo Bolsas de Paquetes"
-#: ../revisor/base.py:290
+#: ../revisor/base.py:303
#, python-format
msgid "All OK so far, %d packages in the Package Sack"
-msgstr ""
+msgstr "Todo bien hasta ahora, %d paquetes en la Bolsa de Paquetes"
-#: ../revisor/base.py:303
+#: ../revisor/base.py:316
msgid ""
"Building a nice package list from ksdata, and adding it to the transaction"
msgstr ""
"Construyendo una lista de paquetes linda desde ksdata, y agregándola a la "
"transacción"
-#: ../revisor/base.py:308
+#: ../revisor/base.py:321
msgid "Kickstart mode: respin"
-msgstr ""
+msgstr "Modo Kickstart: respin"
-#: ../revisor/base.py:311
+#: ../revisor/base.py:324
#, fuzzy
msgid "Kickstart mode: normal"
-msgstr "No se pudo leer el archivo kickstart %s."
+msgstr "Modo Kickstart: normal"
-#: ../revisor/base.py:319
+#: ../revisor/base.py:332
#, python-format
msgid ""
"What we're getting from pykickstart is: %d groups, %d packages and %d "
"excluded packages. %d packages are being explicitly ignored."
msgstr ""
-#: ../revisor/base.py:329 ../revisor/base.py:618
+#: ../revisor/base.py:342 ../revisor/base.py:638
#, fuzzy
msgid "Select kickstart packages"
-msgstr "Pantalla de Instalación de Paquetes"
+msgstr "Selecciona paquetes kickstart"
-#: ../revisor/base.py:337
+#: ../revisor/base.py:350
#, python-format
msgid "Using pkgsack excludes, the list of packages to exclude is now: %r"
msgstr ""
-#: ../revisor/base.py:354 ../revisor/base.py:646
+#: ../revisor/base.py:367 ../revisor/base.py:666
msgid "Appending group @core"
-msgstr ""
+msgstr "Agregando grupo @core"
-#: ../revisor/base.py:369 ../revisor/base.py:661
+#: ../revisor/base.py:382 ../revisor/base.py:681
msgid "Appending group @base"
-msgstr ""
+msgstr "Agregando grupo @base"
-#: ../revisor/base.py:381 ../revisor/base.py:672
+#: ../revisor/base.py:401 ../revisor/base.py:698
#, fuzzy, python-format
msgid "Found group: %s"
-msgstr "no encontrado"
+msgstr "Grupo encontrado: %s"
-#: ../revisor/base.py:387
+#: ../revisor/base.py:407
#, python-format
msgid "Repository metadata cannot be found: %s: %s"
-msgstr ""
+msgstr "Metadata de repositorio no puede ser encontrada: %s: %s"
-#: ../revisor/base.py:390
+#: ../revisor/base.py:410
#, fuzzy, python-format
msgid "Group not found: %s"
-msgstr "Archivo no encontrado: {1}"
+msgstr "Grupo no encontrado: %s"
-#: ../revisor/base.py:402
+#: ../revisor/base.py:422
#, python-format
msgid "Selecting required packages for group %s"
-msgstr "Seleccionando los paquetes requeridos por el grupo %s"
+msgstr "Seleccionando los paquetes requeridos para grupo %s"
-#: ../revisor/base.py:406 ../revisor/base.py:427 ../revisor/base.py:448
-#: ../revisor/base.py:467
+#: ../revisor/base.py:426 ../revisor/base.py:447 ../revisor/base.py:468
+#: ../revisor/base.py:487
#, python-format
msgid "Including %s"
msgstr "Incluyendo %s"
-#: ../revisor/base.py:416 ../revisor/base.py:436
+#: ../revisor/base.py:436
#, fuzzy, python-format
-msgid "From Groups: Adding %s-%s:%s-%s.%s to transaction"
-msgstr "Desde los Grupos --optional: Agregando %s-%s:%s-%s.%s a la transacción"
+msgid "From Groups (required): Adding %s-%s:%s-%s.%s to transaction"
+msgstr "Desde los Grupos (requerido): Agregando %s-%s:%s-%s.%s a la transacción"
-#: ../revisor/base.py:423
+#: ../revisor/base.py:443
#, python-format
msgid "Selecting default packages for group %s"
msgstr "Seleccionando los paquetes predeterminados del grupo %s"
-#: ../revisor/base.py:443
+#: ../revisor/base.py:456
+#, fuzzy, python-format
+msgid "From Groups (default): Adding %s-%s:%s-%s.%s to transaction"
+msgstr "Desde los Grupos (default): Agregando %s-%s:%s-%s.%s a la transacción"
+
+#: ../revisor/base.py:463
#, python-format
msgid "Selecting optional packages for group %s"
msgstr "Seleccionando los paquetes opcionales del grupo %s"
-#: ../revisor/base.py:457 ../revisor/base.py:476
-#, python-format
-msgid "From Groups --optional: Adding %s-%s:%s-%s.%s to transaction"
-msgstr "Desde los Grupos --optional: Agregando %s-%s:%s-%s.%s a la transacción"
+#: ../revisor/base.py:477 ../revisor/base.py:496
+#, fuzzy, python-format
+msgid "From Groups (optional): Adding %s-%s:%s-%s.%s to transaction"
+msgstr "Desde los Grupos (optional): Agregando %s-%s:%s-%s.%s a la transacción"
-#: ../revisor/base.py:463
+#: ../revisor/base.py:483
#, python-format
msgid "No include parameter for group %s, using defaults"
msgstr "No se incluye parámetro para el grupo %s, usando los predeterminados"
-#: ../revisor/base.py:485 ../revisor/base.py:689
+#: ../revisor/base.py:505 ../revisor/base.py:715
#, fuzzy, python-format
msgid "Testing condition: %s / %s"
-msgstr "Prueba de los Discos"
+msgstr "Probando condición: %s / %s"
-#: ../revisor/base.py:499
+#: ../revisor/base.py:519
#, fuzzy, python-format
msgid "From package list, including: %s"
-msgstr "<seleccione una frase desde la lista de arriba>"
+msgstr "Desde lista de paquetes, incluyendo: %s"
-#: ../revisor/base.py:502
+#: ../revisor/base.py:522
#, python-format
msgid "Package %s is in excludeList, continuing"
-msgstr ""
+msgstr "Paquete %s está en lista de excluídos, continuando"
-#: ../revisor/base.py:510
+#: ../revisor/base.py:530
#, fuzzy
msgid "No packages found!"
-msgstr "Paquetes"
+msgstr "No se encontraron paquetes!"
-#: ../revisor/base.py:515 ../revisor/base.py:544
+#: ../revisor/base.py:535 ../revisor/base.py:564
#, python-format
msgid "From Packages: Adding %s-%s:%s-%s.%s to transaction"
msgstr "Desde los Paquetes: Agregando %s-%s:%s-%s.%s a la transacción"
-#: ../revisor/base.py:522
+#: ../revisor/base.py:542
#, fuzzy, python-format
msgid "Could not find package '%s', searching..."
-msgstr "Agregandos paq. req. %s-%s:%s-%s.%s"
+msgstr "No se pudo encontrar paquete '%s', buscando..."
-#: ../revisor/base.py:535
+#: ../revisor/base.py:555
#, fuzzy, python-format
msgid "Found packages matching '%s': %s"
-msgstr "Pantalla de Instalación de Paquetes"
+msgstr "Encontrados paquetes similares '%s': %s"
-#: ../revisor/base.py:546
+#: ../revisor/base.py:566
#, python-format
msgid "From Packages: Not adding %s now because it is in the ignore list"
msgstr ""
"Desde los Paquetes: No agregando %s porque está en la lista de ignorados"
-#: ../revisor/base.py:557
+#: ../revisor/base.py:577
#, python-format
msgid ""
"More then one package found for %s-%s-%s.%s - going to add them all to the "
"transaction"
msgstr ""
-#: ../revisor/base.py:559
+#: ../revisor/base.py:579
#, fuzzy, python-format
msgid "Could not find package %s-%s-%s.%s"
-msgstr "Agregandos paq. req. %s-%s:%s-%s.%s"
+msgstr "No se pudo encontrar paquete %s-%s-%s.%s"
-#: ../revisor/base.py:562
+#: ../revisor/base.py:582
#, fuzzy, python-format
msgid "From Packages (exact string %s-%s-%s.%s), selecting %s-%s-%s.%s"
-msgstr "Desde los Paquetes: Agregando %s-%s:%s-%s.%s a la transacción"
+msgstr "Desde los Paquetes (string exacto %s-%s-%s.%s), seleccionando %s-%s-%s.%s"
-#: ../revisor/base.py:582 ../revisor/base.py:737
+#: ../revisor/base.py:602 ../revisor/base.py:763
#, 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/base.py:585 ../revisor/base.py:740
+#: ../revisor/base.py:605 ../revisor/base.py:766
#, 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 ""
-#: ../revisor/base.py:591
+#: ../revisor/base.py:611
#, python-format
msgid ""
"\n"
@@ -1561,68 +1626,68 @@ msgid ""
"be what you expected."
msgstr ""
-#: ../revisor/base.py:597
+#: ../revisor/base.py:617
msgid "This is what was selected to be installed:"
msgstr "Esto es lo que selecciono para instalar:"
-#: ../revisor/base.py:610
+#: ../revisor/base.py:630
#, python-format
msgid ""
"What we're getting from pykickstart is: %d groups, %d packages and %d "
"excluded packages."
msgstr ""
-#: ../revisor/base.py:629
+#: ../revisor/base.py:649
#, python-format
msgid "Using pkgsack excludes, excluded packages is now: %r"
msgstr ""
-#: ../revisor/base.py:669
+#: ../revisor/base.py:695
#, fuzzy, python-format
msgid "No such group %s"
-msgstr "No se encontraron coincidencias. :-("
+msgstr "No hay grupo %s"
-#: ../revisor/base.py:726
+#: ../revisor/base.py:752
#, fuzzy, python-format
msgid "Adding %s-%s:%s-%s.%s"
-msgstr "Agregando"
+msgstr "Agregando %s-%s:%s-%s.%s"
-#: ../revisor/base.py:758
-msgid "Initting progress bar for "
-msgstr "Iniciando barra de progreso para"
+#: ../revisor/base.py:784
+msgid "Initiating progress bar for "
+msgstr "Iniciando barra de progreso para "
-#: ../revisor/base.py:765
+#: ../revisor/base.py:791
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:794
+#: ../revisor/base.py:820 ../revisor/misc.py:185
#, fuzzy, python-format
msgid "Checking dependencies for %s.%s"
-msgstr "Alias para FCVER"
+msgstr "Checando dependencias para %s.%s"
#. pbar.cur_task += 1.0
-#: ../revisor/base.py:816
+#: ../revisor/base.py:842 ../revisor/misc.py:211
#, fuzzy, python-format
msgid "Unresolvable dependency %s %s %s in %s.%s"
-msgstr "Nuevo en Fedora"
+msgstr "Dependencia no resuelta %s %s %s in %s.%s"
-#: ../revisor/base.py:823
+#: ../revisor/base.py:849 ../revisor/misc.py:218
#, python-format
msgid "Added %s-%s:%s-%s.%s for %s-%s:%s-%s.%s (requiring %s %s %s)"
-msgstr ""
+msgstr "Añadiendo %s-%s:%s-%s.%s para %s-%s:%s-%s.%s (requriendo %s %s %s)"
-#: ../revisor/base.py:826
+#: ../revisor/base.py:852 ../revisor/misc.py:159
msgid "Checking dependencies - allowing conflicts within the package set"
msgstr ""
"Verificando dependencias - permitiendo conflictos entre el conjunto de "
"paquetes"
-#: ../revisor/base.py:827 ../revisor/base.py:856
+#: ../revisor/base.py:853 ../revisor/base.py:882
msgid "Resolving Dependencies"
msgstr "Resolviendo Dependencias"
-#: ../revisor/base.py:849
+#: ../revisor/base.py:875
#, python-format
msgid ""
"The following packages were excluded using the kickstart package manifest, "
@@ -1630,14 +1695,14 @@ msgid ""
" - %s"
msgstr ""
-#: ../revisor/base.py:855
+#: ../revisor/base.py:881
msgid ""
"Checking dependencies - not allowing any conflicts within the package set"
msgstr ""
"Chequeando dependencias - no permitiendo ningún conflicto entre el conjunto "
"de paquetes"
-#: ../revisor/base.py:883
+#: ../revisor/base.py:909
#, python-format
msgid ""
"Unable to resolve dependencies for some packages selected:\n"
@@ -1649,17 +1714,17 @@ msgstr ""
"%s"
#. End of dependency resolving
-#: ../revisor/base.py:887 ../revisor/image.py:97
+#: ../revisor/base.py:913 ../revisor/image.py:97
#, fuzzy
msgid "Unable to build transaction"
-msgstr "Configuración previa a la construcción"
+msgstr "No se puede construir transacción"
-#: ../revisor/base.py:892 ../revisor/image.py:102
+#: ../revisor/base.py:918 ../revisor/image.py:102
#, python-format
msgid "Succesfully built transaction: ret %s, msg %s"
msgstr "Transacción construída exitosamente: ret %s, msg %s"
-#: ../revisor/base.py:898
+#: ../revisor/base.py:924
#, python-format
msgid ""
"Errors where encountered while downloading package headers:\n"
@@ -1670,202 +1735,221 @@ msgstr ""
"\n"
"%s"
-#: ../revisor/base.py:907
+#: ../revisor/base.py:933
msgid ""
"The package set after dependency resolving does not match the packages "
"selected in the kickstart manifest"
msgstr ""
-#: ../revisor/base.py:931
+#: ../revisor/base.py:960
#, fuzzy, python-format
msgid "No such repository: %s"
-msgstr "Soporte a Repositorio de Yum"
+msgstr "No hay repositorio: %s"
-#: ../revisor/base.py:933
+#: ../revisor/base.py:962
#, fuzzy, python-format
msgid "Enabling %s repository"
-msgstr "Usando el Repositorio"
+msgstr "Activando el Repositorio %s"
-#: ../revisor/base.py:951
+#: ../revisor/base.py:981
#, fuzzy, python-format
msgid "Disabling %s repository"
-msgstr "Usando el Repositorio"
+msgstr "Desactivando el Repositorio %s"
+
+#: ../revisor/base.py:988
+msgid "Creating a list of SRPMs"
+msgstr "Creando una lista de SRPMs"
-#: ../revisor/base.py:972
+#: ../revisor/base.py:1003
+msgid "Source RPM PO already in the list"
+msgstr "Fuente PO de RPM ya está en la lista"
+
+#: ../revisor/base.py:1005
+#, python-format
+msgid "Source RPM found in non-source repository %s"
+msgstr ""
+
+#: ../revisor/base.py:1007
#, python-format
msgid "Error: Cannot find a source rpm for %s"
msgstr "Error: no se pudo encontrar el rpm fuente de %s"
-#: ../revisor/base.py:974 ../revisor/modgui/build_media.py:106
+#: ../revisor/base.py:1009 ../revisor/modgui/build_media.py:106
#: ../revisor/modgui/build_media.py:142 ../revisor/modgui/build_media.py:219
#, fuzzy
msgid "Downloading Source Packages"
-msgstr "Pantalla de Instalación de Paquetes"
+msgstr "Descargando Paquetes Fuente"
-#: ../revisor/base.py:1003 ../revisor/progress.py:441
+#: ../revisor/base.py:1038 ../revisor/progress.py:441
#, fuzzy, python-format
msgid "Downloading %s"
-msgstr "Descargando"
+msgstr "Descargando %s"
-#: ../revisor/base.py:1033 ../revisor/modgui/build_media.py:101
+#: ../revisor/base.py:1068 ../revisor/modgui/build_media.py:101
#: ../revisor/modgui/build_media.py:214
#, fuzzy
msgid "Downloading Packages"
msgstr "Instalación de Paquetes"
-#: ../revisor/base.py:1042
+#: ../revisor/base.py:1077
+#, python-format
+msgid "Using local copy of %s-%s-%s.%s at %s"
+msgstr ""
+
+#: ../revisor/base.py:1087
msgid "Unable to find a suitable mirror."
msgstr "No se pudo encontrar un espejo apropiado."
-#: ../revisor/base.py:1054
+#: ../revisor/base.py:1099
#, python-format
msgid "Errors were encountered while downloading packages: %s"
msgstr "Se encontraron errores durante la descarga de paquetes: %s"
-#: ../revisor/base.py:1095
+#: ../revisor/base.py:1141
#, python-format
msgid "Overriding auto package selection with user package selection for %s..."
msgstr ""
"Superponiendo la selección de paquetes automática con la selección de "
"paquetes del usuario para %s..."
-#: ../revisor/base.py:1108
+#: ../revisor/base.py:1154
#, fuzzy, python-format
msgid "Adding required package %s-%s:%s-%s.%s"
-msgstr "Agregandos paq. req. %s-%s:%s-%s.%s"
+msgstr "Agregandos paquete requerido %s-%s:%s-%s.%s"
#. This list has already been resolved
-#: ../revisor/base.py:1111
+#: ../revisor/base.py:1157
#, fuzzy, python-format
msgid "%s. This is a required package."
-msgstr "¿de qué guión es esto?"
+msgstr "%s. Este es un paquete requerido."
-#: ../revisor/base.py:1123
+#: ../revisor/base.py:1169
#, fuzzy, python-format
msgid "Adding suggested package %s-%s:%s-%s.%s"
-msgstr "Medio Vivo: Agregando paq. sugerido %s-%s:%s-%s.%s"
+msgstr "Agregando paquete sugerido %s-%s:%s-%s.%s"
-#: ../revisor/base.py:1133
-#, python-format
-msgid "Packages that do not need to be on the media: %s"
-msgstr ""
+#: ../revisor/base.py:1180
+#, fuzzy, python-format
+msgid "Adding all-arch package %s-%s:%s-%s.%s"
+msgstr "Añadiendo paquete de arq. independiente %s-%s:%s-%s.%s"
-#: ../revisor/base.py:1158 ../revisor/base.py:1184
+#: ../revisor/base.py:1216 ../revisor/base.py:1242
msgid "Did not succeed in adding in all required packages"
msgstr "No se tuvo éxito en agregar todos los paquetes requeridos"
-#: ../revisor/base.py:1192
+#: ../revisor/base.py:1250
#, fuzzy
msgid "Populating statistics"
-msgstr "estadísticas de la máquina virtual"
+msgstr "Reuniendo estadísticas"
-#: ../revisor/base.py:1208
+#: ../revisor/base.py:1266
#, fuzzy, python-format
msgid "Package %s-%s:%s-%s.%s does not seem to have a archivesize header"
msgstr ""
-"El paquete %s-%s:%s-%s.%s no parece tener una cabecera de tamaño de paquete"
+"El paquete %s-%s:%s-%s.%s no parece tener una cabecera de tamaño de archivo"
-#: ../revisor/base.py:1216
+#: ../revisor/base.py:1274
#, fuzzy, python-format
msgid "Package %s-%s:%s-%s.%s does not seem to have a installedsize header"
msgstr ""
-"El paquete %s-%s:%s-%s.%s no parece tener una cabecera de tamaño de paquete"
+"El paquete %s-%s:%s-%s.%s no parece tener una cabecera de tamaño de instalación"
-#: ../revisor/base.py:1224
+#: ../revisor/base.py:1282
#, fuzzy, python-format
msgid "Package %s-%s:%s-%s.%s does not seem to have a packagesize header"
msgstr ""
"El paquete %s-%s:%s-%s.%s no parece tener una cabecera de tamaño de paquete"
-#: ../revisor/base.py:1234
-#, python-format
+#: ../revisor/base.py:1292
+#, fuzzy, python-format
msgid "Total size of all packages (archivesize): %s %s"
-msgstr ""
+msgstr "Tamaño total de todos los paquetes (tamaño de archivo): %s %s"
-#: ../revisor/base.py:1235
-#, python-format
+#: ../revisor/base.py:1293
+#, fuzzy, python-format
msgid "Total size of all packages, (installedsize): %s %s"
-msgstr ""
+msgstr "Tamaño total de todos los paquetes, (tamaño instalados): %s %s "
-#: ../revisor/base.py:1236
-#, python-format
+#: ../revisor/base.py:1294
+#, fuzzy, python-format
msgid "Total size of all packages, (packagesize): %s %s"
-msgstr ""
+msgstr "Tamaño total de todos los paquetes, (tamaño de paquete): %s %s"
-#: ../revisor/base.py:1271
+#: ../revisor/base.py:1329
#, python-format
msgid "Report of the %d most space consuming packages"
-msgstr ""
+msgstr "Reporte de los %d paquetes que ocupan más espacio"
-#: ../revisor/base.py:1366 ../revisor/base.py:1380 ../revisor/base.py:2001
+#: ../revisor/base.py:1424 ../revisor/base.py:1438 ../revisor/base.py:2068
#, fuzzy, python-format
msgid "Creating pkgdir: %s"
-msgstr "Creación de Cuentas de Usuario Adicionales"
+msgstr "Creando pkgdir: %s"
#. Now for each txmbr in
#. Link the localPkg() result into the build tree
-#: ../revisor/base.py:1389
+#: ../revisor/base.py:1447
#, fuzzy
msgid "Linking in packages"
-msgstr "Pantalla de Instalación de Paquetes"
+msgstr "Enlazando en paquetes"
-#: ../revisor/base.py:1408 ../revisor/base.py:2025
+#: ../revisor/base.py:1466 ../revisor/base.py:2092
#, python-format
msgid "Package hard link failed: %s: %s"
msgstr "El enlace rígido del paquete falló: %s: %s"
-#: ../revisor/base.py:1413 ../revisor/base.py:2030
+#: ../revisor/base.py:1471 ../revisor/base.py:2097
#, fuzzy, python-format
msgid "Copying: %s to %s"
-msgstr "a esto:"
+msgstr "Copiando: %s a %s"
-#: ../revisor/base.py:1416 ../revisor/base.py:2033
+#: ../revisor/base.py:1474 ../revisor/base.py:2100
#, fuzzy, python-format
msgid "Symlinking: %s to %s"
-msgstr "a esto:"
+msgstr "Enlace simbólico: %s a %s"
-#: ../revisor/base.py:1419 ../revisor/base.py:2036
+#: ../revisor/base.py:1477 ../revisor/base.py:2103
#, fuzzy
msgid "Package symlink succeeded"
msgstr "El Administrador de Paquetes RPM"
-#: ../revisor/base.py:1421 ../revisor/base.py:1428 ../revisor/base.py:2038
-#: ../revisor/base.py:2045
+#: ../revisor/base.py:1479 ../revisor/base.py:1486 ../revisor/base.py:2105
+#: ../revisor/base.py:2112
#, python-format
msgid "Package link failed, trying copy: %s: %s"
msgstr "Falló el enlace del paquete, intentando copiar: %s: %s"
-#: ../revisor/base.py:1438
+#: ../revisor/base.py:1496
#, fuzzy
msgid "Creating Repository Information"
msgstr "información de la versión en uso"
#. FIXME: Optionally recompose installer images
-#: ../revisor/base.py:1453
+#: ../revisor/base.py:1511
#, fuzzy
msgid "Building Installation Images"
msgstr "Imágenes Viva de Fedora"
-#: ../revisor/base.py:1459
+#: ../revisor/base.py:1528
+#, fuzzy
msgid "Using already existing installer images"
-msgstr ""
+msgstr "Usando imagen de instalador ya existentes"
-#: ../revisor/base.py:1473
+#: ../revisor/base.py:1542
#, fuzzy
msgid "Linking in release notes"
msgstr "Notas de la Versión de Fedora Core 6"
-#: ../revisor/base.py:1485
+#: ../revisor/base.py:1554
#, fuzzy, python-format
msgid "Copying updates.img from %s to %s"
-msgstr "a esto:"
+msgstr "Copiando updates.img de %s a %s"
-#: ../revisor/base.py:1494 ../revisor/pungi.py:412
+#: ../revisor/base.py:1563 ../revisor/pungi.py:417
#, fuzzy, python-format
msgid "copy_dir '%s' not accessible"
-msgstr "Esta impresora compartida no es accesible."
+msgstr "copy_dir '%s' no accesible"
-#: ../revisor/base.py:1505
+#: ../revisor/base.py:1574
#, python-format
msgid "Size of the installation tree is %s MB"
msgstr "El tamaño del árbol de instalación es %s MB"
@@ -1874,194 +1958,215 @@ 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:1555
+#: ../revisor/base.py:1624
msgid "Running pkgorder"
msgstr "Ejecutando pkgorder"
-#: ../revisor/base.py:1618
+#: ../revisor/base.py:1685
+#, fuzzy, python-format
+msgid "Running with grouplist: %r"
+msgstr "Ejecutando con grouplist: %r"
+
+#: ../revisor/base.py:1688
+#, fuzzy, python-format
+msgid "Running with packagelist: %r"
+msgstr "Ejecutando con packagelist: %r"
+
+#: ../revisor/base.py:1695
+#, fuzzy
msgid "Appending group core and base"
-msgstr ""
+msgstr "Añadiendo grupo core y base"
-#: ../revisor/base.py:1625
+#: ../revisor/base.py:1707
#, fuzzy, python-format
msgid "Appending default group %s"
-msgstr "Uso de las Opciones de Arranque"
+msgstr "Agregando grupo predeterminado s%"
-#: ../revisor/base.py:1665
+#. Do not do this because the installer still has all the groups available
+#. if group not in groupList:
+#. continue
+#: ../revisor/base.py:1729
#, fuzzy, python-format
msgid "Appending non-default group %s"
-msgstr "Seleccionando los paquetes predeterminados del grupo %s"
+msgstr "Agregando grupo no predeterminado %s"
-#: ../revisor/base.py:1671
+#. Do not do this because the installer still has all the groups available
+#. if group not in groupList:
+#. continue
+#: ../revisor/base.py:1739
#, fuzzy, python-format
msgid "Appending non-default support group %s"
-msgstr "Seleccionando los paquetes predeterminados del grupo %s"
+msgstr "Agregando grupo de soporte no predeterminado %s"
-#: ../revisor/base.py:1738
+#: ../revisor/base.py:1805
#, python-format
msgid "Not running package ordering, using file %s instead"
msgstr ""
-#: ../revisor/base.py:1740
+#: ../revisor/base.py:1807
#, fuzzy
msgid "Not running package ordering"
-msgstr "Ejecutando pkgorder"
+msgstr "No ejecutando ordenamiento de paquete"
-#: ../revisor/base.py:1772
+#: ../revisor/base.py:1839
#, fuzzy
msgid "^Install using kickstart"
-msgstr "Instalación kickstart mejorada"
+msgstr "^Instalar usando kickstart"
#. Split Tree
-#: ../revisor/base.py:1795
+#: ../revisor/base.py:1862
#, fuzzy, python-format
msgid "Splitting Build Tree (%s)"
-msgstr "ajustar profundidad del árbol"
+msgstr "Dividiendo Árbol de Construcción (%s)"
#. Split repo
-#: ../revisor/base.py:1801
+#: ../revisor/base.py:1868
#, fuzzy, python-format
msgid "Splitting Repository (%s)"
-msgstr "Usando el Repositorio"
+msgstr "Dividiendo Repositorio (%s)"
-#: ../revisor/base.py:1815 ../revisor/modgui/build_media.py:244
+#: ../revisor/base.py:1882 ../revisor/modgui/build_media.py:244
#, fuzzy, python-format
msgid "Creating %s ISO Image #%d"
-msgstr "image-file.iso"
+msgstr "Creando %s Imagen ISO #%d"
-#: ../revisor/base.py:1820 ../revisor/modgui/build_media.py:248
+#: ../revisor/base.py:1887 ../revisor/modgui/build_media.py:248
#, fuzzy, python-format
msgid "Creating %s ISO Image"
-msgstr "image-file.iso"
+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:1834
+#: ../revisor/base.py:1901
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:1842
+#: ../revisor/base.py:1909
#, python-format
msgid "Implanting md5 into ISO Image: %s"
msgstr "Implantando md5 en la Imágen ISO: %s"
-#: ../revisor/base.py:1848
+#: ../revisor/base.py:1915
msgid "Cannot implant ISO md5sum"
msgstr ""
#. Do some SHA1SUMMONING
-#: ../revisor/base.py:1856
+#: ../revisor/base.py:1923
#, fuzzy
msgid "Creating SHA1SUMs for Images"
-msgstr "No hay Live para <systemitem>ppc</systemitem>"
+msgstr "Creando SHA1SUMs para Imagenes"
-#: ../revisor/base.py:1872
+#: ../revisor/base.py:1939
#, fuzzy
msgid "Creating Rescue ISO Image"
-msgstr "image-file.iso"
+msgstr "Creando Imagen ISO de Rescate"
-#: ../revisor/base.py:1932
+#: ../revisor/base.py:1999
#, fuzzy, python-format
msgid "Copying %s to %s (%d files)"
-msgstr "a esto:"
+msgstr "Copipando %s a %s (%d archivos)"
-#: ../revisor/base.py:1936
+#: ../revisor/base.py:2003
#, fuzzy, python-format
msgid "Moving %s to %s (%d files)"
-msgstr "a esto:"
+msgstr "Moviendo %s a %s (%d archivos)"
-#: ../revisor/base.py:1939
+#: ../revisor/base.py:2006
#, fuzzy, python-format
msgid ""
"Moving of the source tree failed (trying copy):\n"
"\n"
"%s"
-msgstr "El tamaño del árbol de instalación es %s MB"
+msgstr "Movimiento del árbol fuente falló (intentando copiar):\n"
-#: ../revisor/base.py:1942
+#: ../revisor/base.py:2009
#, python-format
msgid ""
"Copying of the source tree failed:\n"
"\n"
"%s"
-msgstr ""
+msgstr "Copiado del árbol fuente falló:\n"
+"\n"
+"%s"
-#: ../revisor/base.py:1947 ../revisor/pungi.py:408
+#: ../revisor/base.py:2014 ../revisor/pungi.py:413
#, fuzzy, python-format
msgid "Copying %s to %s"
-msgstr "a esto:"
+msgstr "Copiando %s a %s"
-#: ../revisor/base.py:1951
+#: ../revisor/base.py:2018
#, fuzzy, python-format
msgid ""
"Copying of the installation tree failed:\n"
"\n"
"%s"
-msgstr "El tamaño del árbol de instalación es %s MB"
+msgstr "Copiado del árbol de instalación falló:\n"
+"\n"
+"%s"
-#: ../revisor/base.py:1957
+#: ../revisor/base.py:2024
#, fuzzy
msgid "Creating ext3 filesystem"
-msgstr "50 GB ext3"
+msgstr "Creando sistema de archivos ext3"
-#: ../revisor/base.py:1964
+#: ../revisor/base.py:2031
#, fuzzy
msgid "Configuring System"
-msgstr "Herramientas del Sistema"
+msgstr "Configurando el Sistema"
#. Now for each txmbr in
#. Link the localPkg() result into the build tree
-#: ../revisor/base.py:2010
+#: ../revisor/base.py:2077
#, fuzzy
msgid "Linking in Source packages"
-msgstr "Pantalla de Instalación de Paquetes"
+msgstr "Enlazando en paquetes Fuente"
-#: ../revisor/base.py:2065
+#: ../revisor/base.py:2132
#, fuzzy, python-format
msgid "Setting rundir to %s"
-msgstr "¡Bienvenido a Fedora!"
+msgstr "Configurando rundir a %s"
-#: ../revisor/base.py:2071
+#: ../revisor/base.py:2138
#, python-format
msgid "Directory %s could not be created. Aborting"
msgstr "El directorio %s no pudo ser creado. Abortando"
-#: ../revisor/base.py:2073
+#: ../revisor/base.py:2140
#, fuzzy, python-format
msgid "Running command: %s"
-msgstr "último comando"
+msgstr "Comando de ejecución: %s"
-#: ../revisor/base.py:2074
+#: ../revisor/base.py:2141
#, fuzzy, python-format
msgid "Extra information: %s %s %s"
-msgstr "Información del módulo"
+msgstr "Información extra: %s %s %s"
-#: ../revisor/base.py:2102
+#: ../revisor/base.py:2169
#, python-format
msgid "Got an error from %s (return code %s)"
-msgstr ""
+msgstr "Se obtuvo error de %s (código devuelto %s)"
#: ../revisor/cfg.py:73
#, fuzzy, python-format
msgid "Setting %s to %r"
-msgstr "¡Bienvenido a Fedora!"
+msgstr "Configurando %s a %r"
#: ../revisor/cfg.py:152 ../revisor/cfg.py:210
#, fuzzy, python-format
msgid "No group data found for %s"
-msgstr "Archivo no encontrado: {1}"
+msgstr "Información de grupo no encontrada para: %s"
#: ../revisor/cfg.py:155 ../revisor/cfg.py:213
#, python-format
msgid "Why is yum throwing AttributeErrors? %s"
-msgstr ""
+msgstr "Porqué yum está lanzando AtributeErrors? %s"
#: ../revisor/cfg.py:243
#, fuzzy
msgid "Checking working directories"
-msgstr "BitTorrent Verifica Errores Automáticamente "
+msgstr "Checando directorios de trabajo"
#: ../revisor/cfg.py:260 ../revisor/cfg.py:338
#, python-format
@@ -2104,7 +2209,7 @@ msgstr ""
#: ../revisor/cfg.py:279
#, fuzzy, python-format
msgid "%s%s%s is not a mount"
-msgstr "El traductor de {1} no fue encontrado"
+msgstr "%s%s%s no es un montaje"
#: ../revisor/cfg.py:299
#, python-format
@@ -2124,12 +2229,12 @@ msgstr ""
#: ../revisor/cfg.py:316
#, fuzzy
msgid "Checking destination directories"
-msgstr "BitTorrent Verifica Errores Automáticamente "
+msgstr "Checando directorios de destino"
#: ../revisor/cfg.py:320
#, fuzzy, python-format
msgid "Set destination directory to %s"
-msgstr "poner todas las fuentes a..."
+msgstr "Poner el directorio de destino a %s"
#: ../revisor/cfg.py:364 ../revisor/cfg.py:371 ../revisor/cfg.py:378
#: ../revisor/modvirt/__init__.py:66 ../revisor/modvirt/__init__.py:73
@@ -2142,7 +2247,7 @@ msgstr ""
#: ../revisor/cfg.py:403
#, fuzzy, python-format
msgid "Architecture list: %r"
-msgstr "Arquitectura Destino:"
+msgstr "Lista de arquitectura: %r"
#: ../revisor/cfg.py:435
#, python-format
@@ -2161,7 +2266,8 @@ msgstr "Poniendo repo.mirrorlist a %s"
#: ../revisor/cfg.py:462 ../revisor/cfg.py:466
msgid "Could not clean metadata you might be working with old data"
-msgstr ""
+msgstr "No se pudo limpiar metadata puede que ud. esté trabajando con "
+"información obsoleta"
#: ../revisor/cfg.py:487
#, python-format
@@ -2212,7 +2318,7 @@ msgstr "Esta impresora compartida no es accesible."
#: ../revisor/cfg.py:598
msgid "Updates.img seems to not be a file... Is it an URL?"
-msgstr ""
+msgstr "Updates.img parece no ser un archivo... Es una URL?"
#: ../revisor/cfg.py:609
msgid "Preferred kernel should be one of: normal, PAE, xen, debug."
@@ -2243,7 +2349,7 @@ msgstr "No hay tal modelo %s en el archivo de configuración %s"
#: ../revisor/cfg.py:671
#, fuzzy, python-format
msgid "Setting model to %s"
-msgstr "¡Bienvenido a Fedora!"
+msgstr "Configurando modelo a %s"
#. Not specifying a model and not configuring a model is fatal for CLI
#: ../revisor/cfg.py:680 ../revisor/cfg.py:690 ../revisor/cfg.py:692
@@ -2265,71 +2371,73 @@ msgstr ""
msgid "Tried to load model %s but it doesn't exist inconfiguration file %s"
msgstr "No hay tal modelo %s en el archivo de configuración %s"
-#: ../revisor/cfg.py:710
+#: ../revisor/cfg.py:713
#, python-format
msgid "Model %s has no configuration directive 'main' which is required"
-msgstr ""
+msgstr "Modelo %s no tiene directiva de configuración 'main' la cual es "
+"requerida"
-#: ../revisor/cfg.py:713
+#: ../revisor/cfg.py:716
#, fuzzy, python-format
msgid "Testing for configuration parameter %s"
-msgstr "Abra el menú \"Archivo\""
+msgstr "Comprobando parámetro de configuración %s"
-#: ../revisor/cfg.py:742
+#: ../revisor/cfg.py:745
#, python-format
msgid "Setting %s to %r (from configuration file model %s)"
msgstr "Poniendo %s a %r (desde el modelo de archivo de configuración %s)"
-#: ../revisor/cfg.py:776
+#: ../revisor/cfg.py:779
#, fuzzy, python-format
msgid "Configuration file %s not readable"
msgstr "Modelo inválido %s, el archivo de configuración %s no es legible"
-#: ../revisor/cfg.py:779 ../revisor/modgui/configuration.py:465
+#: ../revisor/cfg.py:782 ../revisor/modgui/configuration.py:465
#, fuzzy, python-format
msgid "Reading configuration file %s"
-msgstr "Abra el menú \"Archivo\""
+msgstr "Leyendo archivo de configuración %s"
-#: ../revisor/cfg.py:783
+#: ../revisor/cfg.py:786
#, fuzzy, python-format
msgid "Invalid configuration file %s"
-msgstr "Abra el menú \"Archivo\""
+msgstr "Archivo de configuración inválido %s"
-#: ../revisor/cfg.py:786
+#: ../revisor/cfg.py:789
#, fuzzy, python-format
msgid "No master configuration section [revisor] in configuration file %s"
-msgstr "No hay tal modelo %s en el archivo de configuración %s"
+msgstr "No hay sección de configuración maestra [revisor] en archivo de "
+"configuración %s"
-#: ../revisor/cfg.py:820
+#: ../revisor/cfg.py:823
#, python-format
msgid "Setting %s to %r (from configuration file)"
msgstr "Poniendo %s a %r (desde el archivo de configuración)"
-#: ../revisor/cfg.py:824
+#: ../revisor/cfg.py:827
msgid "Setting options from command-line"
msgstr "Poniendo opciones desde la línea de comando"
-#: ../revisor/cfg.py:838 ../revisor/cfg.py:845
+#: ../revisor/cfg.py:841 ../revisor/cfg.py:848
#, fuzzy, python-format
msgid "Setting %s to %r (from command line)"
msgstr "Poniendo %s a %r (desde el archivo de configuración)"
-#: ../revisor/cfg.py:840
-#, python-format
+#: ../revisor/cfg.py:843
+#, fuzzy, python-format
msgid "Checked setting %s through plugin"
-msgstr ""
+msgstr "Checando configuración %s a través de plugin"
-#: ../revisor/cfg.py:843
+#: ../revisor/cfg.py:846
#, python-format
msgid "No check_setting_%s()"
msgstr ""
-#: ../revisor/cfg.py:847
+#: ../revisor/cfg.py:850
#, fuzzy, python-format
msgid "Not setting %s to %r (command line matches default)"
-msgstr "Poniendo %s a %r (desde el archivo de configuración)"
+msgstr "No se pone %s a %r (linea de comando coincide con default)"
-#: ../revisor/cfg.py:889
+#: ../revisor/cfg.py:893
msgid ""
"Updates.img is only usable with installation media. Please remove --updates-"
"img or also build installation media."
@@ -2337,34 +2445,34 @@ msgstr ""
"Updates.img sólo es usable con medio de instalación. Por favor, elimine --"
"updates-img o construya también el medio de instalación."
-#: ../revisor/cfg.py:893
+#: ../revisor/cfg.py:897
#, fuzzy
msgid "Kickstart failed"
-msgstr "ubicacion/archivo-kickstart.cfg"
+msgstr "Kickstart falló"
-#: ../revisor/cfg.py:898
+#: ../revisor/cfg.py:904 ../revisor/cfg.py:909
#, fuzzy, python-format
msgid "Kickstart file %s not readable"
msgstr "No se pudo leer el archivo kickstart %s."
-#: ../revisor/cfg.py:900
+#: ../revisor/cfg.py:906 ../revisor/cfg.py:911
#, python-format
msgid "Kickstart file %s fails to load, continuing with defaults"
msgstr ""
"Falla la carga del archivo kickstart %s, se continúa con valores "
"predeterminados"
-#: ../revisor/cfg.py:903
+#: ../revisor/cfg.py:914
#, fuzzy
msgid "No kickstart file specified"
msgstr "ubicacion/archivo-kickstart.cfg"
-#: ../revisor/cfg.py:906 ../revisor/cfg.py:927
+#: ../revisor/cfg.py:917 ../revisor/cfg.py:938
#, fuzzy
msgid "No media specified"
-msgstr "Reproducir el sonido especificado"
+msgstr "No se especificó medio"
-#: ../revisor/cfg.py:909
+#: ../revisor/cfg.py:920
msgid ""
"When composing in respin mode, you can only select one type of media "
"install, live or virtual. You can however select multiple media such as cd, "
@@ -2374,237 +2482,295 @@ msgstr ""
"medio de instalación, vivo o virtual. Puede sin embargo seleccionar medios "
"múltiples, como cd, dvd, etc."
-#: ../revisor/cfg.py:954
+#: ../revisor/cfg.py:965
#, python-format
msgid "pulling self.packages_list[%r][%r][%r][%r]"
msgstr ""
-#: ../revisor/cfg.py:959
+#: ../revisor/cfg.py:970
#, fuzzy, python-format
msgid "returning pkg_list: %r"
-msgstr "Creación de Cuentas de Usuario Adicionales"
+msgstr "regresando pkg_list: %r"
-#: ../revisor/cfg.py:1077
+#: ../revisor/cfg.py:1092
#, fuzzy
msgid "Run from image"
msgstr "Correr desde la imagen"
-#: ../revisor/cfg.py:1078
+#: ../revisor/cfg.py:1093
msgid "Run from RAM - requires 1 GB+"
msgstr "Ejecutar desde la RAM - requiere 1 GB+"
+#: ../revisor/image.py:87
+#, 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
+#, fuzzy
+msgid "Running package installation"
+msgstr "Ejecutando paquete de instalación"
+
+#. self.cfg.yumobj.ts.check()
+#. self.cfg.yumobj.ts.order()
+#: ../revisor/image.py:107
+#, fuzzy
+msgid "Installing Software"
+msgstr "Instalando el Software"
+
+#: ../revisor/image.py:142
+#, fuzzy
+msgid "SELinux requested but not enabled on host"
+msgstr "SELinux pedido pero no habilitado en el sistema anfitrión."
+
+#: ../revisor/image.py:194
+#, python-format
+msgid ""
+"Setting self.cfg.payload_livemedia to %s (from 'part /' command in "
+"kickstart, instead of %s)"
+msgstr ""
+
+#: ../revisor/image.py:199
+#, python-format
+msgid ""
+"Setting self.cfg.payload_livemedia to %s (from total installed size of RPMs, "
+"instead of %s)"
+msgstr ""
+
#. #
#. # Runtime Options
#. #
-#: ../revisor/__init__.py.in:85
+#: ../revisor/__init__.py.in:89
#, fuzzy
msgid "Runtime Options"
-msgstr "Otras opciones:"
+msgstr "Opciones de tiempo de ejecución:"
-#: ../revisor/__init__.py.in:90
+#: ../revisor/__init__.py.in:94
msgid "Use the CLI rather then GUI"
msgstr "Use CLI en vez de GUI"
-#: ../revisor/__init__.py.in:95
-msgid ""
-"Force Revisor to use the GUI. Does not fallback to CLI and thus shows GUI "
-"related errors"
-msgstr ""
-"Forzar a Revisor a que use la GUI. No ir a CLI y así mostrar los errores "
-"relacionados con la GUI"
-
#: ../revisor/__init__.py.in:100
+msgid "Force Revisor to use the "
+msgstr "Force Revisor a usar el "
+
+#: ../revisor/__init__.py.in:101
+msgid "GUI. Does not fallback to "
+msgstr "GUI. No regresar a "
+
+#: ../revisor/__init__.py.in:102
+msgid "CLI and thus shows GUI "
+msgstr "CLI y entonces muestra errores "
+
+#: ../revisor/__init__.py.in:103
+msgid "related errors"
+msgstr "relacionados con el GUI"
+
+#: ../revisor/__init__.py.in:109
msgid "List available models"
-msgstr ""
+msgstr "Lista modelos disponibles"
-#: ../revisor/__init__.py.in:105
+#: ../revisor/__init__.py.in:115
msgid "Development mode. Skips some tasks that take time."
-msgstr ""
+msgstr "Modo de desarrollo. Evita algunas tareas que toman "
+"tiempo"
-#: ../revisor/__init__.py.in:110
+#: ../revisor/__init__.py.in:121
msgid "Report the sizes of all RPMs selected in a list"
-msgstr ""
+msgstr "Reporta los tamaños de todos los RPMs seleccionados "
+"en la lista"
-#: ../revisor/__init__.py.in:115
+#: ../revisor/__init__.py.in:127
msgid ""
"Force Revisor to interpret the package manifest as complete package nevra "
"(name, epoch, version, release and architecture). Implies --kickstart-exact"
msgstr ""
-#: ../revisor/__init__.py.in:120
+#: ../revisor/__init__.py.in:133
msgid ""
"Tells Revisor to ignore @core and @base (or %packages --nobase) and only add "
"what is in the package manifest"
msgstr ""
-#: ../revisor/__init__.py.in:126
+#: ../revisor/__init__.py.in:140
msgid ""
"Should Revisor not clean up at all (0), clean up it's temporary build data "
"(1), or everything -this includes the yum cache (2)"
msgstr ""
-#: ../revisor/__init__.py.in:132
+#: ../revisor/__init__.py.in:147
msgid "Size of the USB Thumb Drive. Default to 4G."
msgstr ""
-#: ../revisor/__init__.py.in:141
+#: ../revisor/__init__.py.in:156
#, fuzzy
msgid "Set debugging level (0 by default)"
msgstr "Cambios a nivel de sistema"
-#: ../revisor/__init__.py.in:150
+#: ../revisor/__init__.py.in:165
msgid "Answer all questions as 'yes'"
msgstr "Responder 'si' a todas las preguntas"
#. #
#. # Configuration Options
#. #
-#: ../revisor/__init__.py.in:155
+#: ../revisor/__init__.py.in:170
#, fuzzy
msgid "Configuration Options"
msgstr "Otras opciones:"
#. Might be disabled for testing purposes
#. default = os.path.join(BASE_CONFD_DIR,"fedora-7-gold.cfg"),
-#: ../revisor/__init__.py.in:162
+#: ../revisor/__init__.py.in:177
#, fuzzy
msgid "Use kickstart file"
msgstr "ubicacion/archivo-kickstart.cfg"
-#: ../revisor/__init__.py.in:168
+#: ../revisor/__init__.py.in:184
msgid "Save options to given file (as a kickstart)"
msgstr ""
-#: ../revisor/__init__.py.in:174
+#: ../revisor/__init__.py.in:191
msgid "Revisor configuration file to use"
msgstr "Archivo de configuración de Revisor a usar"
-#: ../revisor/__init__.py.in:180
+#: ../revisor/__init__.py.in:198
msgid "Get the sources to go with the binaries"
msgstr "Obtener las fuentes que irán con los binarios"
-#: ../revisor/__init__.py.in:185
+#: ../revisor/__init__.py.in:204
msgid "Destination directory for products"
msgstr "Directorio destino para los productos"
-#: ../revisor/__init__.py.in:191
+#: ../revisor/__init__.py.in:211
#, fuzzy
msgid "Working directory"
msgstr "ORGANIZACIÓN DEL DIRECTORIO"
-#: ../revisor/__init__.py.in:197
+#: ../revisor/__init__.py.in:218
msgid "Model to use for composing"
msgstr "Modelo a usar para la composición"
-#: ../revisor/__init__.py.in:203
+#: ../revisor/__init__.py.in:225
msgid "Mode to use for composing updated spins"
msgstr "Modo a usar para componer los spin actualizados"
-#: ../revisor/__init__.py.in:208
+#: ../revisor/__init__.py.in:231
msgid ""
"Sometimes, it's better to copy local data rather then (sym)linking it. If "
"you have enough space..."
msgstr ""
-#: ../revisor/__init__.py.in:213
+#: ../revisor/__init__.py.in:237
msgid "Directory to copy onto the media"
msgstr ""
#. #
#. # Installation Media Options
#. #
-#: ../revisor/__init__.py.in:218
+#: ../revisor/__init__.py.in:242
#, fuzzy
msgid "Installation Media Options"
msgstr "Uso de las Opciones de Arranque"
-#: ../revisor/__init__.py.in:223
+#: ../revisor/__init__.py.in:247
#, fuzzy
msgid "Create Installation Media CDs (Capacity per disc: 685MB)"
msgstr "Crear DVDs de Instalación dual-layered"
-#: ../revisor/__init__.py.in:228
+#: ../revisor/__init__.py.in:253
#, fuzzy
msgid "Create Installation Media DVDs (Capacity per disc: 4.3GB)"
msgstr "discos de instalación CD o DVD"
-#: ../revisor/__init__.py.in:233
+#: ../revisor/__init__.py.in:259
#, fuzzy
msgid "Create Installation Media Dual-Layered DVDs (Capacity per disc: 8.5GB)"
msgstr "Crear DVDs de Instalación dual-layered"
-#: ../revisor/__init__.py.in:238
+#: ../revisor/__init__.py.in:265
+#, fuzzy
+msgid "Create Installation Media Blu-Ray Discs (Capacity per disc: 25GB)"
+msgstr "Crear DVDs de Instalación dual-layered"
+
+#: ../revisor/__init__.py.in:271
#, fuzzy
-msgid "Create Installation Media Blu-Ray Discs (Capacity per disc: 50GB)"
+msgid ""
+"Create Installation Media Duallayer Blu-Ray Discs (Capacity per disc: 50GB)"
msgstr "Crear DVDs de Instalación dual-layered"
-#: ../revisor/__init__.py.in:243
+#: ../revisor/__init__.py.in:277
msgid "Create Unified ISO from install tree"
msgstr "Crear ISO Unificado desde el árbol de instalación"
-#: ../revisor/__init__.py.in:254
+#: ../revisor/__init__.py.in:290
#, fuzzy
msgid "Create the Installation Tree."
msgstr "Guía de Instalación"
-#: ../revisor/__init__.py.in:259
+#: ../revisor/__init__.py.in:296
msgid "Create Media without graphical installer."
msgstr ""
-#: ../revisor/__init__.py.in:264
+#: ../revisor/__init__.py.in:302
#, fuzzy
msgid "Include kickstart file on media or in the tree"
msgstr "Incluir el archivo kickstart en el medio"
-#: ../revisor/__init__.py.in:269
+#: ../revisor/__init__.py.in:308
msgid ""
"In the bootloader menu (isolinux.cfg), set kickstart to boot by default "
"(works with --kickstart-include)"
msgstr ""
-#: ../revisor/__init__.py.in:274
+#: ../revisor/__init__.py.in:314
msgid "Filter anything from comps that is not in the package set"
msgstr ""
-#: ../revisor/__init__.py.in:279
+#: ../revisor/__init__.py.in:320
msgid "Use Revisor's comps file instead of those from the repositories"
msgstr ""
-#: ../revisor/__init__.py.in:284
+#: ../revisor/__init__.py.in:326
#, fuzzy
msgid "Comps file to include on the installation media"
msgstr "Incluir el archivo Kickstart en el Medio de Instalación"
-#: ../revisor/__init__.py.in:289
+#: ../revisor/__init__.py.in:332
msgid "Include specified updates.img on installation media."
msgstr "Incluir el updates.img especificado en el medio de instalación."
-#: ../revisor/__init__.py.in:295
+#: ../revisor/__init__.py.in:339
#, fuzzy
msgid "Product Name"
msgstr "No se especificó un Nombre de Producto"
-#: ../revisor/__init__.py.in:300
+#: ../revisor/__init__.py.in:345
msgid ""
"Product Path (e.g. Fedora/ or Packages/ -but without the appending slash)"
msgstr ""
-#: ../revisor/__init__.py.in:305
+#: ../revisor/__init__.py.in:351
msgid ""
"ISO Label Base. Note that other things are appended but that the length can "
"be 32 chars maximum."
msgstr ""
-#: ../revisor/__init__.py.in:310
+#: ../revisor/__init__.py.in:357
#, fuzzy
msgid "The base name for the ISOs"
msgstr "No se especificó el nombre base para el/los ISO(s)"
-#: ../revisor/__init__.py.in:315
+#: ../revisor/__init__.py.in:363
msgid "Product Version"
msgstr ""
-#: ../revisor/__init__.py.in:320
+#: ../revisor/__init__.py.in:369
msgid ""
"Base Product Version - relevant to required packages and pykickstart "
"compatibility"
@@ -2613,12 +2779,12 @@ msgstr ""
#. #
#. # Utility Media Options
#. #
-#: ../revisor/__init__.py.in:325
+#: ../revisor/__init__.py.in:374
#, fuzzy
msgid "Utility Media Options"
msgstr "Uso de las Opciones de Arranque"
-#: ../revisor/__init__.py.in:330
+#: ../revisor/__init__.py.in:379
#, fuzzy
msgid "Create Rescue Media"
msgstr "Preparación de CD o DVD"
@@ -2626,43 +2792,43 @@ msgstr "Preparación de CD o DVD"
#. #
#. # Live Media Options
#. #
-#: ../revisor/__init__.py.in:335
+#: ../revisor/__init__.py.in:384
#, fuzzy
msgid "Live Media Options"
msgstr "Uso de las Opciones de Arranque"
-#: ../revisor/__init__.py.in:340
+#: ../revisor/__init__.py.in:389
#, fuzzy
msgid "Create Live Media CD/DVD"
msgstr "Preparación de CD o DVD"
-#: ../revisor/__init__.py.in:345
+#: ../revisor/__init__.py.in:395
msgid "Create Live Media Thumb Drive Image (will be depreciated)"
msgstr "Crear Imágen Viva del Disco Pendrive (será eliminada)"
-#: ../revisor/__init__.py.in:350
+#: ../revisor/__init__.py.in:401
msgid "Create Live Media Hard Disk Image (will be depreciated)"
msgstr "Crear Imágen Viva en Disco Rígido (será eliminada)"
-#: ../revisor/__init__.py.in:355
+#: ../revisor/__init__.py.in:407
msgid "Create Live Media Raw Hard Disk Image"
msgstr "Crear Imágen Viva en Disco Rígido Crudo (raw)"
-#: ../revisor/__init__.py.in:360
+#: ../revisor/__init__.py.in:413
msgid "Interactively work in the live image before building the ISO image."
msgstr ""
"Trabajar interactivamente en el medio vivo antes de construir la imágen ISO."
-#: ../revisor/__init__.py.in:365
+#: ../revisor/__init__.py.in:419
#, fuzzy
msgid "Skip file system compression."
msgstr "Utilitarios para el Sistema de Archivos ext3"
-#: ../revisor/__init__.py.in:370
+#: ../revisor/__init__.py.in:425
msgid "Skip prelinking the contents of the filesystem."
msgstr "Omitir preenlace de los contenidos del sistema de archivo."
-#: ../revisor/__init__.py.in:375
+#: ../revisor/__init__.py.in:431
msgid ""
"Ignore filesystem overhead. Useless blocks will not be removed from the "
"filesystem."
@@ -2670,15 +2836,20 @@ msgstr ""
"Ignorar la sobrecarga del sistema de archivo. Los bloques no usados no se "
"eliminarán del sistema de archivo."
-#: ../revisor/__init__.py.in:380
+#: ../revisor/__init__.py.in:437
msgid "Set the preferred kernel. One of normal, PAE, xen or debug."
msgstr "Configurar el kernel preferido. Uno entre normal, PAE, xen o debug."
-#: ../revisor/__init__.py.in:441
+#: ../revisor/__init__.py.in:478
+#, fuzzy, python-format
+msgid " %s - No Description"
+msgstr "Descripción:"
+
+#: ../revisor/__init__.py.in:504
msgid "Interrupted by user"
msgstr ""
-#: ../revisor/__init__.py.in:448
+#: ../revisor/__init__.py.in:510
msgid ""
"Traceback occurred, please report a bug at http://fedorahosted.org/revisor"
msgstr ""
@@ -2702,119 +2873,139 @@ msgstr "desea romper el existente"
msgid "Abort! Abort! Abort!"
msgstr "¡Abortar! ¡Abortar! ¡Abortar!"
-#: ../revisor/image.py:87
-#, python-format
+#: ../revisor/misc.py:39
+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:50
msgid ""
-"Error encountered during installation of the software you selected:\n"
-"\n"
-"%s"
+"SELinux is in enforcing mode on this host. Composing media will fail. Please "
+"set SELinux to permissive mode."
msgstr ""
-"Error encontrado durante la instalación del software que seleccionó:\n"
-"\n"
-"%s"
-
-#: ../revisor/image.py:93
-#, fuzzy
-msgid "Running package installation"
-msgstr "Nombre de la documentación de instalación"
-
-#. self.cfg.yumobj.ts.check()
-#. self.cfg.yumobj.ts.order()
-#: ../revisor/image.py:107
-#, fuzzy
-msgid "Installing Software"
-msgstr "Instalando el Software al Medio Vivo"
-#: ../revisor/image.py:142
-#, fuzzy
-msgid "SELinux requested but not enabled on host"
-msgstr "SELinux pedido pero no habilitado en el sistema anfitrión."
+#: ../revisor/misc.py:55
+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 ""
-#: ../revisor/image.py:194
+#: ../revisor/misc.py:141 ../revisor/misc.py:148
#, python-format
-msgid ""
-"Setting self.cfg.payload_livemedia to %s (from 'part /' command in "
-"kickstart, instead of %s)"
+msgid "Resolved %s"
msgstr ""
-#: ../revisor/image.py:199
+#: ../revisor/misc.py:151
#, python-format
msgid ""
-"Setting self.cfg.payload_livemedia to %s (from total installed size of RPMs, "
-"instead of %s)"
+"Looking to resolve package %s to a Provides, but we still can't find it."
msgstr ""
-#: ../revisor/pkgorder.py:135
+#. If the group is not in the kickstart groups, skip it
+#. if not group in self.cfg.ksobj._get("packages","groupList"):
+#. continue
+#: ../revisor/pkgorder.py:85
+#, fuzzy, python-format
+msgid "Adding group: %s"
+msgstr "no encontrado"
+
+#: ../revisor/pkgorder.py:93
+#, fuzzy, python-format
+msgid "Adding conditional: %s / %s"
+msgstr "Prueba de los Discos"
+
+#: ../revisor/pkgorder.py:96
+#, fuzzy, python-format
+msgid "The following packages are in group %s: %r"
+msgstr "Seleccionando los paquetes predeterminados del grupo %s"
+
+#: ../revisor/pkgorder.py:103
+#, fuzzy, python-format
+msgid "Adding %s-%s:%s-%s.%s to transaction"
+msgstr "Desde los Grupos --optional: Agregando %s-%s:%s-%s.%s a la transacción"
+
+#: ../revisor/pkgorder.py:110
+#, fuzzy, python-format
+msgid "%d dependencies already resolved"
+msgstr "carta(s) agregadas"
+
+#: ../revisor/pkgorder.py:120
+#, fuzzy, python-format
+msgid "Adding package(s): %r"
+msgstr "Instalación de Paquetes"
+
+#: ../revisor/pkgorder.py:165
#, python-format
msgid "Unable to create yum configuration file for package ordering at %s"
msgstr ""
-#: ../revisor/pkgorder.py:154
+#: ../revisor/pkgorder.py:173
#, fuzzy, python-format
msgid "-> package %s"
msgstr "Paquetes"
-#: ../revisor/plugins.py:57 ../revisor/plugins.py:74
+#: ../revisor/plugins.py:60 ../revisor/plugins.py:77
#, fuzzy, python-format
msgid "Plugin %s failed to load (%s: %s)"
msgstr "No se puede cargar el archivo kickstart %s"
-#: ../revisor/plugins.py:68
+#: ../revisor/plugins.py:71
#, python-format
msgid "ImportError for plugin %s: %s"
msgstr ""
-#: ../revisor/plugins.py:71
+#: ../revisor/plugins.py:74
#, fuzzy, python-format
msgid "RuntimeError for plugin %s: %s"
msgstr "Error de ejecución al iniciar GUI: %s"
-#: ../revisor/plugins.py:91 ../revisor/plugins.py:93
+#: ../revisor/plugins.py:94 ../revisor/plugins.py:96
#, python-format
msgid "Cannot set defaults for plugin %s: %s"
msgstr ""
-#: ../revisor/plugins.py:95
+#: ../revisor/plugins.py:98
#, python-format
msgid "Cannot set defaults for plugin %s: Unknown Error"
msgstr ""
-#: ../revisor/plugins.py:98
+#: ../revisor/plugins.py:101
#, python-format
msgid "Not setting defaults for plugin %s: No function 'set_defaults()'"
msgstr ""
-#: ../revisor/plugins.py:115
+#: ../revisor/plugins.py:118
#, python-format
msgid "Cannot set runtime for plugin %s: %s"
msgstr ""
-#: ../revisor/plugins.py:117
+#: ../revisor/plugins.py:120
#, python-format
msgid "Not setting runtime for plugin %s: No function 'set_runtime()'"
msgstr ""
-#: ../revisor/plugins.py:134
+#: ../revisor/plugins.py:137
#, python-format
msgid "Cannot add options for plugin %s: %s"
msgstr ""
-#: ../revisor/plugins.py:136
+#: ../revisor/plugins.py:139
#, python-format
msgid "Not adding options for plugin %s: No function 'add_options()'"
msgstr ""
-#: ../revisor/plugins.py:154
+#: ../revisor/plugins.py:157
#, python-format
msgid "Cannot check options for plugin %s: %s"
msgstr ""
-#: ../revisor/plugins.py:156
+#: ../revisor/plugins.py:159
#, python-format
msgid "Not checking options for plugin %s: No function 'check_options()'"
msgstr ""
-#: ../revisor/plugins.py:192
+#: ../revisor/plugins.py:195
#, python-format
msgid "Cannot execute hook %s for plugin %s: %s"
msgstr ""
@@ -2904,102 +3095,117 @@ msgstr "Borrado: %s"
msgid "%s: %s"
msgstr "Borrado: %s"
-#: ../revisor/pungi.py:62
+#: ../revisor/pungi.py:61
#, python-format
msgid "Error: Cannot create destination dir %s"
msgstr "Error: No se puede crear directorio destino %s"
-#: ../revisor/pungi.py:68
+#: ../revisor/pungi.py:67
#, python-format
msgid "Error: Cannot remove destination dir %s"
msgstr "Error: no se puede eliminar directorio destino %s"
-#: ../revisor/pungi.py:73
+#: ../revisor/pungi.py:72
#, python-format
msgid "Error: Cannot recreate destination dir %s"
msgstr "Error: No se puede recrear directorio destino %s"
-#: ../revisor/pungi.py:340
+#: ../revisor/pungi.py:342
#, fuzzy
msgid "Getting relnotes..."
msgstr "OBTENIENDO AYUDA"
-#: ../revisor/pungi.py:361
+#: ../revisor/pungi.py:363
#, python-format
msgid "An error occured extracting the release files: %s"
msgstr "Un error ocurrió al extraer los archivos de versión: %s"
-#: ../revisor/pungi.py:370
+#: ../revisor/pungi.py:372
#, python-format
msgid "Copying %s"
msgstr "Copiando %s"
-#: ../revisor/pungi.py:387
+#: ../revisor/pungi.py:378
+#, fuzzy, python-format
+msgid "Copying release note file %s"
+msgstr "Notas de la Versión de Fedora Core 6"
+
+#: ../revisor/pungi.py:382
+#, fuzzy, python-format
+msgid "File %s not readable"
+msgstr "No se pudo leer el archivo kickstart %s."
+
+#: ../revisor/pungi.py:392
#, python-format
msgid "Could not access directory %s, cannot copy extra files onto the media."
msgstr ""
"No se pudo acceder al directorio %s, no se pueden copiar los archivos extra "
"en el medio."
-#: ../revisor/pungi.py:393
+#: ../revisor/pungi.py:398
#, python-format
msgid "Could not create files/ directory: %s"
msgstr "No se puede crear archivos / directorio: %s"
-#: ../revisor/pungi.py:404
+#: ../revisor/pungi.py:409
#, python-format
msgid "Creating %s"
msgstr "Creando %s"
-#: ../revisor/pungi.py:452
+#: ../revisor/pungi.py:460
#, python-format
msgid "Disc %s #%d is oversized (%r > %r)"
msgstr ""
-#: ../revisor/pungi.py:456
+#: ../revisor/pungi.py:464
#, fuzzy, python-format
msgid "Removing tree %s"
msgstr "a esto:"
-#: ../revisor/pungi.py:464
+#: ../revisor/pungi.py:472
#, python-format
msgid "Disc %s #%d is OK in size (%r <= %r)"
msgstr ""
-#: ../revisor/pungi.py:515
+#: ../revisor/pungi.py:523
msgid ""
"Hacking anaconda's .discinfo because it'll shit itself if it reads it's own "
"output"
msgstr ""
-#: ../revisor/modcobbler/__init__.py:69 ../revisor/modcobbler/__init__.py:218
-#: ../revisor/modcobbler/__init__.py:255
+#: ../revisor/modcobbler/__init__.py:69 ../revisor/modcobbler/__init__.py:219
+#: ../revisor/modcobbler/__init__.py:256
#, python-format
msgid "There is a problem connecting to %s"
msgstr ""
-#: ../revisor/modcobbler/__init__.py:82
+#: ../revisor/modcobbler/__init__.py:83
#, python-format
msgid ""
" Distro: %s\n"
" Existing Profiles:"
msgstr ""
-#: ../revisor/modcobbler/__init__.py:84
+#: ../revisor/modcobbler/__init__.py:83
+#, fuzzy
+msgid "name"
+msgstr "Nombre:"
+
+#: ../revisor/modcobbler/__init__.py:85
#, python-format
msgid " Profile: %s"
msgstr ""
-#: ../revisor/modcobbler/__init__.py:86
+#: ../revisor/modcobbler/__init__.py:87
#, fuzzy
msgid "No listing found on cobbler server."
msgstr "Usar un servidor cobbler remoto."
-#: ../revisor/modcobbler/__init__.py:103
+#: ../revisor/modcobbler/__init__.py:104
msgid "Add compose to a Cobbler server as both a Distribution and Profile."
msgstr "Agregar compose a un servidor Cobbler como Distribución y Perfil."
-#: ../revisor/modcobbler/__init__.py:110
+#: ../revisor/modcobbler/__init__.py:111
msgid ""
"Add compose options as a Profile to a Cobbler server. [Requires --cobbler-"
"use-distro]"
@@ -3007,29 +3213,29 @@ msgstr ""
"Agregar opciones de compose como un Perfil a un servidor Cobbler. [Requiere "
"--cobbler-use-distro]"
-#: ../revisor/modcobbler/__init__.py:117
+#: ../revisor/modcobbler/__init__.py:118
#, fuzzy
msgid "Use a Cobbler distro as source for package data."
msgstr "Usar una distro Cobbler como fuente para paquetes."
-#: ../revisor/modcobbler/__init__.py:124
+#: ../revisor/modcobbler/__init__.py:125
msgid "Use a Cobbler profile as source for kickstart data."
msgstr "Usar un perfil Cobbler como fuente para datos kickstart."
-#: ../revisor/modcobbler/__init__.py:131
+#: ../revisor/modcobbler/__init__.py:132
msgid "List options provided by cobbler."
msgstr "Listar las opciones provistas por cobbler."
-#: ../revisor/modcobbler/__init__.py:137
+#: ../revisor/modcobbler/__init__.py:138
msgid "Use remote cobbler server."
msgstr "Usar un servidor cobbler remoto."
-#: ../revisor/modcobbler/__init__.py:143
+#: ../revisor/modcobbler/__init__.py:144
#, fuzzy
msgid "Remote cobbler server port."
msgstr "Usar un servidor cobbler remoto."
-#: ../revisor/modcobbler/__init__.py:200
+#: ../revisor/modcobbler/__init__.py:201
msgid ""
"Specifying a Cobbler server is only supported for read-only actions. "
"Currently, --cobbler-use-distro and --cobbler-use-profile."
@@ -3038,12 +3244,12 @@ msgstr ""
"acciones de sólo lectura. Actualmente, --cobbler-use-distro y --cobbler-use-"
"profile."
-#: ../revisor/modcobbler/__init__.py:225
+#: ../revisor/modcobbler/__init__.py:226
#, fuzzy, python-format
msgid "The distro '%s' does not exist."
msgstr "archivo vacio: la url no existe"
-#: ../revisor/modcobbler/__init__.py:239 ../revisor/modcobbler/__init__.py:262
+#: ../revisor/modcobbler/__init__.py:240 ../revisor/modcobbler/__init__.py:263
#, fuzzy, python-format
msgid "The profile '%s' does not exist."
msgstr "archivo vacio: la url no existe"
@@ -3572,26 +3778,114 @@ msgstr "No se encontraron coincidencias. :-("
msgid "Unable to find comps file. No comps no glory"
msgstr "No se pudo encontrar el archivo comps. Sin comps no hay gloria"
-#: ../revisor/modrebrand/__init__.py:79
+#: ../revisor/modisolinux/__init__.py:48
+msgid "Custom isolinux.cfg to replace the standard isolinux.cfg with."
+msgstr ""
+
+#: ../revisor/modisolinux/__init__.py:57 ../revisor/modisolinux/__init__.py:64
+msgid ""
+"Both --kickstart-default and --isolinux-cfg have been specified, while they "
+"are mutually exclusive. --isolinux-cfg is going to be used."
+msgstr ""
+
+#: ../revisor/modisolinux/__init__.py:73
#, fuzzy, python-format
-msgid "Removing package %s-%s:%s-%s.%s for rebranding"
-msgstr "Desde los Paquetes: Agregando %s-%s:%s-%s.%s a la transacción"
+msgid "File %s is not readable"
+msgstr "Esta impresora compartida no es accesible."
+
+#: ../revisor/modisolinux/__init__.py:78
+msgid "How come isolinux_cfg is set to False?"
+msgstr ""
+
+#: ../revisor/modisolinux/__init__.py:81
+msgid "How come isolinux_cfg is an empty string?"
+msgstr ""
+
+#: ../revisor/modisolinux/__init__.py:84
+#, python-format
+msgid "Going to replace isolinux/isolinux.cfg with %s"
+msgstr ""
+
+#: ../revisor/modisolinux/__init__.py:87
+msgid "Deleted the old isolinux.cfg"
+msgstr ""
+
+#: ../revisor/modisolinux/__init__.py:90
+msgid "Inserted the new isolinux.cfg"
+msgstr ""
+
+#: ../revisor/modisolinux/__init__.py:92
+msgid "Could not copy in the new isolinux.cfg"
+msgstr ""
+
+#: ../revisor/modisolinux/__init__.py:94
+msgid "Could not unlink the old isolinux.cfg?"
+msgstr ""
+
+#: ../revisor/modisolinux/__init__.py:96
+msgid "Not replacing isolinux.cfg"
+msgstr ""
-#: ../revisor/modrebrand/__init__.py:91
+#: ../revisor/modrebrand/__init__.py:43
+msgid "Not rebranding pre_resolve_dependencies"
+msgstr ""
+
+#: ../revisor/modrebrand/__init__.py:57
+#, fuzzy, python-format
+msgid "Adding %s-%s-%s.%s"
+msgstr "Agregando"
+
+#: ../revisor/modrebrand/__init__.py:60
+#, fuzzy, python-format
+msgid "Removing %s-%s-%s.%s"
+msgstr "Agregando"
+
+#: ../revisor/modrebrand/__init__.py:77
msgid ""
"Rebrand name. Revisor will select <name>-logos, <name>-release and <name>-"
"release-notes packages, if available."
msgstr ""
-#: ../revisor/modserver/__init__.py:88
+#: ../revisor/modrebrand/__init__.py:85
+#, fuzzy, python-format
+msgid "Setting rebrand to %s"
+msgstr "¡Bienvenido a Fedora!"
+
+#: ../revisor/modreuseinstaller/__init__.py:48
+msgid "The URI to a tree we're supposed to reuse the installer images from."
+msgstr ""
+
+#: ../revisor/modreuseinstaller/__init__.py:67
+#, python-format
+msgid ""
+"Could not access %s/%s, required for reusing a previous tree. Cancelling the "
+"reuse of installer images"
+msgstr ""
+
+#: ../revisor/modreuseinstaller/__init__.py:85
+#, fuzzy, python-format
+msgid "Copying %s/%s to %s/%s"
+msgstr "a esto:"
+
+#: ../revisor/modreuseinstaller/__init__.py:88
+#, fuzzy, python-format
+msgid "Copying %s/.discinfo to %s/.discinfo"
+msgstr "a esto:"
+
+#: ../revisor/modreuseinstaller/__init__.py:91
+#, fuzzy, python-format
+msgid "Copying %s/.treeinfo to %s/.treeinfo"
+msgstr "a esto:"
+
+#: ../revisor/modserver/__init__.py:87
msgid "Use the server mode for XML-RPC"
msgstr ""
-#: ../revisor/modserver/__init__.py:93
+#: ../revisor/modserver/__init__.py:92
msgid "Port to start Server on."
msgstr ""
-#: ../revisor/modserver/__init__.py:99
+#: ../revisor/modserver/__init__.py:98
msgid "Start the XML-RPC server and fork."
msgstr ""
@@ -3671,10 +3965,40 @@ msgstr "mount /mnt/cdrom"
msgid "Starting the virtual guest provision..."
msgstr ""
+#: ../revisor/modwui/modwui/controllers.py:75
+#, python-format
+msgid "The path %s cannot be found"
+msgstr ""
+
+#: ../revisor/modwui/modwui/grids.py:22
+#, fuzzy
+msgid "Name"
+msgstr "Nombre:"
+
+#: ../revisor/modwui/modwui/grids.py:23
+#, fuzzy
+msgid "Description"
+msgstr "Descripción:"
+
+#: ../revisor/modwui/modwui/options.py:90
+msgid "Submit"
+msgstr ""
+
#: ../conf/revisor.desktop.in.h:2
msgid "Revisor, Pimp your distro"
msgstr ""
+#~ msgid ""
+#~ "Force Revisor to use the GUI. Does not fallback to CLI and thus shows GUI "
+#~ "related errors"
+#~ msgstr ""
+#~ "Forzar a Revisor a que use la GUI. No ir a CLI y así mostrar los errores "
+#~ "relacionados con la GUI"
+
+#, fuzzy
+#~ msgid "Removing package %s-%s:%s-%s.%s for rebranding"
+#~ msgstr "Desde los Paquetes: Agregando %s-%s:%s-%s.%s a la transacción"
+
#~ msgid "Root passwords do not match."
#~ msgstr "Las contraseñas de root no coinciden."
@@ -3689,9 +4013,6 @@ msgstr ""
#~ msgid "Adding req. pkg %s-%s:%s-%s.%s"
#~ msgstr "Agregandos paq. req. %s-%s:%s-%s.%s"
-#~ msgid "This tool has to run with root privileges. Aborting"
-#~ msgstr "Esta herramienta debe correr con los privilegios de root. Abortando"
-
#, fuzzy
#~ msgid "Create Installation Media CDs"
#~ msgstr "discos de instalación CD o DVD"
@@ -4091,22 +4412,6 @@ msgstr ""
#~ msgid "Installation target minimized to %dK"
#~ msgstr "El destino de instalación se minimizó a %d K"
-#~ msgid ""
-#~ "These could be as simple as 'noacpi' to disable advanced power control,"
-#~ msgstr ""
-#~ "Estos pueden ser tan simples como 'noacpi' para deshabilitar el control "
-#~ "avanzado de energía,"
-
-#~ msgid "or any other relevant kernel parameters."
-#~ msgstr "o cualquier otro parámetro de kernel relevante."
-
-#~ msgid "In most situations, the default should suffice."
-#~ msgstr "En la mayoría de las situaciones, el predeterminado debe alcanzar."
-
-#, fuzzy
-#~ msgid "Configure Yum Repositories"
-#~ msgstr "yum (duke.edu)"
-
#, fuzzy
#~ msgid "configuration for '%s'"
#~ msgstr "Una consola especial para la configuración"
commit 392165c2fa9e4a03c7fc77665c86d121fe884311
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Tue Feb 24 21:07:34 2009 +0100
Package not available on ppc
diff --git a/unity/scripts/respin.sh b/unity/scripts/respin.sh
index 55ede26..abfb7de 100755
--- a/unity/scripts/respin.sh
+++ b/unity/scripts/respin.sh
@@ -52,7 +52,7 @@ fi
revisor_deps="comps-extras createrepo rhpl pykickstart livecd-tools
anaconda squashfs-tools busybox-anaconda notify-python usermode
pam python automake intltool gettext desktop-file-utils glib2-devel gcc
- cobbler koan deltarpm pygtk2-libglade gnome-python2-gconf
+ koan deltarpm pygtk2-libglade gnome-python2-gconf
system-config-kickstart jigdo livecd-tools python-virtinst git sudo
spin-kickstarts mock yum-utils"
commit 9ca63661e2040ce799495664254908a6b7e4e7ee
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Tue Feb 24 17:43:16 2009 +0100
Fix a minor bug in the destination directory when pressing "Back"
diff --git a/revisor/modgui/configuration.py b/revisor/modgui/configuration.py
index 145ef29..7add296 100644
--- a/revisor/modgui/configuration.py
+++ b/revisor/modgui/configuration.py
@@ -406,6 +406,10 @@ class RevisorConfiguration:
widget_rc.set_text(self.cfg.config)
widget_dd = self.gui.frame_xml.get_widget("entry_destination_directory")
+
+ if self.cfg.model:
+ self.cfg.destination_directory = self.cfg.destination_directory.replace("/%s" % self.cfg.model,"")
+
widget_dd.set_text(self.cfg.destination_directory)
self.load_models()
commit efe9566b7d1bb171aa5859bdaa0933c409a4170c
Merge: c473fac... 6cf2d2f...
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Feb 23 23:04:31 2009 +0100
Merge branch 'master' of git://git.fedorahosted.org/revisor
commit 6cf2d2f6600c1a9a8d77e21983c76e050452d7b7
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Feb 23 23:03:45 2009 +0100
Update respin script
diff --git a/unity/scripts/respin.sh b/unity/scripts/respin.sh
index 9a8353b..55ede26 100755
--- a/unity/scripts/respin.sh
+++ b/unity/scripts/respin.sh
@@ -173,7 +173,7 @@ for version in $VERSIONS; do
${revisor_cmd} --config /etc/revisor-unity/f$version-live-respin.conf \
--model $spin --debug 9 --clean-up $cleanup \
--destination-directory /srv/revisor/$datestamp/ \
- --report-sizes 2>&1 | tee revisor-$spin.log
+ --report-sizes > revisor-$spin.log 2>&1
[ $? -gt 0 ] && \
printf "Spin $spin failed, log file attached.$MESSAGE_END" "$datestamp" "$spin" \
@@ -213,7 +213,7 @@ for version in $VERSIONS; do
#
sudo rm -rf /srv/revisor/$datestamp/f$version-$arch-respin/log/
- echo -en "cd /revisor; ./revisor.py --cli --config /etc/revisor-unity/f$version-install-respin.conf --destination-directory /srv/revisor/$datestamp/ --model f$version-$arch-respin --debug 9 --clean-up $cleanup\n" | mock -r fedora-$version-$arch shell | tee -a revisor-f$version-$arch-respin.log
+ echo -en "cd /revisor; ./revisor.py --cli --config /etc/revisor-unity/f$version-install-respin.conf --destination-directory /srv/revisor/$datestamp/ --model f$version-$arch-respin --debug 9 --clean-up $cleanup\n" | mock -r fedora-$version-$arch shell >> revisor-f$version-$arch-respin.log 2>&1
[ $? -gt 0 ] && \
printf "Spin f$version-$arch-respin failed, log file attached.$MESSAGE_END" "$datestamp" "f$version-$arch-respin" \
commit c473facdc2ba8328f3c8a4e0c0808c3ce6b1332a
Merge: 0c0c857... d0afa86...
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Feb 23 22:54:32 2009 +0100
Merge branch 'master' of git://git.fedorahosted.org/revisor
commit d0afa868b8f733233ff64aa85273452014781088
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Feb 23 21:02:52 2009 +0100
Add models for localized spins
diff --git a/unity/conf/f10-live-respin.conf b/unity/conf/f10-live-respin.conf
index 61a5e23..1731c9c 100644
--- a/unity/conf/f10-live-respin.conf
+++ b/unity/conf/f10-live-respin.conf
@@ -6,11 +6,11 @@
##
[revisor]
-media_installation_dvd = 1
-media_installation_cd = 1
-media_installation_tree = 1
-media_utility_rescue = 1
-media_live_optical = 0
+media_installation_dvd = 0
+media_installation_cd = 0
+media_installation_tree = 0
+media_utility_rescue = 0
+media_live_optical = 1
media_live_thumb = 0
dependency_resolve_allow_conflicts = 1
@@ -22,655 +22,970 @@ answer_yes = 1
getsource = 1
bugurl = http://bugzilla.redhat.com
-##
-## Models
-##
-
-[f10-i386-live-desktop-default-respin]
-description = Fedora Unity Live Desktop Re-Spin Model for Fedora (Rawhide)
-main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-desktop-respin.conf
-product_name = Fedora
-product_path = Packages
-iso_basename = Fedora-Unity-Desktop-$datestamp
-iso_label = FU Live $datestamp
-architecture = i386
version = 10
version_from = F10
-kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-desktop-default.ks
kickstart_uses_pkgsack_exclude = 1
-media_installation_dvd=0
-media_installation_cd=0
-media_installation_tree=0
-media_utility_rescue=0
-media_live_optical=1
+
+##
+## Models
+##
[f10-i386-live-aos-respin]
description = Fedora Unity Live AOS Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-aos-respin.conf
-product_name = Fedora
-product_path = Packages
iso_basename = Fedora-Unity-AOS-$datestamp
iso_label = FU Live $datestamp
architecture = i386
-version = 10
-version_from = F10
kickstart_file = /usr/share/spin-kickstarts/fedora-aos.ks
-kickstart_uses_pkgsack_exclude = 1
-media_installation_dvd=0
-media_installation_cd=0
-media_installation_tree=0
-media_utility_rescue=0
-media_live_optical=1
[f10-i386-live-broffice.org-respin]
description = Fedora Unity Live BrOffice.Org Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-broffice.org-respin.conf
-product_name = Fedora
-product_path = Packages
iso_basename = Fedora-Unity-BrOffice.Org-$datestamp
iso_label = FU Live $datestamp
architecture = i386
-version = 10
-version_from = F10
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-broffice.org.ks
-kickstart_uses_pkgsack_exclude = 1
-media_installation_dvd=0
-media_installation_cd=0
-media_installation_tree=0
-media_utility_rescue=0
-media_live_optical=1
+
+[f10-i386-live-desktop-default-respin]
+description = Fedora Unity Live Desktop Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-desktop-respin.conf
+iso_basename = Fedora-Unity-Desktop-$datestamp
+iso_label = FU Live $datestamp
+architecture = i386
+kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-desktop-default.ks
+
+[f10-i386-live-desktop-de_CH-respin]
+description = Fedora Unity Live Desktop de_CH Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-desktop-respin.conf
+iso_basename = Fedora-Unity-Desktop-de_CH-$datestamp
+iso_label = FU Live $datestamp
+architecture = i386
+kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-desktop-de_CH.ks
+
+[f10-i386-live-desktop-de_DE-respin]
+description = Fedora Unity Live Desktop de_DE Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-desktop-respin.conf
+iso_basename = Fedora-Unity-Desktop-de_DE-$datestamp
+iso_label = FU Live $datestamp
+architecture = i386
+kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-desktop-de_DE.ks
+
+[f10-i386-live-desktop-nl_NL-respin]
+description = Fedora Unity Live Desktop nl_NL Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-desktop-respin.conf
+iso_basename = Fedora-Unity-Desktop-nl_NL-$datestamp
+iso_label = FU Live $datestamp
+architecture = i386
+kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-desktop-nl_NL.ks
+
+[f10-i386-live-desktop-pt_BR-respin]
+description = Fedora Unity Live Desktop pt_BR Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-desktop-respin.conf
+iso_basename = Fedora-Unity-Desktop-pt_BR-$datestamp
+iso_label = FU Live $datestamp
+architecture = i386
+kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-desktop-pt_BR.ks
+
+[f10-i386-live-desktop-pt_PT-respin]
+description = Fedora Unity Live Desktop pt_PT Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-desktop-respin.conf
+iso_basename = Fedora-Unity-Desktop-pt_PT-$datestamp
+iso_label = FU Live $datestamp
+architecture = i386
+kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-desktop-pt_PT.ks
[f10-i386-live-developer-respin]
description = Fedora Unity Live Developer Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-developer-respin.conf
-product_name = Fedora
-product_path = Packages
iso_basename = Fedora-Unity-Developer-$datestamp
iso_label = FU Live Developer $datestamp
architecture = i386
-version = 10
-version_from = F10
kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-developer.ks
-kickstart_uses_pkgsack_exclude = 1
-media_installation_dvd=0
-media_installation_cd=0
-media_installation_tree=0
-media_utility_rescue=0
-media_live_optical=1
+
+[f10-i386-live-developer-de_CH-respin]
+description = Fedora Unity Live Developer de_CH Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-developer-respin.conf
+iso_basename = Fedora-Unity-Developer-de_CH-$datestamp
+iso_label = FU Live Developer $datestamp
+architecture = i386
+kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-developer-de_CH.ks
+
+[f10-i386-live-developer-nl_NL-respin]
+description = Fedora Unity Live Developer nl_NL Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-developer-respin.conf
+iso_basename = Fedora-Unity-Developer-nl_NL-$datestamp
+iso_label = FU Live Developer $datestamp
+architecture = i386
+kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-developer-nl_NL.ks
+
+[f10-i386-live-developer-pt_PT-respin]
+description = Fedora Unity Live Developer pt_PT Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-developer-respin.conf
+iso_basename = Fedora-Unity-Developer-pt_PT-$datestamp
+iso_label = FU Live Developer $datestamp
+architecture = i386
+kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-developer-pt_PT.ks
[f10-i386-live-education-math-respin]
description = Fedora Unity Live Education Math Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-education-math-respin.conf
-product_name = Fedora
-product_path = Packages
iso_basename = Fedora-Unity-Education-Math-$datestamp
iso_label = FU Live E-Math $datestamp
architecture = i386
-version = 10
-version_from = F10
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-education-math.ks
-kickstart_uses_pkgsack_exclude = 1
-media_installation_dvd=0
-media_installation_cd=0
-media_installation_tree=0
-media_utility_rescue=0
-media_live_optical=1
[f10-i386-live-electronic-lab-respin]
description = Fedora Unity Live Electronic Lab DVD Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-electronic-lab-respin.conf
-product_name = Fedora
-product_path = Packages
iso_basename = Fedora-Unity-EL-$datestamp
iso_label = FU Live EL $datestamp
architecture = i386
-version = 10
-version_from = F10
kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-electronic-lab.ks
-kickstart_uses_pkgsack_exclude = 1
-media_installation_dvd=0
-media_installation_cd=0
-media_installation_tree=0
-media_utility_rescue=0
-media_live_optical=1
+
+[f10-i386-live-electronic-de_CH-lab-respin]
+description = Fedora Unity Live Electronic Lab de_CH DVD Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-electronic-lab-respin.conf
+iso_basename = Fedora-Unity-EL-de_CH-$datestamp
+iso_label = FU Live EL $datestamp
+architecture = i386
+kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-electronic-lab-de_CH.ks
+
+[f10-i386-live-electronic-nl_NL-lab-respin]
+description = Fedora Unity Live Electronic Lab nl_NL DVD Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-electronic-lab-respin.conf
+iso_basename = Fedora-Unity-EL-nl_NL-$datestamp
+iso_label = FU Live EL $datestamp
+architecture = i386
+kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-electronic-lab-nl_NL.ks
+
+[f10-i386-live-electronic-pt_PT-lab-respin]
+description = Fedora Unity Live Electronic Lab pt_PT DVD Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-electronic-lab-respin.conf
+iso_basename = Fedora-Unity-EL-pt_PT-$datestamp
+iso_label = FU Live EL $datestamp
+architecture = i386
+kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-electronic-lab-pt_PT.ks
[f10-i386-live-games-respin]
description = Fedora Unity Live Games Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-games-respin.conf
-product_name = Fedora
-product_path = Packages
iso_basename = Fedora-Unity-Games-$datestamp
iso_label = FU Live Games $datestamp
architecture = i386
-version = 10
-version_from = F10
kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-games.ks
-kickstart_uses_pkgsack_exclude = 1
-media_installation_dvd=0
-media_installation_cd=0
-media_installation_tree=0
-media_utility_rescue=0
-media_live_optical=1
+
+[f10-i386-live-games-de_CH-respin]
+description = Fedora Unity Live Games de_CH Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-games-respin.conf
+iso_basename = Fedora-Unity-Games-de_CH-$datestamp
+iso_label = FU Live Games $datestamp
+architecture = i386
+kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-games-de_CH.ks
+
+[f10-i386-live-games-nl_NL-respin]
+description = Fedora Unity Live Games nl_NL Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-games-respin.conf
+iso_basename = Fedora-Unity-Games-nl_NL-$datestamp
+iso_label = FU Live Games $datestamp
+architecture = i386
+kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-games-nl_NL.ks
+
+[f10-i386-live-games-pt_PT-respin]
+description = Fedora Unity Live Games pt_PT Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-games-respin.conf
+iso_basename = Fedora-Unity-Games-pt_PT-$datestamp
+iso_label = FU Live Games $datestamp
+architecture = i386
+kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-games-pt_PT.ks
[f10-i386-live-kde-respin]
description = Fedora Unity Live KDE Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-kde-respin.conf
-product_name = Fedora
-product_path = Packages
iso_basename = Fedora-Unity-KDE-$datestamp
iso_label = FU Live KDE $datestamp
architecture = i386
-version = 10
-version_from = F10
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-kde.ks
-kickstart_uses_pkgsack_exclude = 1
-media_installation_dvd=0
-media_installation_cd=0
-media_installation_tree=0
-media_utility_rescue=0
-media_live_optical=1
+
+[f10-i386-live-kde-de_CH-respin]
+description = Fedora Unity Live KDE de_CH Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-kde-respin.conf
+iso_basename = Fedora-Unity-KDE-de_CH-$datestamp
+iso_label = FU Live KDE $datestamp
+architecture = i386
+kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-kde-de_CH.ks
+
+[f10-i386-live-kde-de_DE-respin]
+description = Fedora Unity Live KDE de_DE Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-kde-respin.conf
+iso_basename = Fedora-Unity-KDE-de_DE-$datestamp
+iso_label = FU Live KDE $datestamp
+architecture = i386
+kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-kde-de_DE.ks
+
+[f10-i386-live-kde-nl_NL-respin]
+description = Fedora Unity Live KDE nl_NL Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-kde-respin.conf
+iso_basename = Fedora-Unity-KDE-nl_NL-$datestamp
+iso_label = FU Live KDE $datestamp
+architecture = i386
+kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-kde-nl_NL.ks
+
+[f10-i386-live-kde-pt_PT-respin]
+description = Fedora Unity Live KDE pt_PT Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-kde-respin.conf
+iso_basename = Fedora-Unity-KDE-pt_PT-$datestamp
+iso_label = FU Live KDE $datestamp
+architecture = i386
+kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-kde-pt_PT.ks
[f10-i386-live-xfce-respin]
description = Fedora Unity Live XFCE Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-xfce-respin.conf
-product_name = Fedora
-product_path = Packages
iso_basename = Fedora-Unity-XFCE-$datestamp
iso_label = FU Live XFCE $datestamp
architecture = i386
-version = 10
-version_from = F10
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-xfce.ks
-kickstart_uses_pkgsack_exclude = 1
-media_installation_dvd=0
-media_installation_cd=0
-media_installation_tree=0
-media_utility_rescue=0
-media_live_optical=1
+
+[f10-i386-live-xfce-de_CH-respin]
+description = Fedora Unity Live XFCE de_CH Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-xfce-respin.conf
+iso_basename = Fedora-Unity-XFCE-de_CH-$datestamp
+iso_label = FU Live XFCE $datestamp
+architecture = i386
+kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-xfce-de_CH.ks
+
+[f10-i386-live-xfce-nl_NL-respin]
+description = Fedora Unity Live XFCE nl_NL Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-xfce-respin.conf
+iso_basename = Fedora-Unity-XFCE-nl_NL-$datestamp
+iso_label = FU Live XFCE $datestamp
+architecture = i386
+kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-xfce-nl_NL.ks
+
+[f10-i386-live-xfce-pt_PT-respin]
+description = Fedora Unity Live XFCE pt_PT Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-xfce-respin.conf
+iso_basename = Fedora-Unity-XFCE-pt_PT-$datestamp
+iso_label = FU Live XFCE $datestamp
+architecture = i386
+kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-xfce-pt_PT.ks
[f10-x86_64-live-aos-respin]
description = Fedora Unity Live AOS Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-aos-respin.conf
-product_name = Fedora
-product_path = Packages
iso_basename = Fedora-Unity-AOS-$datestamp
iso_label = FU Live $datestamp
architecture = x86_64
-version = 10
-version_from = F10
kickstart_file = /usr/share/spin-kickstarts/fedora-aos.ks
-kickstart_uses_pkgsack_exclude = 1
-media_installation_dvd=0
-media_installation_cd=0
-media_installation_tree=0
-media_utility_rescue=0
-media_live_optical=1
[f10-x86_64-live-broffice.org-respin]
description = Fedora Unity Live BrOffice.Org Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-broffice.org-respin.conf
-product_name = Fedora
-product_path = Packages
iso_basename = Fedora-Unity-BrOffice.Org-$datestamp
iso_label = FU Live $datestamp
architecture = x86_64
-version = 10
-version_from = F10
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-broffice.org.ks
-kickstart_uses_pkgsack_exclude = 1
-media_installation_dvd=0
-media_installation_cd=0
-media_installation_tree=0
-media_utility_rescue=0
-media_live_optical=1
[f10-x86_64-live-desktop-default-respin]
description = Fedora Unity Live Desktop Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-desktop-respin.conf
-product_name = Fedora
-product_path = Packages
iso_basename = Fedora-Unity-Desktop-$datestamp
iso_label = FU Live $datestamp
architecture = x86_64
-version = 10
-version_from = F10
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-desktop-default.ks
-kickstart_uses_pkgsack_exclude = 1
-media_installation_dvd=0
-media_installation_cd=0
-media_installation_tree=0
-media_utility_rescue=0
-media_live_optical=1
+
+[f10-x86_64-live-desktop-de_CH-respin]
+description = Fedora Unity Live Desktop de_CH Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-desktop-respin.conf
+iso_basename = Fedora-Unity-Desktop-de_CH-$datestamp
+iso_label = FU Live $datestamp
+architecture = x86_64
+kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-desktop-de_CH.ks
+
+[f10-x86_64-live-desktop-de_DE-respin]
+description = Fedora Unity Live Desktop de_DE Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-desktop-respin.conf
+iso_basename = Fedora-Unity-Desktop-de_DE-$datestamp
+iso_label = FU Live $datestamp
+architecture = x86_64
+kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-desktop-de_DE.ks
+
+[f10-x86_64-live-desktop-nl_NL-respin]
+description = Fedora Unity Live Desktop nl_NL Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-desktop-respin.conf
+iso_basename = Fedora-Unity-Desktop-nl_NL-$datestamp
+iso_label = FU Live $datestamp
+architecture = x86_64
+kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-desktop-nl_NL.ks
+
+[f10-x86_64-live-desktop-pt_BR-respin]
+description = Fedora Unity Live Desktop pt_BR Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-desktop-respin.conf
+iso_basename = Fedora-Unity-Desktop-pt_BR-$datestamp
+iso_label = FU Live $datestamp
+architecture = x86_64
+kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-desktop-pt_BR.ks
+
+[f10-x86_64-live-desktop-pt_PT-respin]
+description = Fedora Unity Live Desktop pt_PT Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-desktop-respin.conf
+iso_basename = Fedora-Unity-Desktop-pt_PT-$datestamp
+iso_label = FU Live $datestamp
+architecture = x86_64
+kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-desktop-pt_PT.ks
[f10-x86_64-live-developer-respin]
description = Fedora Unity Live Developer Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-developer-respin.conf
-product_name = Fedora
-product_path = Packages
iso_basename = Fedora-Unity-Developer-$datestamp
iso_label = FU Live Developer $datestamp
architecture = x86_64
-version = 10
-version_from = F10
kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-developer.ks
-kickstart_uses_pkgsack_exclude = 1
-media_installation_dvd=0
-media_installation_cd=0
-media_installation_tree=0
-media_utility_rescue=0
-media_live_optical=1
+
+[f10-x86_64-live-developer-de_CH-respin]
+description = Fedora Unity Live Developer de_CH Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-developer-respin.conf
+iso_basename = Fedora-Unity-Developer-de_CH-$datestamp
+iso_label = FU Live Developer $datestamp
+architecture = x86_64
+kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-developer-de_CH.ks
+
+[f10-x86_64-live-developer-nl_NL-respin]
+description = Fedora Unity Live Developer nl_NL Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-developer-respin.conf
+iso_basename = Fedora-Unity-Developer-nl_NL-$datestamp
+iso_label = FU Live Developer $datestamp
+architecture = x86_64
+kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-developer-nl_NL.ks
+
+[f10-x86_64-live-developer-pt_PT-respin]
+description = Fedora Unity Live Developer pt_PT Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-developer-respin.conf
+iso_basename = Fedora-Unity-Developer-pt_PT-$datestamp
+iso_label = FU Live Developer $datestamp
+architecture = x86_64
+kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-developer-pt_PT.ks
[f10-x86_64-live-education-math-respin]
description = Fedora Unity Live Education Math Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-education-math-respin.conf
-product_name = Fedora
-product_path = Packages
iso_basename = Fedora-Unity-Education-Math-$datestamp
iso_label = FU Live E-Math $datestamp
architecture = x86_64
-version = 10
-version_from = F10
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-education-math.ks
-kickstart_uses_pkgsack_exclude = 1
-media_installation_dvd=0
-media_installation_cd=0
-media_installation_tree=0
-media_utility_rescue=0
-media_live_optical=1
[f10-x86_64-live-electronic-lab-respin]
description = Fedora Unity Live Electronic Lab DVD Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-electronic-lab-respin.conf
-product_name = Fedora
-product_path = Packages
iso_basename = Fedora-Unity-EL-$datestamp
iso_label = FU Live EL $datestamp
architecture = x86_64
-version = 10
-version_from = F10
kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-electronic-lab.ks
-kickstart_uses_pkgsack_exclude = 1
-media_installation_dvd=0
-media_installation_cd=0
-media_installation_tree=0
-media_utility_rescue=0
-media_live_optical=1
+
+[f10-x86_64-live-electronic-de_CH-lab-respin]
+description = Fedora Unity Live Electronic Lab de_CH DVD Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-electronic-lab-respin.conf
+iso_basename = Fedora-Unity-EL-de_CH-$datestamp
+iso_label = FU Live EL $datestamp
+architecture = x86_64
+kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-electronic-lab-de_CH.ks
+
+[f10-x86_64-live-electronic-nl_NL-lab-respin]
+description = Fedora Unity Live Electronic Lab nl_NL DVD Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-electronic-lab-respin.conf
+iso_basename = Fedora-Unity-EL-nl_NL-$datestamp
+iso_label = FU Live EL $datestamp
+architecture = x86_64
+kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-electronic-lab-nl_NL.ks
+
+[f10-x86_64-live-electronic-pt_PT-lab-respin]
+description = Fedora Unity Live Electronic Lab pt_PT DVD Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-electronic-lab-respin.conf
+iso_basename = Fedora-Unity-EL-pt_PT-$datestamp
+iso_label = FU Live EL $datestamp
+architecture = x86_64
+kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-electronic-lab-pt_PT.ks
[f10-x86_64-live-games-respin]
description = Fedora Unity Live Games Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-games-respin.conf
-product_name = Fedora
-product_path = Packages
iso_basename = Fedora-Unity-Games-$datestamp
iso_label = FU Live Games $datestamp
architecture = x86_64
-version = 10
-version_from = F10
kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-games.ks
-kickstart_uses_pkgsack_exclude = 1
-media_installation_dvd=0
-media_installation_cd=0
-media_installation_tree=0
-media_utility_rescue=0
-media_live_optical=1
+
+[f10-x86_64-live-games-de_CH-respin]
+description = Fedora Unity Live Games de_CH Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-games-respin.conf
+iso_basename = Fedora-Unity-Games-de_CH-$datestamp
+iso_label = FU Live Games $datestamp
+architecture = x86_64
+kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-games-de_CH.ks
+
+[f10-x86_64-live-games-nl_NL-respin]
+description = Fedora Unity Live Games nl_NL Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-games-respin.conf
+iso_basename = Fedora-Unity-Games-nl_NL-$datestamp
+iso_label = FU Live Games $datestamp
+architecture = x86_64
+kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-games-nl_NL.ks
+
+[f10-x86_64-live-games-pt_PT-respin]
+description = Fedora Unity Live Games pt_PT Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-games-respin.conf
+iso_basename = Fedora-Unity-Games-pt_PT-$datestamp
+iso_label = FU Live Games $datestamp
+architecture = x86_64
+kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-games-pt_PT.ks
[f10-x86_64-live-kde-respin]
description = Fedora Unity Live KDE Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-kde-respin.conf
-product_name = Fedora
-product_path = Packages
iso_basename = Fedora-Unity-KDE-$datestamp
iso_label = FU Live KDE $datestamp
architecture = x86_64
-version = 10
-version_from = F10
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-kde.ks
-kickstart_uses_pkgsack_exclude = 1
-media_installation_dvd=0
-media_installation_cd=0
-media_installation_tree=0
-media_utility_rescue=0
-media_live_optical=1
+
+[f10-x86_64-live-kde-de_CH-respin]
+description = Fedora Unity Live KDE de_CH Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-kde-respin.conf
+iso_basename = Fedora-Unity-KDE-de_CH-$datestamp
+iso_label = FU Live KDE $datestamp
+architecture = x86_64
+kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-kde-de_CH.ks
+
+[f10-x86_64-live-kde-de_DE-respin]
+description = Fedora Unity Live KDE de_DE Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-kde-respin.conf
+iso_basename = Fedora-Unity-KDE-de_DE-$datestamp
+iso_label = FU Live KDE $datestamp
+architecture = x86_64
+kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-kde-de_DE.ks
+
+[f10-x86_64-live-kde-nl_NL-respin]
+description = Fedora Unity Live KDE nl_NL Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-kde-respin.conf
+iso_basename = Fedora-Unity-KDE-nl_NL-$datestamp
+iso_label = FU Live KDE $datestamp
+architecture = x86_64
+kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-kde-nl_NL.ks
+
+[f10-x86_64-live-kde-pt_PT-respin]
+description = Fedora Unity Live KDE pt_PT Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-kde-respin.conf
+iso_basename = Fedora-Unity-KDE-pt_PT-$datestamp
+iso_label = FU Live KDE $datestamp
+architecture = x86_64
+kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-kde-pt_PT.ks
[f10-x86_64-live-xfce-respin]
description = Fedora Unity Live XFCE Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-xfce-respin.conf
-product_name = Fedora
-product_path = Packages
iso_basename = Fedora-Unity-XFCE-$datestamp
iso_label = FU Live XFCE $datestamp
architecture = x86_64
-version = 10
-version_from = F10
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-xfce.ks
-kickstart_uses_pkgsack_exclude = 1
-media_installation_dvd=0
-media_installation_cd=0
-media_installation_tree=0
-media_utility_rescue=0
-media_live_optical=1
+
+[f10-x86_64-live-xfce-de_CH-respin]
+description = Fedora Unity Live XFCE de_CH Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-xfce-respin.conf
+iso_basename = Fedora-Unity-XFCE-de_CH-$datestamp
+iso_label = FU Live XFCE $datestamp
+architecture = x86_64
+kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-xfce-de_CH.ks
+
+[f10-x86_64-live-xfce-nl_NL-respin]
+description = Fedora Unity Live XFCE nl_NL Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-xfce-respin.conf
+iso_basename = Fedora-Unity-XFCE-nl_NL-$datestamp
+iso_label = FU Live XFCE $datestamp
+architecture = x86_64
+kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-xfce-nl_NL.ks
+
+[f10-x86_64-live-xfce-pt_PT-respin]
+description = Fedora Unity Live XFCE pt_PT Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-xfce-respin.conf
+iso_basename = Fedora-Unity-XFCE-pt_PT-$datestamp
+iso_label = FU Live XFCE $datestamp
+architecture = x86_64
+kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-xfce-pt_PT.ks
[f10-ppc-live-aos-respin]
description = Fedora Unity Live AOS Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-aos-respin.conf
-product_name = Fedora
-product_path = Packages
iso_basename = Fedora-Unity-AOS-$datestamp
iso_label = FU Live $datestamp
architecture = ppc
-version = 10
-version_from = F10
kickstart_file = /usr/share/spin-kickstarts/fedora-aos.ks
-kickstart_uses_pkgsack_exclude = 1
-media_installation_dvd=0
-media_installation_cd=0
-media_installation_tree=0
-media_utility_rescue=0
-media_live_optical=1
[f10-ppc-live-broffice.org-respin]
description = Fedora Unity Live BrOffice.Org Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-broffice.org-respin.conf
-product_name = Fedora
-product_path = Packages
iso_basename = Fedora-Unity-BrOffice.Org-$datestamp
iso_label = FU Live $datestamp
architecture = ppc
-version = 10
-version_from = F10
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-broffice.org.ks
-kickstart_uses_pkgsack_exclude = 1
-media_installation_dvd=0
-media_installation_cd=0
-media_installation_tree=0
-media_utility_rescue=0
-media_live_optical=1
[f10-ppc-live-desktop-default-respin]
description = Fedora Unity Live Desktop Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-desktop-respin.conf
-product_name = Fedora
-product_path = Packages
iso_basename = Fedora-Unity-Desktop-$datestamp
iso_label = FU Live $datestamp
architecture = ppc
-version = 10
-version_from = F10
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-desktop-default.ks
-kickstart_uses_pkgsack_exclude = 1
-media_installation_dvd=0
-media_installation_cd=0
-media_installation_tree=0
-media_utility_rescue=0
-media_live_optical=1
+
+[f10-ppc-live-desktop-de_CH-respin]
+description = Fedora Unity Live Desktop de_CH Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-desktop-respin.conf
+iso_basename = Fedora-Unity-Desktop-de_CH-$datestamp
+iso_label = FU Live $datestamp
+architecture = ppc
+kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-desktop-de_CH.ks
+
+[f10-ppc-live-desktop-de_DE-respin]
+description = Fedora Unity Live Desktop de_DE Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-desktop-respin.conf
+iso_basename = Fedora-Unity-Desktop-de_DE-$datestamp
+iso_label = FU Live $datestamp
+architecture = ppc
+kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-desktop-de_DE.ks
+
+[f10-ppc-live-desktop-nl_NL-respin]
+description = Fedora Unity Live Desktop nl_NL Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-desktop-respin.conf
+iso_basename = Fedora-Unity-Desktop-nl_NL-$datestamp
+iso_label = FU Live $datestamp
+architecture = ppc
+kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-desktop-nl_NL.ks
+
+[f10-ppc-live-desktop-pt_BR-respin]
+description = Fedora Unity Live Desktop pt_BR Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-desktop-respin.conf
+iso_basename = Fedora-Unity-Desktop-pt_BR-$datestamp
+iso_label = FU Live $datestamp
+architecture = ppc
+kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-desktop-pt_BR.ks
+
+[f10-ppc-live-desktop-pt_PT-respin]
+description = Fedora Unity Live Desktop pt_PT Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-desktop-respin.conf
+iso_basename = Fedora-Unity-Desktop-pt_PT-$datestamp
+iso_label = FU Live $datestamp
+architecture = ppc
+kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-desktop-pt_PT.ks
[f10-ppc-live-developer-respin]
description = Fedora Unity Live Developer Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-developer-respin.conf
-product_name = Fedora
-product_path = Packages
iso_basename = Fedora-Unity-Developer-$datestamp
iso_label = FU Live Developer $datestamp
architecture = ppc
-version = 10
-version_from = F10
kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-developer.ks
-kickstart_uses_pkgsack_exclude = 1
-media_installation_dvd=0
-media_installation_cd=0
-media_installation_tree=0
-media_utility_rescue=0
-media_live_optical=1
+
+[f10-ppc-live-developer-de_CH-respin]
+description = Fedora Unity Live Developer de_CH Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-developer-respin.conf
+iso_basename = Fedora-Unity-Developer-de_CH-$datestamp
+iso_label = FU Live Developer $datestamp
+architecture = ppc
+kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-developer-de_CH.ks
+
+[f10-ppc-live-developer-nl_NL-respin]
+description = Fedora Unity Live Developer nl_NL Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-developer-respin.conf
+iso_basename = Fedora-Unity-Developer-nl_NL-$datestamp
+iso_label = FU Live Developer $datestamp
+architecture = ppc
+kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-developer-nl_NL.ks
+
+[f10-ppc-live-developer-pt_PT-respin]
+description = Fedora Unity Live Developer pt_PT Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-developer-respin.conf
+iso_basename = Fedora-Unity-Developer-pt_PT-$datestamp
+iso_label = FU Live Developer $datestamp
+architecture = ppc
+kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-developer-pt_PT.ks
[f10-ppc-live-education-math-respin]
description = Fedora Unity Live Education Math Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-education-math-respin.conf
-product_name = Fedora
-product_path = Packages
iso_basename = Fedora-Unity-Education-Math-$datestamp
iso_label = FU Live E-Math $datestamp
architecture = ppc
-version = 10
-version_from = F10
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-education-math.ks
-kickstart_uses_pkgsack_exclude = 1
-media_installation_dvd=0
-media_installation_cd=0
-media_installation_tree=0
-media_utility_rescue=0
-media_live_optical=1
[f10-ppc-live-electronic-lab-respin]
description = Fedora Unity Live Electronic Lab DVD Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-electronic-lab-respin.conf
-product_name = Fedora
-product_path = Packages
iso_basename = Fedora-Unity-EL-$datestamp
iso_label = FU Live EL $datestamp
architecture = ppc
-version = 10
-version_from = F10
kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-electronic-lab.ks
-kickstart_uses_pkgsack_exclude = 1
-media_installation_dvd=0
-media_installation_cd=0
-media_installation_tree=0
-media_utility_rescue=0
-media_live_optical=1
+
+[f10-ppc-live-electronic-de_CH-lab-respin]
+description = Fedora Unity Live Electronic Lab de_CH DVD Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-electronic-lab-respin.conf
+iso_basename = Fedora-Unity-EL-de_CH-$datestamp
+iso_label = FU Live EL $datestamp
+architecture = ppc
+kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-electronic-lab-de_CH.ks
+
+[f10-ppc-live-electronic-nl_NL-lab-respin]
+description = Fedora Unity Live Electronic Lab nl_NL DVD Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-electronic-lab-respin.conf
+iso_basename = Fedora-Unity-EL-nl_NL-$datestamp
+iso_label = FU Live EL $datestamp
+architecture = ppc
+kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-electronic-lab-nl_NL.ks
+
+[f10-ppc-live-electronic-pt_PT-lab-respin]
+description = Fedora Unity Live Electronic Lab pt_PT DVD Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-electronic-lab-respin.conf
+iso_basename = Fedora-Unity-EL-pt_PT-$datestamp
+iso_label = FU Live EL $datestamp
+architecture = ppc
+kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-electronic-lab-pt_PT.ks
[f10-ppc-live-games-respin]
description = Fedora Unity Live Games Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-games-respin.conf
-product_name = Fedora
-product_path = Packages
iso_basename = Fedora-Unity-Games-$datestamp
iso_label = FU Live Games $datestamp
architecture = ppc
-version = 10
-version_from = F10
kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-games.ks
-kickstart_uses_pkgsack_exclude = 1
-media_installation_dvd=0
-media_installation_cd=0
-media_installation_tree=0
-media_utility_rescue=0
-media_live_optical=1
+
+[f10-ppc-live-games-de_CH-respin]
+description = Fedora Unity Live Games de_CH Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-games-respin.conf
+iso_basename = Fedora-Unity-Games-de_CH-$datestamp
+iso_label = FU Live Games $datestamp
+architecture = ppc
+kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-games-de_CH.ks
+
+[f10-ppc-live-games-nl_NL-respin]
+description = Fedora Unity Live Games nl_NL Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-games-respin.conf
+iso_basename = Fedora-Unity-Games-nl_NL-$datestamp
+iso_label = FU Live Games $datestamp
+architecture = ppc
+kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-games-nl_NL.ks
+
+[f10-ppc-live-games-pt_PT-respin]
+description = Fedora Unity Live Games pt_PT Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-games-respin.conf
+iso_basename = Fedora-Unity-Games-pt_PT-$datestamp
+iso_label = FU Live Games $datestamp
+architecture = ppc
+kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-games-pt_PT.ks
[f10-ppc-live-kde-respin]
description = Fedora Unity Live KDE Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-kde-respin.conf
-product_name = Fedora
-product_path = Packages
iso_basename = Fedora-Unity-KDE-$datestamp
iso_label = FU Live KDE $datestamp
architecture = ppc
-version = 10
-version_from = F10
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-kde.ks
-kickstart_uses_pkgsack_exclude = 1
-media_installation_dvd=0
-media_installation_cd=0
-media_installation_tree=0
-media_utility_rescue=0
-media_live_optical=1
+
+[f10-ppc-live-kde-de_CH-respin]
+description = Fedora Unity Live KDE de_CH Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-kde-respin.conf
+iso_basename = Fedora-Unity-KDE-de_CH-$datestamp
+iso_label = FU Live KDE $datestamp
+architecture = ppc
+kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-kde-de_CH.ks
+
+[f10-ppc-live-kde-de_DE-respin]
+description = Fedora Unity Live KDE de_DE Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-kde-respin.conf
+iso_basename = Fedora-Unity-KDE-de_DE-$datestamp
+iso_label = FU Live KDE $datestamp
+architecture = ppc
+kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-kde-de_DE.ks
+
+[f10-ppc-live-kde-nl_NL-respin]
+description = Fedora Unity Live KDE nl_NL Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-kde-respin.conf
+iso_basename = Fedora-Unity-KDE-nl_NL-$datestamp
+iso_label = FU Live KDE $datestamp
+architecture = ppc
+kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-kde-nl_NL.ks
+
+[f10-ppc-live-kde-pt_PT-respin]
+description = Fedora Unity Live KDE pt_PT Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-kde-respin.conf
+iso_basename = Fedora-Unity-KDE-pt_PT-$datestamp
+iso_label = FU Live KDE $datestamp
+architecture = ppc
+kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-kde-pt_PT.ks
[f10-ppc-live-xfce-respin]
description = Fedora Unity Live XFCE Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-xfce-respin.conf
-product_name = Fedora
-product_path = Packages
iso_basename = Fedora-Unity-XFCE-$datestamp
iso_label = FU Live XFCE $datestamp
architecture = ppc
-version = 10
-version_from = F10
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-xfce.ks
-kickstart_uses_pkgsack_exclude = 1
-media_installation_dvd=0
-media_installation_cd=0
-media_installation_tree=0
-media_utility_rescue=0
-media_live_optical=1
+
+[f10-ppc-live-xfce-de_CH-respin]
+description = Fedora Unity Live XFCE de_CH Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-xfce-respin.conf
+iso_basename = Fedora-Unity-XFCE-de_CH-$datestamp
+iso_label = FU Live XFCE $datestamp
+architecture = ppc
+kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-xfce-de_CH.ks
+
+[f10-ppc-live-xfce-nl_NL-respin]
+description = Fedora Unity Live XFCE nl_NL Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-xfce-respin.conf
+iso_basename = Fedora-Unity-XFCE-nl_NL-$datestamp
+iso_label = FU Live XFCE $datestamp
+architecture = ppc
+kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-xfce-nl_NL.ks
+
+[f10-ppc-live-xfce-pt_PT-respin]
+description = Fedora Unity Live XFCE pt_PT Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-xfce-respin.conf
+iso_basename = Fedora-Unity-XFCE-pt_PT-$datestamp
+iso_label = FU Live XFCE $datestamp
+architecture = ppc
+kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-xfce-pt_PT.ks
[f10-ppc64-live-aos-respin]
description = Fedora Unity Live AOS Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-aos-respin.conf
-product_name = Fedora
-product_path = Packages
iso_basename = Fedora-Unity-AOS-$datestamp
iso_label = FU Live $datestamp
architecture = ppc64
-version = 10
-version_from = F10
kickstart_file = /usr/share/spin-kickstarts/fedora-aos.ks
-kickstart_uses_pkgsack_exclude = 1
-media_installation_dvd=0
-media_installation_cd=0
-media_installation_tree=0
-media_utility_rescue=0
-media_live_optical=1
[f10-ppc64-live-broffice.org-respin]
description = Fedora Unity Live BrOffice.Org Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-broffice.org-respin.conf
-product_name = Fedora
-product_path = Packages
iso_basename = Fedora-Unity-BrOffice.Org-$datestamp
iso_label = FU Live $datestamp
architecture = ppc64
-version = 10
-version_from = F10
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-broffice.org.ks
-kickstart_uses_pkgsack_exclude = 1
-media_installation_dvd=0
-media_installation_cd=0
-media_installation_tree=0
-media_utility_rescue=0
-media_live_optical=1
[f10-ppc64-live-desktop-default-respin]
description = Fedora Unity Live Desktop Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-desktop-respin.conf
-product_name = Fedora
-product_path = Packages
iso_basename = Fedora-Unity-Desktop-$datestamp
iso_label = FU Live $datestamp
architecture = ppc64
-version = 10
-version_from = F10
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-desktop-default.ks
-kickstart_uses_pkgsack_exclude = 1
-media_installation_dvd=0
-media_installation_cd=0
-media_installation_tree=0
-media_utility_rescue=0
-media_live_optical=1
+
+[f10-ppc64-live-desktop-de_CH-respin]
+description = Fedora Unity Live Desktop de_CH Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-desktop-respin.conf
+iso_basename = Fedora-Unity-Desktop-de_CH-$datestamp
+iso_label = FU Live $datestamp
+architecture = ppc64
+kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-desktop-de_CH.ks
+
+[f10-ppc64-live-desktop-de_DE-respin]
+description = Fedora Unity Live Desktop de_DE Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-desktop-respin.conf
+iso_basename = Fedora-Unity-Desktop-de_DE-$datestamp
+iso_label = FU Live $datestamp
+architecture = ppc64
+kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-desktop-de_DE.ks
+
+[f10-ppc64-live-desktop-nl_NL-respin]
+description = Fedora Unity Live Desktop nl_NL Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-desktop-respin.conf
+iso_basename = Fedora-Unity-Desktop-nl_NL-$datestamp
+iso_label = FU Live $datestamp
+architecture = ppc64
+kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-desktop-nl_NL.ks
+
+[f10-ppc64-live-desktop-pt_BR-respin]
+description = Fedora Unity Live Desktop pt_BR Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-desktop-respin.conf
+iso_basename = Fedora-Unity-Desktop-pt_BR-$datestamp
+iso_label = FU Live $datestamp
+architecture = ppc64
+kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-desktop-pt_BR.ks
+
+[f10-ppc64-live-desktop-pt_PT-respin]
+description = Fedora Unity Live Desktop pt_PT Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-desktop-respin.conf
+iso_basename = Fedora-Unity-Desktop-pt_PT-$datestamp
+iso_label = FU Live $datestamp
+architecture = ppc64
+kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-desktop-pt_PT.ks
[f10-ppc64-live-developer-respin]
description = Fedora Unity Live Developer Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-developer-respin.conf
-product_name = Fedora
-product_path = Packages
iso_basename = Fedora-Unity-Developer-$datestamp
iso_label = FU Live Developer $datestamp
architecture = ppc64
-version = 10
-version_from = F10
kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-developer.ks
-kickstart_uses_pkgsack_exclude = 1
-media_installation_dvd=0
-media_installation_cd=0
-media_installation_tree=0
-media_utility_rescue=0
-media_live_optical=1
+
+[f10-ppc64-live-developer-de_CH-respin]
+description = Fedora Unity Live Developer de_CH Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-developer-respin.conf
+iso_basename = Fedora-Unity-Developer-de_CH-$datestamp
+iso_label = FU Live Developer $datestamp
+architecture = ppc64
+kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-developer-de_CH.ks
+
+[f10-ppc64-live-developer-nl_NL-respin]
+description = Fedora Unity Live Developer nl_NL Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-developer-respin.conf
+iso_basename = Fedora-Unity-Developer-nl_NL-$datestamp
+iso_label = FU Live Developer $datestamp
+architecture = ppc64
+kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-developer-nl_NL.ks
+
+[f10-ppc64-live-developer-pt_PT-respin]
+description = Fedora Unity Live Developer pt_PT Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-developer-respin.conf
+iso_basename = Fedora-Unity-Developer-pt_PT-$datestamp
+iso_label = FU Live Developer $datestamp
+architecture = ppc64
+kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-developer-pt_PT.ks
[f10-ppc64-live-education-math-respin]
description = Fedora Unity Live Education Math Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-education-math-respin.conf
-product_name = Fedora
-product_path = Packages
iso_basename = Fedora-Unity-Education-Math-$datestamp
iso_label = FU Live E-Math $datestamp
architecture = ppc64
-version = 10
-version_from = F10
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-education-math.ks
-kickstart_uses_pkgsack_exclude = 1
-media_installation_dvd=0
-media_installation_cd=0
-media_installation_tree=0
-media_utility_rescue=0
-media_live_optical=1
[f10-ppc64-live-electronic-lab-respin]
description = Fedora Unity Live Electronic Lab DVD Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-electronic-lab-respin.conf
-product_name = Fedora
-product_path = Packages
iso_basename = Fedora-Unity-EL-$datestamp
iso_label = FU Live EL $datestamp
architecture = ppc64
-version = 10
-version_from = F10
kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-electronic-lab.ks
-kickstart_uses_pkgsack_exclude = 1
-media_installation_dvd=0
-media_installation_cd=0
-media_installation_tree=0
-media_utility_rescue=0
-media_live_optical=1
+
+[f10-ppc64-live-electronic-de_CH-lab-respin]
+description = Fedora Unity Live Electronic Lab de_CH DVD Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-electronic-lab-respin.conf
+iso_basename = Fedora-Unity-EL-de_CH-$datestamp
+iso_label = FU Live EL $datestamp
+architecture = ppc64
+kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-electronic-lab-de_CH.ks
+
+[f10-ppc64-live-electronic-nl_NL-lab-respin]
+description = Fedora Unity Live Electronic Lab nl_NL DVD Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-electronic-lab-respin.conf
+iso_basename = Fedora-Unity-EL-nl_NL-$datestamp
+iso_label = FU Live EL $datestamp
+architecture = ppc64
+kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-electronic-lab-nl_NL.ks
+
+[f10-ppc64-live-electronic-pt_PT-lab-respin]
+description = Fedora Unity Live Electronic Lab pt_PT DVD Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-electronic-lab-respin.conf
+iso_basename = Fedora-Unity-EL-pt_PT-$datestamp
+iso_label = FU Live EL $datestamp
+architecture = ppc64
+kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-electronic-lab-pt_PT.ks
[f10-ppc64-live-games-respin]
description = Fedora Unity Live Games Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-games-respin.conf
-product_name = Fedora
-product_path = Packages
iso_basename = Fedora-Unity-Games-$datestamp
iso_label = FU Live Games $datestamp
architecture = ppc64
-version = 10
-version_from = F10
kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-games.ks
-kickstart_uses_pkgsack_exclude = 1
-media_installation_dvd=0
-media_installation_cd=0
-media_installation_tree=0
-media_utility_rescue=0
-media_live_optical=1
+
+[f10-ppc64-live-games-de_CH-respin]
+description = Fedora Unity Live Games de_CH Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-games-respin.conf
+iso_basename = Fedora-Unity-Games-de_CH-$datestamp
+iso_label = FU Live Games $datestamp
+architecture = ppc64
+kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-games-de_CH.ks
+
+[f10-ppc64-live-games-nl_NL-respin]
+description = Fedora Unity Live Games nl_NL Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-games-respin.conf
+iso_basename = Fedora-Unity-Games-nl_NL-$datestamp
+iso_label = FU Live Games $datestamp
+architecture = ppc64
+kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-games-nl_NL.ks
+
+[f10-ppc64-live-games-pt_PT-respin]
+description = Fedora Unity Live Games pt_PT Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-games-respin.conf
+iso_basename = Fedora-Unity-Games-pt_PT-$datestamp
+iso_label = FU Live Games $datestamp
+architecture = ppc64
+kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-games-pt_PT.ks
[f10-ppc64-live-kde-respin]
description = Fedora Unity Live KDE Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-kde-respin.conf
-product_name = Fedora
-product_path = Packages
iso_basename = Fedora-Unity-KDE-$datestamp
iso_label = FU Live KDE $datestamp
architecture = ppc64
-version = 10
-version_from = F10
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-kde.ks
-kickstart_uses_pkgsack_exclude = 1
-media_installation_dvd=0
-media_installation_cd=0
-media_installation_tree=0
-media_utility_rescue=0
-media_live_optical=1
+
+[f10-ppc64-live-kde-de_CH-respin]
+description = Fedora Unity Live KDE de_CH Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-kde-respin.conf
+iso_basename = Fedora-Unity-KDE-de_CH-$datestamp
+iso_label = FU Live KDE $datestamp
+architecture = ppc64
+kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-kde-de_CH.ks
+
+[f10-ppc64-live-kde-de_DE-respin]
+description = Fedora Unity Live KDE de_DE Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-kde-respin.conf
+iso_basename = Fedora-Unity-KDE-de_DE-$datestamp
+iso_label = FU Live KDE $datestamp
+architecture = ppc64
+kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-kde-de_DE.ks
+
+[f10-ppc64-live-kde-nl_NL-respin]
+description = Fedora Unity Live KDE nl_NL Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-kde-respin.conf
+iso_basename = Fedora-Unity-KDE-nl_NL-$datestamp
+iso_label = FU Live KDE $datestamp
+architecture = ppc64
+kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-kde-nl_NL.ks
+
+[f10-ppc64-live-kde-pt_PT-respin]
+description = Fedora Unity Live KDE pt_PT Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-kde-respin.conf
+iso_basename = Fedora-Unity-KDE-pt_PT-$datestamp
+iso_label = FU Live KDE $datestamp
+architecture = ppc64
+kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-kde-pt_PT.ks
[f10-ppc64-live-xfce-respin]
description = Fedora Unity Live XFCE Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-xfce-respin.conf
-product_name = Fedora
-product_path = Packages
iso_basename = Fedora-Unity-XFCE-$datestamp
iso_label = FU Live XFCE $datestamp
architecture = ppc64
-version = 10
-version_from = F10
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-xfce.ks
-kickstart_uses_pkgsack_exclude = 1
-media_installation_dvd=0
-media_installation_cd=0
-media_installation_tree=0
-media_utility_rescue=0
-media_live_optical=1
+[f10-ppc64-live-xfce-de_CH-respin]
+description = Fedora Unity Live XFCE de_CH Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-xfce-respin.conf
+iso_basename = Fedora-Unity-XFCE-de_CH-$datestamp
+iso_label = FU Live XFCE $datestamp
+architecture = ppc64
+kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-xfce-de_CH.ks
+
+[f10-ppc64-live-xfce-nl_NL-respin]
+description = Fedora Unity Live XFCE nl_NL Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-xfce-respin.conf
+iso_basename = Fedora-Unity-XFCE-nl_NL-$datestamp
+iso_label = FU Live XFCE $datestamp
+architecture = ppc64
+kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-xfce-nl_NL.ks
+
+[f10-ppc64-live-xfce-pt_PT-respin]
+description = Fedora Unity Live XFCE pt_PT Re-Spin Model for Fedora (Rawhide)
+main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-xfce-respin.conf
+iso_basename = Fedora-Unity-XFCE-pt_PT-$datestamp
+iso_label = FU Live XFCE $datestamp
+architecture = ppc64
+kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-xfce-pt_PT.ks
commit 99e641073b9edd2f0e869d9d9ecf8572737d0f85
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Feb 23 20:07:27 2009 +0100
Update respin.sh with the correct From: address in email
diff --git a/unity/scripts/respin.sh b/unity/scripts/respin.sh
index 4ec8edb..9a8353b 100755
--- a/unity/scripts/respin.sh
+++ b/unity/scripts/respin.sh
@@ -115,23 +115,33 @@ done
[ ! -z "$pkg_error" ] && echo -en "ERROR:\n$pkg_error" && exit 1
+##
+## First, we try to run from the source tree
+## If that fails, we'll look for an installed RPM,
+## Last but not least, we'll clone stuff ourselves and go at it
+##
if [ -d ~/devel/revisor/master ]; then
cd ~/devel/revisor/master
-
git pull git://git.fedorahosted.org/revisor master
-
autoreconf -v && ./configure
-
./switchhere --yes
-
revisor_cmd="sudo ./revisor.py --cli"
-else
+
+elif [ ! -z "`rpm -qv revisor | grep -v 'not installed'`" ]; then
revisor_cmd="sudo revisor --cli"
+
+else
+ git clone git://git.fedorahosted.org/revisor /tmp/revisor
+ cd /tmp/revisor
+ autoreconf -v && ./configure
+ ./switchhere --yes
+ revisor_cmd="sudo ./revisor.py --cli"
fi
MESSAGE_END="\\n\\nGo to http://$HOSTNAME/revisor/%b/%b/ for more details.\\n\\nKind regards,\\n\\nJeroen van Meeuwen\n-kanarip"
NOTIFICATION_FAILURE="kanarip(a)kanarip.com"
NOTIFICATION_SUCCESS="kanarip(a)kanarip.com"
+NOTIFICATION_FROMADD="kanarip(a)kanarip.com"
# Cheat our way through spin-kickstarts
[ -d /tmp/spin-kickstarts ] && sudo rm -rf /tmp/spin-kickstarts
@@ -169,10 +179,12 @@ for version in $VERSIONS; do
printf "Spin $spin failed, log file attached.$MESSAGE_END" "$datestamp" "$spin" \
| mail -s "[respin] $spin $datestamp failed" \
-a revisor-$spin.log \
+ -r $NOTIFICATION_FROMADD \
-c $NOTIFICATION_FAILURE $NOTIFICATION_SUCCESS || \
printf "Spin $spin succeeded, log file attached.$MESSAGE_END" "$datestamp" "$spin" \
| mail -s "[respin] $spin $datestamp succeeded" \
-a revisor-$spin.log \
+ -r $NOTIFICATION_FROMADD \
$NOTIFICATION_SUCCESS
sudo mkdir -p /srv/revisor/$datestamp/$spin/log/
@@ -207,10 +219,12 @@ for version in $VERSIONS; do
printf "Spin f$version-$arch-respin failed, log file attached.$MESSAGE_END" "$datestamp" "f$version-$arch-respin" \
| mail -s "[respin] f$version-$arch-respin $datestamp failed" \
-a revisor-f$version-$arch-respin.log \
+ -r $NOTIFICATION_FROMADD \
-c $NOTIFICATION_FAILURE $NOTIFICATION_SUCCESS || \
printf "Spin f$version-$arch-respin succeeded, log file attached.$MESSAGE_END" "$datestamp" "f$version-$arch-respin" \
| mail -s "[respin] f$version-$arch-respin $datestamp succeeded" \
-a revisor-f$version-$arch-respin.log \
+ -r $NOTIFICATION_FROMADD \
$NOTIFICATION_SUCCESS
sudo mkdir -p /srv/revisor/$datestamp/f$version-$arch-respin/log/
commit 0c0c85732eb23d3b783c842a5d451ac060263f57
Merge: e1b1335... 17dcab1...
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Feb 23 20:05:33 2009 +0100
Merge branch 'master' of git://git.fedorahosted.org/revisor
commit 17dcab18daa0c3c3955776b7bfe9a2f2c234c76d
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Feb 23 19:50:20 2009 +0100
Exclude *.i?86 from the live images for Fedora 9 x86_64 spins
diff --git a/unity/conf/conf.d/revisor-f9-x86_64-live-desktop-respin.conf b/unity/conf/conf.d/revisor-f9-x86_64-live-desktop-respin.conf
index 3903160..5701974 100644
--- a/unity/conf/conf.d/revisor-f9-x86_64-live-desktop-respin.conf
+++ b/unity/conf/conf.d/revisor-f9-x86_64-live-desktop-respin.conf
@@ -1,4 +1,5 @@
[main]
+exclude=*.i?86
cachedir=-yumcache
reposdir=
keepcache=1
diff --git a/unity/conf/conf.d/revisor-f9-x86_64-live-developer-respin.conf b/unity/conf/conf.d/revisor-f9-x86_64-live-developer-respin.conf
index 3903160..5701974 100644
--- a/unity/conf/conf.d/revisor-f9-x86_64-live-developer-respin.conf
+++ b/unity/conf/conf.d/revisor-f9-x86_64-live-developer-respin.conf
@@ -1,4 +1,5 @@
[main]
+exclude=*.i?86
cachedir=-yumcache
reposdir=
keepcache=1
diff --git a/unity/conf/conf.d/revisor-f9-x86_64-live-education-math-respin.conf b/unity/conf/conf.d/revisor-f9-x86_64-live-education-math-respin.conf
index 3903160..5701974 100644
--- a/unity/conf/conf.d/revisor-f9-x86_64-live-education-math-respin.conf
+++ b/unity/conf/conf.d/revisor-f9-x86_64-live-education-math-respin.conf
@@ -1,4 +1,5 @@
[main]
+exclude=*.i?86
cachedir=-yumcache
reposdir=
keepcache=1
diff --git a/unity/conf/conf.d/revisor-f9-x86_64-live-electronic-lab-respin.conf b/unity/conf/conf.d/revisor-f9-x86_64-live-electronic-lab-respin.conf
index 3903160..5701974 100644
--- a/unity/conf/conf.d/revisor-f9-x86_64-live-electronic-lab-respin.conf
+++ b/unity/conf/conf.d/revisor-f9-x86_64-live-electronic-lab-respin.conf
@@ -1,4 +1,5 @@
[main]
+exclude=*.i?86
cachedir=-yumcache
reposdir=
keepcache=1
diff --git a/unity/conf/conf.d/revisor-f9-x86_64-live-games-respin.conf b/unity/conf/conf.d/revisor-f9-x86_64-live-games-respin.conf
index 3903160..5701974 100644
--- a/unity/conf/conf.d/revisor-f9-x86_64-live-games-respin.conf
+++ b/unity/conf/conf.d/revisor-f9-x86_64-live-games-respin.conf
@@ -1,4 +1,5 @@
[main]
+exclude=*.i?86
cachedir=-yumcache
reposdir=
keepcache=1
diff --git a/unity/conf/conf.d/revisor-f9-x86_64-live-kde-respin.conf b/unity/conf/conf.d/revisor-f9-x86_64-live-kde-respin.conf
index 3903160..5701974 100644
--- a/unity/conf/conf.d/revisor-f9-x86_64-live-kde-respin.conf
+++ b/unity/conf/conf.d/revisor-f9-x86_64-live-kde-respin.conf
@@ -1,4 +1,5 @@
[main]
+exclude=*.i?86
cachedir=-yumcache
reposdir=
keepcache=1
diff --git a/unity/conf/conf.d/revisor-f9-x86_64-live-xfce-respin.conf b/unity/conf/conf.d/revisor-f9-x86_64-live-xfce-respin.conf
index 3903160..5701974 100644
--- a/unity/conf/conf.d/revisor-f9-x86_64-live-xfce-respin.conf
+++ b/unity/conf/conf.d/revisor-f9-x86_64-live-xfce-respin.conf
@@ -1,4 +1,5 @@
[main]
+exclude=*.i?86
cachedir=-yumcache
reposdir=
keepcache=1
commit 03f47d648839ae808c5452fb912a0679798b3ac1
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Feb 23 19:29:58 2009 +0100
Update the required packages ($revisor_deps)
diff --git a/unity/scripts/respin.sh b/unity/scripts/respin.sh
index c6d4040..4ec8edb 100755
--- a/unity/scripts/respin.sh
+++ b/unity/scripts/respin.sh
@@ -54,17 +54,32 @@ revisor_deps="comps-extras createrepo rhpl pykickstart livecd-tools
pam python automake intltool gettext desktop-file-utils glib2-devel gcc
cobbler koan deltarpm pygtk2-libglade gnome-python2-gconf
system-config-kickstart jigdo livecd-tools python-virtinst git sudo
- spin-kickstarts mock"
+ spin-kickstarts mock yum-utils"
##
## Defaults
##
+LIVE=0
+INSTALL=0
JUST_LIST=0
cleanup=1
+##
+## Get the options
+##
+
while [ $# -gt 0 ]; do
case $1 in
+ --live)
+ LIVE=1
+ shift
+ ;;
+ --install)
+ INSTALL=1
+ shift
+ ;;
+
--version)
VERSIONS="$VERSIONS $2"
shift; shift
@@ -132,68 +147,74 @@ for version in $VERSIONS; do
cd $ourwd
for arch in $ARCHES; do
- for spin in `${revisor_cmd} --config /etc/revisor-unity/f$version-live-respin.conf --list-models | grep "^ f$version-$arch-" | awk '{print $1}'`; do
- datestamp=`date +'%Y%m%d'`
+ if [ $LIVE -eq 1 ]; then
+ for spin in `${revisor_cmd} --config /etc/revisor-unity/f$version-live-respin.conf --list-models | grep "^ f$version-$arch-" | awk '{print $1}'`; do
- [ $JUST_LIST -eq 1 ] && echo $spin && continue
+ datestamp=`date +'%Y%m%d'`
- # Let's make sure we remove the entire directory before we attempt a respin.
- # The log files get confusing, you know ;-)
- #
- sudo rm -rf /srv/revisor/$datestamp/$spin/log/
+ [ $JUST_LIST -eq 1 ] && echo $spin && continue
- ${revisor_cmd} --config /etc/revisor-unity/f$version-live-respin.conf \
- --model $spin --debug 9 --clean-up $cleanup \
- --destination-directory /srv/revisor/$datestamp/ \
- --report-sizes 2>&1 | tee revisor-$spin.log
+ # Let's make sure we remove the entire directory before we attempt a respin.
+ # The log files get confusing, you know ;-)
+ #
+ sudo rm -rf /srv/revisor/$datestamp/$spin/log/
- [ $? -gt 0 ] && \
- printf "Spin $spin failed, log file attached.$MESSAGE_END" "$datestamp" "$spin" \
- | mail -s "[respin] $spin $datestamp failed" \
- -a revisor-$spin.log \
- -c $NOTIFICATION_FAILURE $NOTIFICATION_SUCCESS || \
- printf "Spin $spin succeeded, log file attached.$MESSAGE_END" "$datestamp" "$spin" \
- | mail -s "[respin] $spin $datestamp succeeded" \
- -a revisor-$spin.log \
- $NOTIFICATION_SUCCESS
+ ${revisor_cmd} --config /etc/revisor-unity/f$version-live-respin.conf \
+ --model $spin --debug 9 --clean-up $cleanup \
+ --destination-directory /srv/revisor/$datestamp/ \
+ --report-sizes 2>&1 | tee revisor-$spin.log
- sudo mkdir -p /srv/revisor/$datestamp/$spin/log/
- sudo mv revisor-$spin.log /srv/revisor/$datestamp/$spin/log/
- done
+ [ $? -gt 0 ] && \
+ printf "Spin $spin failed, log file attached.$MESSAGE_END" "$datestamp" "$spin" \
+ | mail -s "[respin] $spin $datestamp failed" \
+ -a revisor-$spin.log \
+ -c $NOTIFICATION_FAILURE $NOTIFICATION_SUCCESS || \
+ printf "Spin $spin succeeded, log file attached.$MESSAGE_END" "$datestamp" "$spin" \
+ | mail -s "[respin] $spin $datestamp succeeded" \
+ -a revisor-$spin.log \
+ $NOTIFICATION_SUCCESS
- [ $JUST_LIST -eq 1 ] && echo f$version-$arch-respin && continue
+ sudo mkdir -p /srv/revisor/$datestamp/$spin/log/
+ sudo mv revisor-$spin.log /srv/revisor/$datestamp/$spin/log/
+ done
+ fi
- spin_name="f$version-$arch-respin"
+ if [ $INSTALL -eq 1 ]; then
- mock -r fedora-$version-$arch clean | tee revisor-f$version-$arch-respin.log && \
- mock -r fedora-$version-$arch init | tee -a revisor-f$version-$arch-respin.log && \
- mock -r fedora-$version-$arch install $revisor_deps | tee -a revisor-f$version-$arch-respin.log && \
- echo -en "git clone git://git.fedorahosted.org/revisor\n" | mock -r fedora-$version-$arch shell | tee -a revisor-f$version-$arch-respin.log && \
- echo -en "cd /revisor; ./switchhere --yes\n" | mock -r fedora-$version-$arch shell | tee -a revisor-f$version-$arch-respin.log && \
- echo -en "cd /revisor; autoreconf && ./configure\n" | mock -r fedora-$version-$arch shell | tee -a revisor-f$version-$arch-respin.log && \
- echo -en "find /var/lib/rpm/ -name '__db.*' -delete\n" | mock -r fedora-$version-$arch shell | tee -a revisor-f$version-$arch-respin.log && \
+ [ $JUST_LIST -eq 1 ] && echo f$version-$arch-respin && continue
- datestamp=`date +'%Y%m%d'`
+ spin_name="f$version-$arch-respin"
+
+ mock -r fedora-$version-$arch clean | tee revisor-f$version-$arch-respin.log && \
+ mock -r fedora-$version-$arch init | tee -a revisor-f$version-$arch-respin.log && \
+ mock -r fedora-$version-$arch install $revisor_deps | tee -a revisor-f$version-$arch-respin.log && \
+ echo -en "git clone git://git.fedorahosted.org/revisor\n" | mock -r fedora-$version-$arch shell | tee -a revisor-f$version-$arch-respin.log && \
+ echo -en "cd /revisor; ./switchhere --yes\n" | mock -r fedora-$version-$arch shell | tee -a revisor-f$version-$arch-respin.log && \
+ echo -en "cd /revisor; autoreconf && ./configure\n" | mock -r fedora-$version-$arch shell | tee -a revisor-f$version-$arch-respin.log && \
+ echo -en "find /var/lib/rpm/ -name '__db.*' -delete\n" | mock -r fedora-$version-$arch shell | tee -a revisor-f$version-$arch-respin.log && \
+
+ datestamp=`date +'%Y%m%d'`
- # Let's make sure we remove the entire directory before we attempt a respin.
- # The log files get confusing, you know ;-)
- #
- sudo rm -rf /srv/revisor/$datestamp/f$version-$arch-respin/log/
+ # Let's make sure we remove the entire directory before we attempt a respin.
+ # The log files get confusing, you know ;-)
+ #
+ sudo rm -rf /srv/revisor/$datestamp/f$version-$arch-respin/log/
- echo -en "cd /revisor; ./revisor.py --cli --config /etc/revisor-unity/f$version-install-respin.conf --destination-directory /srv/revisor/$datestamp/ --model f$version-$arch-respin --debug 9 --clean-up $cleanup\n" | mock -r fedora-$version-$arch shell | tee -a revisor-f$version-$arch-respin.log
+ echo -en "cd /revisor; ./revisor.py --cli --config /etc/revisor-unity/f$version-install-respin.conf --destination-directory /srv/revisor/$datestamp/ --model f$version-$arch-respin --debug 9 --clean-up $cleanup\n" | mock -r fedora-$version-$arch shell | tee -a revisor-f$version-$arch-respin.log
- [ $? -gt 0 ] && \
- printf "Spin f$version-$arch-respin failed, log file attached.$MESSAGE_END" "$datestamp" "f$version-$arch-respin" \
- | mail -s "[respin] f$version-$arch-respin $datestamp failed" \
- -a revisor-f$version-$arch-respin.log \
- -c $NOTIFICATION_FAILURE $NOTIFICATION_SUCCESS || \
- printf "Spin f$version-$arch-respin succeeded, log file attached.$MESSAGE_END" "$datestamp" "f$version-$arch-respin" \
- | mail -s "[respin] f$version-$arch-respin $datestamp succeeded" \
- -a revisor-f$version-$arch-respin.log \
- $NOTIFICATION_SUCCESS
+ [ $? -gt 0 ] && \
+ printf "Spin f$version-$arch-respin failed, log file attached.$MESSAGE_END" "$datestamp" "f$version-$arch-respin" \
+ | mail -s "[respin] f$version-$arch-respin $datestamp failed" \
+ -a revisor-f$version-$arch-respin.log \
+ -c $NOTIFICATION_FAILURE $NOTIFICATION_SUCCESS || \
+ printf "Spin f$version-$arch-respin succeeded, log file attached.$MESSAGE_END" "$datestamp" "f$version-$arch-respin" \
+ | mail -s "[respin] f$version-$arch-respin $datestamp succeeded" \
+ -a revisor-f$version-$arch-respin.log \
+ $NOTIFICATION_SUCCESS
- sudo mkdir -p /srv/revisor/$datestamp/f$version-$arch-respin/log/
- sudo mv revisor-f$version-$arch-respin.log /srv/revisor/$datestamp/f$version-$arch-respin/log/
+ sudo mkdir -p /srv/revisor/$datestamp/f$version-$arch-respin/log/
+ sudo mv revisor-f$version-$arch-respin.log /srv/revisor/$datestamp/f$version-$arch-respin/log/
+ fi
done
done
commit 43b9135d65d4bf1d51325cb40457672db0142330
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Feb 23 19:25:52 2009 +0100
Ignore errors in the other shutil.rmtree() too
diff --git a/revisor/__init__.py.in b/revisor/__init__.py.in
index 9415a37..4eec8f8 100644
--- a/revisor/__init__.py.in
+++ b/revisor/__init__.py.in
@@ -522,6 +522,6 @@ class Revisor:
# Remove everything
for dir in ["revisor-yumcache"]:
if os.access(os.path.join(self.base.cfg.working_directory, dir), os.R_OK):
- shutil.rmtree(os.path.join(self.base.cfg.working_directory, dir))
+ shutil.rmtree(os.path.join(self.base.cfg.working_directory, dir), ignore_errors=True)
sys.exit(exitcode)
commit e1b1335652b826a99879ab948bc56cad4a8320e4
Merge: 5520b6d... f20ed2c...
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Feb 23 19:16:33 2009 +0100
Merge branch 'master' of git://git.fedorahosted.org/revisor
commit f20ed2c36443c8ce27aff16ccbd10338eeceb111
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Feb 23 19:15:10 2009 +0100
If a sys.exit() call says $? -gt 0 then exit with that same $?
diff --git a/revisor/__init__.py.in b/revisor/__init__.py.in
index 6585844..9415a37 100644
--- a/revisor/__init__.py.in
+++ b/revisor/__init__.py.in
@@ -497,8 +497,8 @@ class Revisor:
try:
self.base.run()
- except SystemExit:
- pass
+ except SystemExit, e:
+ exitcode = e
except KeyboardInterrupt:
exitcode = 1
self.base.log.info(_("Interrupted by user"))
commit 2b56cb1daa9ca48bf3db3fd2937b5fa50e96a437
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Feb 23 18:02:11 2009 +0100
anaconda-runtime does not exist anymore, nor does pygtk
diff --git a/unity/scripts/respin.sh b/unity/scripts/respin.sh
index 4a4deff..c6d4040 100755
--- a/unity/scripts/respin.sh
+++ b/unity/scripts/respin.sh
@@ -50,9 +50,9 @@ if [ $# -eq 0 ]; then
fi
revisor_deps="comps-extras createrepo rhpl pykickstart livecd-tools
- anaconda-runtime squashfs-tools busybox-anaconda notify-python usermode
+ anaconda squashfs-tools busybox-anaconda notify-python usermode
pam python automake intltool gettext desktop-file-utils glib2-devel gcc
- cobbler koan deltarpm pygtk pygtk2-libglade gnome-python2-gconf
+ cobbler koan deltarpm pygtk2-libglade gnome-python2-gconf
system-config-kickstart jigdo livecd-tools python-virtinst git sudo
spin-kickstarts mock"
commit 833ee44eb7cc5db4420b746d4daa868d280ff026
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Feb 23 17:58:53 2009 +0100
That didn't help, because the output is sent to stdout no matter what :/
diff --git a/unity/scripts/respin.sh b/unity/scripts/respin.sh
index 695dee2..4a4deff 100755
--- a/unity/scripts/respin.sh
+++ b/unity/scripts/respin.sh
@@ -93,7 +93,7 @@ done
# on are actually installed
for pkg in $revisor_deps; do
- if [ -z "`rpm -qv $pkg 2>/dev/null`" ]; then
+ if [ -z "`rpm -qv $pkg | grep -v 'not installed'`" ]; then
pkg_error="$pkg_error\nPackage $pkg not installed"
fi
done
commit b1a2c8dad1f293b56f3c5a7a86500c22303536c9
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Feb 23 17:56:58 2009 +0100
Redirect stderr to /dev/null
diff --git a/unity/scripts/respin.sh b/unity/scripts/respin.sh
index e9bfcf3..695dee2 100755
--- a/unity/scripts/respin.sh
+++ b/unity/scripts/respin.sh
@@ -93,7 +93,7 @@ done
# on are actually installed
for pkg in $revisor_deps; do
- if [ -z "`rpm -qv $pkg`" ]; then
+ if [ -z "`rpm -qv $pkg 2>/dev/null`" ]; then
pkg_error="$pkg_error\nPackage $pkg not installed"
fi
done
commit 5520b6d83eba44e2aa9f275e6b452e1defd95731
Merge: c6f823f... 3202c47...
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Feb 23 17:13:00 2009 +0100
Merge branch 'master' of git://git.fedorahosted.org/revisor
commit 3202c47cc4bd04e0afbbd9cf18028b9f1e47efa8
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Feb 23 17:12:33 2009 +0100
Update respin.sh
diff --git a/unity/scripts/respin.sh b/unity/scripts/respin.sh
index 668a710..e9bfcf3 100755
--- a/unity/scripts/respin.sh
+++ b/unity/scripts/respin.sh
@@ -119,7 +119,7 @@ NOTIFICATION_FAILURE="kanarip(a)kanarip.com"
NOTIFICATION_SUCCESS="kanarip(a)kanarip.com"
# Cheat our way through spin-kickstarts
-[ -d /tmp/spin-kickstarts ] && rm -rf /tmp/spin-kickstarts
+[ -d /tmp/spin-kickstarts ] && sudo rm -rf /tmp/spin-kickstarts
git clone git://git.fedorahosted.org/spin-kickstarts.git /tmp/spin-kickstarts
for version in $VERSIONS; do
@@ -141,7 +141,7 @@ for version in $VERSIONS; do
# Let's make sure we remove the entire directory before we attempt a respin.
# The log files get confusing, you know ;-)
#
- rm -rf /srv/revisor/$datestamp/$spin/log/
+ sudo rm -rf /srv/revisor/$datestamp/$spin/log/
${revisor_cmd} --config /etc/revisor-unity/f$version-live-respin.conf \
--model $spin --debug 9 --clean-up $cleanup \
@@ -179,7 +179,7 @@ for version in $VERSIONS; do
# Let's make sure we remove the entire directory before we attempt a respin.
# The log files get confusing, you know ;-)
#
- rm -rf /srv/revisor/$datestamp/f$version-$arch-respin/log/
+ sudo rm -rf /srv/revisor/$datestamp/f$version-$arch-respin/log/
echo -en "cd /revisor; ./revisor.py --cli --config /etc/revisor-unity/f$version-install-respin.conf --destination-directory /srv/revisor/$datestamp/ --model f$version-$arch-respin --debug 9 --clean-up $cleanup\n" | mock -r fedora-$version-$arch shell | tee -a revisor-f$version-$arch-respin.log
commit c6f823f9d140c3a1b8243c253c1922ffeea744af
Merge: 39f1cf2... 7a229a7...
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Feb 23 16:42:12 2009 +0100
Merge branch 'master' of git://git.fedorahosted.org/revisor
commit 7a229a7db22510f0db87c95442f133f39a1960c2
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Feb 23 16:41:39 2009 +0100
Make respins.sh pull over git:// (cronjobs do not have the ssh keys loaded)
diff --git a/unity/scripts/respin.sh b/unity/scripts/respin.sh
index e1681aa..668a710 100755
--- a/unity/scripts/respin.sh
+++ b/unity/scripts/respin.sh
@@ -103,7 +103,7 @@ done
if [ -d ~/devel/revisor/master ]; then
cd ~/devel/revisor/master
- git pull
+ git pull git://git.fedorahosted.org/revisor master
autoreconf -v && ./configure
commit 39f1cf24fe4fbf4641e6bfa8615f120c7d7e2f67
Merge: 8e22687... 5097518...
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Feb 23 16:41:22 2009 +0100
Merge branch 'master' of git://git.fedorahosted.org/revisor
commit 50975180514877c2b34344c351b232069e4a6e82
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Feb 23 16:40:33 2009 +0100
More updates to respin.sh
diff --git a/unity/scripts/respin.sh b/unity/scripts/respin.sh
index 6561338..e1681aa 100755
--- a/unity/scripts/respin.sh
+++ b/unity/scripts/respin.sh
@@ -37,6 +37,9 @@ function usage() {
echo " be specified multiple times."
echo "--arch <arch> - The architectures to respin. Can also be specified"
echo " multiple times."
+ echo ""
+ echo "--cleanup - Pass Revisor how to clean up after itself (default: 1)"
+ echo " See Revisor help for details"
echo "--list - Just list what would have otherwise been respun."
exit 1
@@ -58,6 +61,7 @@ revisor_deps="comps-extras createrepo rhpl pykickstart livecd-tools
##
JUST_LIST=0
+cleanup=1
while [ $# -gt 0 ]; do
case $1 in
@@ -70,6 +74,11 @@ while [ $# -gt 0 ]; do
shift; shift
;;
+ --clean-up|--cleanup)
+ cleanup=$2
+ shift; shift
+ ;;
+
--list)
JUST_LIST=1
shift
@@ -135,7 +144,7 @@ for version in $VERSIONS; do
rm -rf /srv/revisor/$datestamp/$spin/log/
${revisor_cmd} --config /etc/revisor-unity/f$version-live-respin.conf \
- --model $spin --debug 9 --clean-up 2 \
+ --model $spin --debug 9 --clean-up $cleanup \
--destination-directory /srv/revisor/$datestamp/ \
--report-sizes 2>&1 | tee revisor-$spin.log
@@ -172,7 +181,7 @@ for version in $VERSIONS; do
#
rm -rf /srv/revisor/$datestamp/f$version-$arch-respin/log/
- echo -en "cd /revisor; ./revisor.py --cli --config /etc/revisor-unity/f$version-install-respin.conf --destination-directory /srv/revisor/$datestamp/ --model f$version-$arch-respin --debug 9\n" | mock -r fedora-$version-$arch shell | tee -a revisor-f$version-$arch-respin.log
+ echo -en "cd /revisor; ./revisor.py --cli --config /etc/revisor-unity/f$version-install-respin.conf --destination-directory /srv/revisor/$datestamp/ --model f$version-$arch-respin --debug 9 --clean-up $cleanup\n" | mock -r fedora-$version-$arch shell | tee -a revisor-f$version-$arch-respin.log
[ $? -gt 0 ] && \
printf "Spin f$version-$arch-respin failed, log file attached.$MESSAGE_END" "$datestamp" "f$version-$arch-respin" \
@@ -187,4 +196,4 @@ for version in $VERSIONS; do
sudo mkdir -p /srv/revisor/$datestamp/f$version-$arch-respin/log/
sudo mv revisor-f$version-$arch-respin.log /srv/revisor/$datestamp/f$version-$arch-respin/log/
done
-done
\ No newline at end of file
+done
commit 6c3da58493b45c51ab7fddb23af53090bb385e2c
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Feb 23 16:27:58 2009 +0100
Update respins.sh
diff --git a/unity/scripts/respin.sh b/unity/scripts/respin.sh
index 0e16203..6561338 100755
--- a/unity/scripts/respin.sh
+++ b/unity/scripts/respin.sh
@@ -32,6 +32,14 @@
function usage() {
echo "$0 [options]"
+ echo ""
+ echo "--version <version> - The version of the distribution to respin. Can"
+ echo " be specified multiple times."
+ echo "--arch <arch> - The architectures to respin. Can also be specified"
+ echo " multiple times."
+ echo "--list - Just list what would have otherwise been respun."
+
+ exit 1
}
if [ $# -eq 0 ]; then
@@ -45,6 +53,12 @@ revisor_deps="comps-extras createrepo rhpl pykickstart livecd-tools
system-config-kickstart jigdo livecd-tools python-virtinst git sudo
spin-kickstarts mock"
+##
+## Defaults
+##
+
+JUST_LIST=0
+
while [ $# -gt 0 ]; do
case $1 in
--version)
@@ -55,6 +69,14 @@ while [ $# -gt 0 ]; do
ARCHES="$ARCHES $2"
shift; shift
;;
+
+ --list)
+ JUST_LIST=1
+ shift
+ ;;
+ *)
+ usage
+ ;;
esac
done
@@ -83,6 +105,10 @@ else
revisor_cmd="sudo revisor --cli"
fi
+MESSAGE_END="\\n\\nGo to http://$HOSTNAME/revisor/%b/%b/ for more details.\\n\\nKind regards,\\n\\nJeroen van Meeuwen\n-kanarip"
+NOTIFICATION_FAILURE="kanarip(a)kanarip.com"
+NOTIFICATION_SUCCESS="kanarip(a)kanarip.com"
+
# Cheat our way through spin-kickstarts
[ -d /tmp/spin-kickstarts ] && rm -rf /tmp/spin-kickstarts
git clone git://git.fedorahosted.org/spin-kickstarts.git /tmp/spin-kickstarts
@@ -101,17 +127,36 @@ for version in $VERSIONS; do
datestamp=`date +'%Y%m%d'`
+ [ $JUST_LIST -eq 1 ] && echo $spin && continue
+
+ # Let's make sure we remove the entire directory before we attempt a respin.
+ # The log files get confusing, you know ;-)
+ #
+ rm -rf /srv/revisor/$datestamp/$spin/log/
+
${revisor_cmd} --config /etc/revisor-unity/f$version-live-respin.conf \
--model $spin --debug 9 --clean-up 2 \
--destination-directory /srv/revisor/$datestamp/ \
--report-sizes 2>&1 | tee revisor-$spin.log
- [ $? -gt 0 ] && echo "Spin $spin failed, log file attached" | mail -s "$spin failed" -a revisor-$spin.log "kanarip(a)kanarip.com"
+ [ $? -gt 0 ] && \
+ printf "Spin $spin failed, log file attached.$MESSAGE_END" "$datestamp" "$spin" \
+ | mail -s "[respin] $spin $datestamp failed" \
+ -a revisor-$spin.log \
+ -c $NOTIFICATION_FAILURE $NOTIFICATION_SUCCESS || \
+ printf "Spin $spin succeeded, log file attached.$MESSAGE_END" "$datestamp" "$spin" \
+ | mail -s "[respin] $spin $datestamp succeeded" \
+ -a revisor-$spin.log \
+ $NOTIFICATION_SUCCESS
sudo mkdir -p /srv/revisor/$datestamp/$spin/log/
sudo mv revisor-$spin.log /srv/revisor/$datestamp/$spin/log/
done
+ [ $JUST_LIST -eq 1 ] && echo f$version-$arch-respin && continue
+
+ spin_name="f$version-$arch-respin"
+
mock -r fedora-$version-$arch clean | tee revisor-f$version-$arch-respin.log && \
mock -r fedora-$version-$arch init | tee -a revisor-f$version-$arch-respin.log && \
mock -r fedora-$version-$arch install $revisor_deps | tee -a revisor-f$version-$arch-respin.log && \
@@ -119,9 +164,25 @@ for version in $VERSIONS; do
echo -en "cd /revisor; ./switchhere --yes\n" | mock -r fedora-$version-$arch shell | tee -a revisor-f$version-$arch-respin.log && \
echo -en "cd /revisor; autoreconf && ./configure\n" | mock -r fedora-$version-$arch shell | tee -a revisor-f$version-$arch-respin.log && \
echo -en "find /var/lib/rpm/ -name '__db.*' -delete\n" | mock -r fedora-$version-$arch shell | tee -a revisor-f$version-$arch-respin.log && \
+
+ datestamp=`date +'%Y%m%d'`
+
+ # Let's make sure we remove the entire directory before we attempt a respin.
+ # The log files get confusing, you know ;-)
+ #
+ rm -rf /srv/revisor/$datestamp/f$version-$arch-respin/log/
+
echo -en "cd /revisor; ./revisor.py --cli --config /etc/revisor-unity/f$version-install-respin.conf --destination-directory /srv/revisor/$datestamp/ --model f$version-$arch-respin --debug 9\n" | mock -r fedora-$version-$arch shell | tee -a revisor-f$version-$arch-respin.log
- [ $? -gt 0 ] && echo "Spin f$version-$arch-respin failed, log file attached" | mail -s "f$version-$arch-respin failed" -a revisor-f$version-$arch-respin.log "kanarip(a)kanarip.com"
+ [ $? -gt 0 ] && \
+ printf "Spin f$version-$arch-respin failed, log file attached.$MESSAGE_END" "$datestamp" "f$version-$arch-respin" \
+ | mail -s "[respin] f$version-$arch-respin $datestamp failed" \
+ -a revisor-f$version-$arch-respin.log \
+ -c $NOTIFICATION_FAILURE $NOTIFICATION_SUCCESS || \
+ printf "Spin f$version-$arch-respin succeeded, log file attached.$MESSAGE_END" "$datestamp" "f$version-$arch-respin" \
+ | mail -s "[respin] f$version-$arch-respin $datestamp succeeded" \
+ -a revisor-f$version-$arch-respin.log \
+ $NOTIFICATION_SUCCESS
sudo mkdir -p /srv/revisor/$datestamp/f$version-$arch-respin/log/
sudo mv revisor-f$version-$arch-respin.log /srv/revisor/$datestamp/f$version-$arch-respin/log/
commit 73e9221ed70b24b5fbc01258e66a4156622b0ca4
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Feb 23 16:27:45 2009 +0100
Update the descriptions for live spins on Fedora 9 as well
diff --git a/unity/conf/f9-live-respin.conf b/unity/conf/f9-live-respin.conf
index 608a6f2..2115d98 100644
--- a/unity/conf/f9-live-respin.conf
+++ b/unity/conf/f9-live-respin.conf
@@ -31,7 +31,7 @@ description = Fedora Unity Live Desktop Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f9-i386-live-desktop-respin.conf
product_name = Fedora
product_path = Packages
-iso_basename = Fedora-Unity-$datestamp
+iso_basename = Fedora-Unity-Desktop-$datestamp
iso_label = FU Live $datestamp
architecture = i386
version = 9
@@ -139,7 +139,7 @@ description = Fedora Unity Live Desktop Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f9-x86_64-live-desktop-respin.conf
product_name = Fedora
product_path = Packages
-iso_basename = Fedora-Unity-$datestamp
+iso_basename = Fedora-Unity-Desktop-$datestamp
iso_label = FU Live $datestamp
architecture = x86_64
version = 9
@@ -247,7 +247,7 @@ description = Fedora Unity Live Desktop Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f9-ppc-live-desktop-respin.conf
product_name = Fedora
product_path = Packages
-iso_basename = Fedora-Unity-$datestamp
+iso_basename = Fedora-Unity-Desktop-$datestamp
iso_label = FU Live $datestamp
architecture = ppc
version = 9
@@ -355,7 +355,7 @@ description = Fedora Unity Live Desktop Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f9-ppc64-live-desktop-respin.conf
product_name = Fedora
product_path = Packages
-iso_basename = Fedora-Unity-$datestamp
+iso_basename = Fedora-Unity-Desktop-$datestamp
iso_label = FU Live $datestamp
architecture = ppc64
version = 9
commit 8e2268744f4bc297e2095ae5326b85b1000d3719
Merge: 432864e... 5a069d4...
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Feb 23 15:14:04 2009 +0100
Merge branch 'master' of ssh://git.fedorahosted.org/git/revisor
commit 5a069d46418a2eb65e517238870886e8cdd99f3a
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Feb 23 15:13:48 2009 +0100
Update respin.sh
diff --git a/unity/scripts/respin.sh b/unity/scripts/respin.sh
index 53d374e..0e16203 100755
--- a/unity/scripts/respin.sh
+++ b/unity/scripts/respin.sh
@@ -1,5 +1,35 @@
#!/bin/bash
+#
+# Copyright 2008-2009 Jeroen van Meeuwen <kanarip(a)fedoraunity.org>
+#
+# This is a script to automate respins for both installation and live media.
+#
+# The script makes the following assumptions:
+#
+# - you have sudo configured for the user you are executing the script with, for
+# at least the following commands:
+#
+# 1) sudo make install (in /tmp/spin-kickstarts)
+# 2) sudo ./revisor.py (if running from source)
+# 3) sudo revisor (if running from installed RPMs)
+# 4) sudo mkdir -p
+# 5) sudo mv
+#
+# - you have all the required packages installed (see $revisor_deps)
+# - you have enough disk space (haha, no estimate here)
+#
+# And, last but not least, you have configured the following in
+# /etc/mock/site-defaults.cfg:
+#
+# # bind mount plugin is enabled by default but has no configured directories to mount
+# # config_opts['plugin_conf']['bind_mount_enable'] = True
+# config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/selinux/', '/selinux/' ))
+# config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/srv/revisor/', '/srv/revisor/' ))
+# # (optional)
+# config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/var/tmp/revisor-yumcache/', '/var/tmp/revisor-yumcache/' ))
+#
+
function usage() {
echo "$0 [options]"
}
@@ -8,6 +38,13 @@ if [ $# -eq 0 ]; then
usage
fi
+revisor_deps="comps-extras createrepo rhpl pykickstart livecd-tools
+ anaconda-runtime squashfs-tools busybox-anaconda notify-python usermode
+ pam python automake intltool gettext desktop-file-utils glib2-devel gcc
+ cobbler koan deltarpm pygtk pygtk2-libglade gnome-python2-gconf
+ system-config-kickstart jigdo livecd-tools python-virtinst git sudo
+ spin-kickstarts mock"
+
while [ $# -gt 0 ]; do
case $1 in
--version)
@@ -21,6 +58,17 @@ while [ $# -gt 0 ]; do
esac
done
+# Thanks. Now, before we do anything, let's check if the packages we depend
+# on are actually installed
+
+for pkg in $revisor_deps; do
+ if [ -z "`rpm -qv $pkg`" ]; then
+ pkg_error="$pkg_error\nPackage $pkg not installed"
+ fi
+done
+
+[ ! -z "$pkg_error" ] && echo -en "ERROR:\n$pkg_error" && exit 1
+
if [ -d ~/devel/revisor/master ]; then
cd ~/devel/revisor/master
@@ -64,13 +112,18 @@ for version in $VERSIONS; do
sudo mv revisor-$spin.log /srv/revisor/$datestamp/$spin/log/
done
- mock -r fedora-$version-$arch clean && \
- mock -r fedora-$version-$arch init && \
- mock -r fedora-$version-$arch install $revisor_deps && \
- echo -en "git clone git://git.fedorahosted.org/revisor\n" | mock -r fedora-$version-$arch shell
- echo -en "cd /revisor; ./switchhere --yes\n" | mock -r fedora-$version-$arch shell
- echo -en "cd /revisor; autoreconf && ./configure\n" | mock -r fedora-$version-$arch shell
- echo -en "find /var/lib/rpm/ -name '__db.*' -delete\n" | mock -r fedora-$version-$arch shell
- echo -en "cd /revisor; ./revisor.py --cli --config /etc/revisor-unity/f$version-install-respin.conf --model f$version-$arch-respin --debug 9\n" | mock -r fedora-$version-$arch shell;
+ mock -r fedora-$version-$arch clean | tee revisor-f$version-$arch-respin.log && \
+ mock -r fedora-$version-$arch init | tee -a revisor-f$version-$arch-respin.log && \
+ mock -r fedora-$version-$arch install $revisor_deps | tee -a revisor-f$version-$arch-respin.log && \
+ echo -en "git clone git://git.fedorahosted.org/revisor\n" | mock -r fedora-$version-$arch shell | tee -a revisor-f$version-$arch-respin.log && \
+ echo -en "cd /revisor; ./switchhere --yes\n" | mock -r fedora-$version-$arch shell | tee -a revisor-f$version-$arch-respin.log && \
+ echo -en "cd /revisor; autoreconf && ./configure\n" | mock -r fedora-$version-$arch shell | tee -a revisor-f$version-$arch-respin.log && \
+ echo -en "find /var/lib/rpm/ -name '__db.*' -delete\n" | mock -r fedora-$version-$arch shell | tee -a revisor-f$version-$arch-respin.log && \
+ echo -en "cd /revisor; ./revisor.py --cli --config /etc/revisor-unity/f$version-install-respin.conf --destination-directory /srv/revisor/$datestamp/ --model f$version-$arch-respin --debug 9\n" | mock -r fedora-$version-$arch shell | tee -a revisor-f$version-$arch-respin.log
+
+ [ $? -gt 0 ] && echo "Spin f$version-$arch-respin failed, log file attached" | mail -s "f$version-$arch-respin failed" -a revisor-f$version-$arch-respin.log "kanarip(a)kanarip.com"
+
+ sudo mkdir -p /srv/revisor/$datestamp/f$version-$arch-respin/log/
+ sudo mv revisor-f$version-$arch-respin.log /srv/revisor/$datestamp/f$version-$arch-respin/log/
done
done
\ No newline at end of file
commit 432864ee8c6b42a35e0f0940b3d76d788dfab342
Merge: 8fb72f9... e530423...
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Feb 23 14:59:18 2009 +0100
Merge branch 'master' of ssh://git.fedorahosted.org/git/revisor
commit e53042354976bc6463cc7e601229fa3f367797fb
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Feb 23 14:58:46 2009 +0100
Append the package, not extend like if the pkg name was a list... ;-)
diff --git a/revisor/base.py b/revisor/base.py
index 77cf11b..41bd450 100644
--- a/revisor/base.py
+++ b/revisor/base.py
@@ -345,7 +345,7 @@ class RevisorBase:
if self.cfg.kickstart_uses_pkgsack_exclude:
for pkg in excludedList:
- self.cfg.yumobj.conf.exclude.extend(pkg)
+ self.cfg.yumobj.conf.exclude.append(pkg)
self.log.debug(_("Using pkgsack excludes, the list of packages to exclude is now: %r") % self.cfg.yumobj.conf.exclude, level=9)
commit ba9278a368882916c384dc0fe073c31813251d4c
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Feb 23 14:58:09 2009 +0100
Fix spin-kickstarts for respin.sh
diff --git a/unity/scripts/respin.sh b/unity/scripts/respin.sh
index 5cbf9e6..53d374e 100755
--- a/unity/scripts/respin.sh
+++ b/unity/scripts/respin.sh
@@ -35,7 +35,19 @@ else
revisor_cmd="sudo revisor --cli"
fi
+# Cheat our way through spin-kickstarts
+[ -d /tmp/spin-kickstarts ] && rm -rf /tmp/spin-kickstarts
+git clone git://git.fedorahosted.org/spin-kickstarts.git /tmp/spin-kickstarts
+
for version in $VERSIONS; do
+
+ # Build the spin-kickstarts package for this version
+ ourwd=`pwd`
+ cd /tmp/spin-kickstarts
+ [ ! -z "`git branch -la | grep '^ F-$version'`" ] && git checkout F-$version || git checkout --track -b F-$version origin/F-$version
+ autoreconf -v && ./configure --prefix=/usr && sudo make install
+ cd $ourwd
+
for arch in $ARCHES; do
for spin in `${revisor_cmd} --config /etc/revisor-unity/f$version-live-respin.conf --list-models | grep "^ f$version-$arch-" | awk '{print $1}'`; do
commit 8fb72f996608b14ec050e7d331f9a1ac132c6583
Merge: 170af85... 4dd2b6d...
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Feb 23 14:46:21 2009 +0100
Merge branch 'master' of ssh://git.fedorahosted.org/git/revisor
commit 4dd2b6d4ea0a8309033e6c601a64376ec9da46a5
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Feb 23 14:41:12 2009 +0100
A respin shell script
diff --git a/unity/scripts/respin.sh b/unity/scripts/respin.sh
new file mode 100755
index 0000000..5cbf9e6
--- /dev/null
+++ b/unity/scripts/respin.sh
@@ -0,0 +1,64 @@
+#!/bin/bash
+
+function usage() {
+ echo "$0 [options]"
+}
+
+if [ $# -eq 0 ]; then
+ usage
+fi
+
+while [ $# -gt 0 ]; do
+ case $1 in
+ --version)
+ VERSIONS="$VERSIONS $2"
+ shift; shift
+ ;;
+ --arch)
+ ARCHES="$ARCHES $2"
+ shift; shift
+ ;;
+ esac
+done
+
+if [ -d ~/devel/revisor/master ]; then
+ cd ~/devel/revisor/master
+
+ git pull
+
+ autoreconf -v && ./configure
+
+ ./switchhere --yes
+
+ revisor_cmd="sudo ./revisor.py --cli"
+else
+ revisor_cmd="sudo revisor --cli"
+fi
+
+for version in $VERSIONS; do
+ for arch in $ARCHES; do
+ for spin in `${revisor_cmd} --config /etc/revisor-unity/f$version-live-respin.conf --list-models | grep "^ f$version-$arch-" | awk '{print $1}'`; do
+
+ datestamp=`date +'%Y%m%d'`
+
+ ${revisor_cmd} --config /etc/revisor-unity/f$version-live-respin.conf \
+ --model $spin --debug 9 --clean-up 2 \
+ --destination-directory /srv/revisor/$datestamp/ \
+ --report-sizes 2>&1 | tee revisor-$spin.log
+
+ [ $? -gt 0 ] && echo "Spin $spin failed, log file attached" | mail -s "$spin failed" -a revisor-$spin.log "kanarip(a)kanarip.com"
+
+ sudo mkdir -p /srv/revisor/$datestamp/$spin/log/
+ sudo mv revisor-$spin.log /srv/revisor/$datestamp/$spin/log/
+ done
+
+ mock -r fedora-$version-$arch clean && \
+ mock -r fedora-$version-$arch init && \
+ mock -r fedora-$version-$arch install $revisor_deps && \
+ echo -en "git clone git://git.fedorahosted.org/revisor\n" | mock -r fedora-$version-$arch shell
+ echo -en "cd /revisor; ./switchhere --yes\n" | mock -r fedora-$version-$arch shell
+ echo -en "cd /revisor; autoreconf && ./configure\n" | mock -r fedora-$version-$arch shell
+ echo -en "find /var/lib/rpm/ -name '__db.*' -delete\n" | mock -r fedora-$version-$arch shell
+ echo -en "cd /revisor; ./revisor.py --cli --config /etc/revisor-unity/f$version-install-respin.conf --model f$version-$arch-respin --debug 9\n" | mock -r fedora-$version-$arch shell;
+ done
+done
\ No newline at end of file
commit 170af85dd94812b8072db046f3f1eca9f1285517
Merge: 68f1f27... 784beca...
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Feb 23 13:10:12 2009 +0100
Merge branch 'master' of ssh://git.fedorahosted.org/git/revisor
commit 784beca8be4ae7c00f9d11335045112cfbfc8ebb
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Feb 23 12:33:51 2009 +0100
Update descriptions on these spins
diff --git a/unity/conf/f10-live-respin.conf b/unity/conf/f10-live-respin.conf
index 5107638..61a5e23 100644
--- a/unity/conf/f10-live-respin.conf
+++ b/unity/conf/f10-live-respin.conf
@@ -31,7 +31,7 @@ description = Fedora Unity Live Desktop Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-desktop-respin.conf
product_name = Fedora
product_path = Packages
-iso_basename = Fedora-Unity-$datestamp
+iso_basename = Fedora-Unity-Desktop-$datestamp
iso_label = FU Live $datestamp
architecture = i386
version = 10
@@ -49,7 +49,7 @@ description = Fedora Unity Live AOS Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-aos-respin.conf
product_name = Fedora
product_path = Packages
-iso_basename = Fedora-Unity-$datestamp
+iso_basename = Fedora-Unity-AOS-$datestamp
iso_label = FU Live $datestamp
architecture = i386
version = 10
@@ -67,7 +67,7 @@ description = Fedora Unity Live BrOffice.Org Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-broffice.org-respin.conf
product_name = Fedora
product_path = Packages
-iso_basename = Fedora-Unity-$datestamp
+iso_basename = Fedora-Unity-BrOffice.Org-$datestamp
iso_label = FU Live $datestamp
architecture = i386
version = 10
@@ -193,7 +193,7 @@ description = Fedora Unity Live AOS Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-aos-respin.conf
product_name = Fedora
product_path = Packages
-iso_basename = Fedora-Unity-$datestamp
+iso_basename = Fedora-Unity-AOS-$datestamp
iso_label = FU Live $datestamp
architecture = x86_64
version = 10
@@ -211,7 +211,7 @@ description = Fedora Unity Live BrOffice.Org Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-broffice.org-respin.conf
product_name = Fedora
product_path = Packages
-iso_basename = Fedora-Unity-$datestamp
+iso_basename = Fedora-Unity-BrOffice.Org-$datestamp
iso_label = FU Live $datestamp
architecture = x86_64
version = 10
@@ -229,7 +229,7 @@ description = Fedora Unity Live Desktop Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-desktop-respin.conf
product_name = Fedora
product_path = Packages
-iso_basename = Fedora-Unity-$datestamp
+iso_basename = Fedora-Unity-Desktop-$datestamp
iso_label = FU Live $datestamp
architecture = x86_64
version = 10
@@ -355,7 +355,7 @@ description = Fedora Unity Live AOS Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-aos-respin.conf
product_name = Fedora
product_path = Packages
-iso_basename = Fedora-Unity-$datestamp
+iso_basename = Fedora-Unity-AOS-$datestamp
iso_label = FU Live $datestamp
architecture = ppc
version = 10
@@ -373,7 +373,7 @@ description = Fedora Unity Live BrOffice.Org Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-broffice.org-respin.conf
product_name = Fedora
product_path = Packages
-iso_basename = Fedora-Unity-$datestamp
+iso_basename = Fedora-Unity-BrOffice.Org-$datestamp
iso_label = FU Live $datestamp
architecture = ppc
version = 10
@@ -391,7 +391,7 @@ description = Fedora Unity Live Desktop Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-desktop-respin.conf
product_name = Fedora
product_path = Packages
-iso_basename = Fedora-Unity-$datestamp
+iso_basename = Fedora-Unity-Desktop-$datestamp
iso_label = FU Live $datestamp
architecture = ppc
version = 10
@@ -517,7 +517,7 @@ description = Fedora Unity Live AOS Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-aos-respin.conf
product_name = Fedora
product_path = Packages
-iso_basename = Fedora-Unity-$datestamp
+iso_basename = Fedora-Unity-AOS-$datestamp
iso_label = FU Live $datestamp
architecture = ppc64
version = 10
@@ -535,7 +535,7 @@ description = Fedora Unity Live BrOffice.Org Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-broffice.org-respin.conf
product_name = Fedora
product_path = Packages
-iso_basename = Fedora-Unity-$datestamp
+iso_basename = Fedora-Unity-BrOffice.Org-$datestamp
iso_label = FU Live $datestamp
architecture = ppc64
version = 10
@@ -553,7 +553,7 @@ description = Fedora Unity Live Desktop Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-desktop-respin.conf
product_name = Fedora
product_path = Packages
-iso_basename = Fedora-Unity-$datestamp
+iso_basename = Fedora-Unity-Desktop-$datestamp
iso_label = FU Live $datestamp
architecture = ppc64
version = 10
commit 1c7a4e7ae7fed5cfd9b8ac3a580698bd4af3f700
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Sun Feb 22 03:08:04 2009 +0100
Update how sizes are obtained from files and how the size of a tree is estimated
diff --git a/revisor/pungi.py b/revisor/pungi.py
index 584a4a2..e79fba3 100644
--- a/revisor/pungi.py
+++ b/revisor/pungi.py
@@ -454,7 +454,7 @@ cost=500
for disc in range(1, timber.total_discs + 1):
if not we_are_ok: continue
- disc_size = timber.getSize("%s-disc%d" % (timber.dist_dir, disc), blocksize=True)
+ disc_size = timber.getIsoSize("%s-disc%d" % (timber.dist_dir, disc))
if disc_size > timber.target_size:
self.log.debug(_("Disc %s #%d is oversized (%r > %r)") % (self.cfg.mediatypes[discdir]["label"], disc, disc_size, timber.target_size), level=9)
diff --git a/revisor/splittree.py b/revisor/splittree.py
index 94d42fd..e67b01e 100755
--- a/revisor/splittree.py
+++ b/revisor/splittree.py
@@ -26,6 +26,7 @@ import getopt
import time
import types
import rpm
+import subprocess
# Translation
from rhpl.translate import _
@@ -86,21 +87,19 @@ self.reserve_size : Additional size needed to be reserved on the first disc.
self.common_files = ['beta_eula.txt', 'EULA', 'README', 'GPL', 'RPM-GPG-KEY', 'RPM-GPG-KEY-beta', 'RPM-GPG-KEY-fedora']
self.logfile = []
- def getSize(self, path, blocksize=None):
- """Gets the size as reported by du -sL"""
-
- if blocksize:
- p = os.popen("du -slL --block-size=1 %s" % path, 'r')
- thesize = p.read()
- p.close()
- thesize = long(string.split(thesize)[0])
- return thesize
- else:
- p = os.popen("du -slLh %s" % path, 'r')
- thesize = p.read()
- p.close()
- thesize = string.split(thesize)[0]
- return thesize
+
+ def getIsoSize(self, path):
+ """Gets the size that a path would take in iso form"""
+
+ call = ['/usr/bin/genisoimage', '-U', '-J', '-R', '-T', '-m',
+ 'repoview', '-m', 'images/boot.iso', '-print-size',
+ '-quiet', path]
+
+ isosize = int(subprocess.Popen(call,
+ stdout=subprocess.PIPE,
+ stderr=subprocess.PIPE).communicate()[0])
+
+ return isosize * 2048
def reportSizes(self, disc, firstpkg=None, lastpkg=None):
"""appends to self.logfile"""
@@ -110,7 +109,7 @@ self.reserve_size : Additional size needed to be reserved on the first disc.
if lastpkg:
self.logfile.append("Last package on disc%d : %s" % (disc, lastpkg))
- discsize = self.getSize("%s-disc%d" % (self.dist_dir, disc))
+ discsize = self.getIsoSize("%s-disc%d" % (self.dist_dir, disc))
self.logfile.append("%s-disc%d size: %s" % (self.arch, disc, discsize))
def createDiscInfo(self, discnumber):
@@ -245,8 +244,8 @@ self.reserve_size : Additional size needed to be reserved on the first disc.
self.log.debug(_("pkg %s already included, skipping") % pkg, level=9)
continue
- curused = self.getSize("%s-disc%s" % (self.dist_dir, disc), blocksize=1)
- filesize = self.getSize("%s/%s/%s" % (self.dist_dir, pkgdir, pkg), blocksize=1)
+ curused = self.getIsoSize("%s-disc%s" % (self.dist_dir, disc))
+ filesize = os.stat("%s/%s/%s" % (self.dist_dir, pkgdir, pkg)).st_size
newsize = filesize + curused
# compensate for the size of the comps package which has yet to be created
@@ -298,7 +297,7 @@ self.reserve_size : Additional size needed to be reserved on the first disc.
sizes = []
for i in range(0, len(self.src_list)):
- sizes.append([self.getSize("%s-disc%d" % (self.dist_dir, self.src_list[i]), blocksize=1), self.src_list[i]])
+ sizes.append([self.getIsoSize("%s-disc%d" % (self.dist_dir, self.src_list[i])), self.src_list[i]])
sizes.sort()
return sizes[0]
@@ -314,7 +313,7 @@ self.reserve_size : Additional size needed to be reserved on the first disc.
for srpm in os.listdir("%s" % self.src_dir):
if not srpm.endswith('.rpm'):
continue
- srpm_size = self.getSize("%s/%s" % (self.src_dir, srpm), blocksize=1)
+ srpm_size = os.stat("%s/%s" % (self.src_dir, srpm)).st_size
srpm_list.append([srpm_size, srpm])
srpm_list.sort()
@@ -325,12 +324,12 @@ self.reserve_size : Additional size needed to be reserved on the first disc.
# if it isn't, pull it out of the list. If there's only
# one disk make loud noises over the overflow
for disc in self.src_list:
- if self.getSize("%s-disc%s" % (self.dist_dir, disc), blocksize=1) > self.target_size:
+ if self.getIsoSize("%s-disc%s" % (self.dist_dir, disc)) > self.target_size:
if len(self.src_list) < 2:
self.logfile.append("Overflowing %s on disc%d" % (srpm_list[i][1], disc))
break
else:
- discsize = self.getSize("%s-disc%d" % (self.dist_dir, disc))
+ discsize = self.getIsoSize("%s-disc%d" % (self.dist_dir, disc))
self.logfile.append("%s-disc%d size: %s" % (self.arch, disc, discsize))
self.src_list.pop(self.src_list.index(disc))
os.link("%s/%s" % (self.src_dir, srpm_list[i][1]),
commit 94d44cef70584a408ad03fceeddc12c883f72bbb
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Sun Feb 22 02:41:10 2009 +0100
Fix typo
diff --git a/unity/conf/conf.d/fedora-rawhide-single-cd.cfg b/unity/conf/conf.d/fedora-rawhide-single-cd.cfg
index f9c1d11..6b7dc15 100644
--- a/unity/conf/conf.d/fedora-rawhide-single-cd.cfg
+++ b/unity/conf/conf.d/fedora-rawhide-single-cd.cfg
@@ -1,3 +1,3 @@
-%packagesv --nobase
+%packages --nobase
@base --nodefaults
%end
commit 7a31469d57ca8c243d98d44fd44011731c6bce94
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Sun Feb 22 02:24:48 2009 +0100
Workaround from jkeating's pungi for #485167
diff --git a/revisor/splittree.py b/revisor/splittree.py
index 21b0fd5..94d42fd 100755
--- a/revisor/splittree.py
+++ b/revisor/splittree.py
@@ -90,13 +90,13 @@ self.reserve_size : Additional size needed to be reserved on the first disc.
"""Gets the size as reported by du -sL"""
if blocksize:
- p = os.popen("du -sL --block-size=1 %s" % path, 'r')
+ p = os.popen("du -slL --block-size=1 %s" % path, 'r')
thesize = p.read()
p.close()
thesize = long(string.split(thesize)[0])
return thesize
else:
- p = os.popen("du -sLh %s" % path, 'r')
+ p = os.popen("du -slLh %s" % path, 'r')
thesize = p.read()
p.close()
thesize = string.split(thesize)[0]
commit 68f1f27957abab5b2b4b02f08d0678d001022620
Merge: 235c01e... 3254d2c...
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Fri Feb 20 18:55:51 2009 +0100
Merge branch 'master' of ssh://git.fedorahosted.org/git/revisor
commit 235c01eeb08d9659b35c9d7e82f448748f4ce78d
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Fri Feb 20 18:54:31 2009 +0100
Update fedora 10 live respin configuration for x86_64, so that i?86 packages are excluded
diff --git a/unity/conf/conf.d/revisor-f10-x86_64-live-aos-respin.conf b/unity/conf/conf.d/revisor-f10-x86_64-live-aos-respin.conf
index 33a2a0d..91c75de 100644
--- a/unity/conf/conf.d/revisor-f10-x86_64-live-aos-respin.conf
+++ b/unity/conf/conf.d/revisor-f10-x86_64-live-aos-respin.conf
@@ -1,4 +1,5 @@
[main]
+exclude=*.i?86
cachedir=-yumcache
reposdir=
keepcache=1
diff --git a/unity/conf/conf.d/revisor-f10-x86_64-live-broffice.org-respin.conf b/unity/conf/conf.d/revisor-f10-x86_64-live-broffice.org-respin.conf
index 33a2a0d..91c75de 100644
--- a/unity/conf/conf.d/revisor-f10-x86_64-live-broffice.org-respin.conf
+++ b/unity/conf/conf.d/revisor-f10-x86_64-live-broffice.org-respin.conf
@@ -1,4 +1,5 @@
[main]
+exclude=*.i?86
cachedir=-yumcache
reposdir=
keepcache=1
diff --git a/unity/conf/conf.d/revisor-f10-x86_64-live-desktop-respin.conf b/unity/conf/conf.d/revisor-f10-x86_64-live-desktop-respin.conf
index 33a2a0d..91c75de 100644
--- a/unity/conf/conf.d/revisor-f10-x86_64-live-desktop-respin.conf
+++ b/unity/conf/conf.d/revisor-f10-x86_64-live-desktop-respin.conf
@@ -1,4 +1,5 @@
[main]
+exclude=*.i?86
cachedir=-yumcache
reposdir=
keepcache=1
diff --git a/unity/conf/conf.d/revisor-f10-x86_64-live-developer-respin.conf b/unity/conf/conf.d/revisor-f10-x86_64-live-developer-respin.conf
index 33a2a0d..91c75de 100644
--- a/unity/conf/conf.d/revisor-f10-x86_64-live-developer-respin.conf
+++ b/unity/conf/conf.d/revisor-f10-x86_64-live-developer-respin.conf
@@ -1,4 +1,5 @@
[main]
+exclude=*.i?86
cachedir=-yumcache
reposdir=
keepcache=1
diff --git a/unity/conf/conf.d/revisor-f10-x86_64-live-education-math-respin.conf b/unity/conf/conf.d/revisor-f10-x86_64-live-education-math-respin.conf
index 33a2a0d..91c75de 100644
--- a/unity/conf/conf.d/revisor-f10-x86_64-live-education-math-respin.conf
+++ b/unity/conf/conf.d/revisor-f10-x86_64-live-education-math-respin.conf
@@ -1,4 +1,5 @@
[main]
+exclude=*.i?86
cachedir=-yumcache
reposdir=
keepcache=1
diff --git a/unity/conf/conf.d/revisor-f10-x86_64-live-electronic-lab-respin.conf b/unity/conf/conf.d/revisor-f10-x86_64-live-electronic-lab-respin.conf
index 33a2a0d..91c75de 100644
--- a/unity/conf/conf.d/revisor-f10-x86_64-live-electronic-lab-respin.conf
+++ b/unity/conf/conf.d/revisor-f10-x86_64-live-electronic-lab-respin.conf
@@ -1,4 +1,5 @@
[main]
+exclude=*.i?86
cachedir=-yumcache
reposdir=
keepcache=1
diff --git a/unity/conf/conf.d/revisor-f10-x86_64-live-games-respin.conf b/unity/conf/conf.d/revisor-f10-x86_64-live-games-respin.conf
index 33a2a0d..91c75de 100644
--- a/unity/conf/conf.d/revisor-f10-x86_64-live-games-respin.conf
+++ b/unity/conf/conf.d/revisor-f10-x86_64-live-games-respin.conf
@@ -1,4 +1,5 @@
[main]
+exclude=*.i?86
cachedir=-yumcache
reposdir=
keepcache=1
diff --git a/unity/conf/conf.d/revisor-f10-x86_64-live-kde-respin.conf b/unity/conf/conf.d/revisor-f10-x86_64-live-kde-respin.conf
index 33a2a0d..91c75de 100644
--- a/unity/conf/conf.d/revisor-f10-x86_64-live-kde-respin.conf
+++ b/unity/conf/conf.d/revisor-f10-x86_64-live-kde-respin.conf
@@ -1,4 +1,5 @@
[main]
+exclude=*.i?86
cachedir=-yumcache
reposdir=
keepcache=1
diff --git a/unity/conf/conf.d/revisor-f10-x86_64-live-sugar-respin.conf b/unity/conf/conf.d/revisor-f10-x86_64-live-sugar-respin.conf
index 33a2a0d..91c75de 100644
--- a/unity/conf/conf.d/revisor-f10-x86_64-live-sugar-respin.conf
+++ b/unity/conf/conf.d/revisor-f10-x86_64-live-sugar-respin.conf
@@ -1,4 +1,5 @@
[main]
+exclude=*.i?86
cachedir=-yumcache
reposdir=
keepcache=1
diff --git a/unity/conf/conf.d/revisor-f10-x86_64-live-xfce-respin.conf b/unity/conf/conf.d/revisor-f10-x86_64-live-xfce-respin.conf
index 33a2a0d..53042e3 100644
--- a/unity/conf/conf.d/revisor-f10-x86_64-live-xfce-respin.conf
+++ b/unity/conf/conf.d/revisor-f10-x86_64-live-xfce-respin.conf
@@ -1,4 +1,5 @@
[main]
+exclude=*.i?86
cachedir=-yumcache
reposdir=
keepcache=1
@@ -33,7 +34,6 @@ gpgcheck=1
name=Fedora 10 - x86_64 - Updates
baseurl=http://localrepo/fedora/updates/10/x86_64/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
commit e08a90073f19c5e7cfb9703aa0fc3a09c93c6ad5
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Fri Feb 20 18:52:58 2009 +0100
Update __init__.py.in to ignore errors on rmtree() when unmounts have failed
diff --git a/revisor/__init__.py.in b/revisor/__init__.py.in
index 4919188..6585844 100644
--- a/revisor/__init__.py.in
+++ b/revisor/__init__.py.in
@@ -516,7 +516,7 @@ class Revisor:
# Remove our directories in the working directory
for dir in [ "revisor-pungi", "revisor", "revisor-rundir" ]:
if os.access(os.path.join(self.base.cfg.working_directory, dir), os.R_OK):
- shutil.rmtree(os.path.join(self.base.cfg.working_directory, dir))
+ shutil.rmtree(os.path.join(self.base.cfg.working_directory, dir), ignore_errors=True)
if self.base.cfg.clean_up > 1:
# Remove everything
commit 3254d2c4b72be476f96149a7a814aa7505fe888c
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Fri Feb 20 16:35:56 2009 +0100
Fix typo mock_respins.sh
diff --git a/unity/scripts/mock_respins.sh b/unity/scripts/mock_respins.sh
index cae0e2f..02493a6 100755
--- a/unity/scripts/mock_respins.sh
+++ b/unity/scripts/mock_respins.sh
@@ -19,7 +19,7 @@ fi
while [ $# -gt 0 ]; do
case $1 in
--version)
- version="$versions $2"
+ versions="$versions $2"
shift; shift
;;
--arch)
commit dc69faa86a738250306acae642e839f7c8793ec2
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Fri Feb 20 16:32:30 2009 +0100
Even more improvements to mock_respins.sh
diff --git a/unity/scripts/mock_respins.sh b/unity/scripts/mock_respins.sh
index 49c614b..cae0e2f 100755
--- a/unity/scripts/mock_respins.sh
+++ b/unity/scripts/mock_respins.sh
@@ -7,6 +7,15 @@ revisor_deps="comps-extras createrepo rhpl pykickstart livecd-tools
system-config-kickstart jigdo livecd-tools python-virtinst git sudo
spin-kickstarts mock"
+function usage() {
+ echo "$0 [--version v1 [--version v2]] [--arch a1 [--arch a2]]"
+ exit 1
+}
+
+if [ $# -eq 0 ]; then
+ usage
+fi
+
while [ $# -gt 0 ]; do
case $1 in
--version)
@@ -17,6 +26,9 @@ while [ $# -gt 0 ]; do
arches="$arches $2"
shift; shift
;;
+ *)
+ usage
+ ;;
esac
done
commit 08305194e9ff093d23274a757e9407b697a87620
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Fri Feb 20 16:30:26 2009 +0100
Update mock_respins.sh
diff --git a/unity/scripts/mock_respins.sh b/unity/scripts/mock_respins.sh
index ebd829d..49c614b 100755
--- a/unity/scripts/mock_respins.sh
+++ b/unity/scripts/mock_respins.sh
@@ -10,7 +10,7 @@ revisor_deps="comps-extras createrepo rhpl pykickstart livecd-tools
while [ $# -gt 0 ]; do
case $1 in
--version)
- version=$2
+ version="$versions $2"
shift; shift
;;
--arch)
@@ -20,12 +20,14 @@ while [ $# -gt 0 ]; do
esac
done
-for arch in $arches; do
- mock -v -r fedora-$version-$arch init && \
- mock -v -r fedora-$version-$arch install $revisor_deps && \
- echo -en "git clone git://git.fedorahosted.org/revisor\n" | mock -r fedora-$version-$arch shell
- echo -en "cd /revisor; ./switchhere --yes\n" | mock -r fedora-$version-$arch shell
- echo -en "cd /revisor; autoreconf && ./configure\n" | mock -r fedora-$version-$arch shell
- echo -en "rm -rf /var/lib/rpm/__db.00*\n" | mock -r fedora-$version-$arch shell
- echo -en "cd /revisor; ./revisor.py --cli --config /etc/revisor-unity/f10-install-respin.conf --model f$version-$arch-respin --debug 9\n" | mock -r fedora-$version-$arch shell;
-done
+for version in $versions; do
+ for arch in $arches; do
+ mock -r fedora-$version-$arch init && \
+ mock -r fedora-$version-$arch install $revisor_deps && \
+ echo -en "git clone git://git.fedorahosted.org/revisor\n" | mock -r fedora-$version-$arch shell
+ echo -en "cd /revisor; ./switchhere --yes\n" | mock -r fedora-$version-$arch shell
+ echo -en "cd /revisor; autoreconf && ./configure\n" | mock -r fedora-$version-$arch shell
+ echo -en "find /var/lib/rpm/ -name '__db.*' -delete\n" | mock -r fedora-$version-$arch shell
+ echo -en "cd /revisor; ./revisor.py --cli --config /etc/revisor-unity/f$version-install-respin.conf --model f$version-$arch-respin --debug 9\n" | mock -r fedora-$version-$arch shell;
+ done
+done
\ No newline at end of file
commit 8ff6cfc5676e96eef1af7d416ce3b4ba9ab6253f
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Fri Feb 20 04:00:33 2009 +0100
Cosmetic
diff --git a/revisor/plugins.py b/revisor/plugins.py
index 58d0f8e..cb60433 100644
--- a/revisor/plugins.py
+++ b/revisor/plugins.py
@@ -35,14 +35,14 @@ class RevisorPlugins:
'modcomposer': False,
'moddelta': False,
'modgui': False,
+ 'modhub': False,
'modisolinux': False,
'modjigdo': False,
'modmock': False,
'modrebrand': False,
'modreuseinstaller': False,
'modvirt': False,
- 'modserver': False,
- 'modhub': False
+ 'modserver': False
}
self.check_plugins(init=init)
commit 3634e195b92bee44ae83ca338118ce93a9ad3bbf
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Fri Feb 20 04:00:09 2009 +0100
Update repo
diff --git a/intltool-extract b/intltool-extract
new file mode 120000
index 0000000..9fb216d
--- /dev/null
+++ b/intltool-extract
@@ -0,0 +1 @@
+/usr/bin/intltool-extract
\ No newline at end of file
diff --git a/intltool-merge b/intltool-merge
new file mode 120000
index 0000000..fcebf47
--- /dev/null
+++ b/intltool-merge
@@ -0,0 +1 @@
+/usr/bin/intltool-merge
\ No newline at end of file
diff --git a/intltool-update b/intltool-update
new file mode 120000
index 0000000..000b70a
--- /dev/null
+++ b/intltool-update
@@ -0,0 +1 @@
+/usr/bin/intltool-update
\ No newline at end of file
diff --git a/revisor/__init__.py.in b/revisor/__init__.py.in
index 97cba53..4919188 100644
--- a/revisor/__init__.py.in
+++ b/revisor/__init__.py.in
@@ -101,7 +101,7 @@ class Revisor:
"GUI. Does not fallback to " + \
"CLI and thus shows GUI " + \
"related errors"))
- "
+
runtime_group.add_option( "--list-models",
dest = "list_models",
action = "store_true",
commit c218422910bf43471dc22cf523554bdf58716171
Merge: 64dfdea... 1fc1e59...
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Fri Feb 20 03:28:19 2009 +0100
Merge branch 'master' of ssh://git.fedorahosted.org/git/revisor
commit 64dfdea289c3feb7abbbfe362ea288a99623fded
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Fri Feb 20 03:25:05 2009 +0100
Update mock_respins
diff --git a/unity/scripts/mock_respins.sh b/unity/scripts/mock_respins.sh
index 286ea26..ebd829d 100755
--- a/unity/scripts/mock_respins.sh
+++ b/unity/scripts/mock_respins.sh
@@ -1,32 +1,31 @@
#!/bin/bash
-mock -v -r fedora-10-i386 init && \
-mock -v -r fedora-10-i386 install comps-extras createrepo rhpl pykickstart \
- livecd-tools anaconda-runtime squashfs-tools \
- busybox-anaconda notify-python usermode \
- pam python automake intltool gettext \
- desktop-file-utils glib2-devel gcc \
- cobbler koan deltarpm pygtk pygtk2-libglade \
- gnome-python2-gconf system-config-kickstart jigdo \
- livecd-tools python-virtinst git sudo spin-kickstarts mock && \
-echo -en "git clone git://git.fedorahosted.org/revisor\n" | mock -r fedora-10-i386 shell
-echo -en "cd /revisor; ./switchhere --yes\n" | mock -r fedora-10-i386 shell
-echo -en "cd /revisor; autoreconf && ./configure\n" | mock -r fedora-10-i386 shell
-echo -en "rm -rf /var/lib/rpm/__db.00*\n" | mock -r fedora-10-i386 shell
-echo -en "cd /revisor; ./revisor.py --cli --config /etc/revisor-unity/f10-install-respin.conf --model f10-i386-respin --debug 9\n" | mock -r fedora-10-i386 shell
+revisor_deps="comps-extras createrepo rhpl pykickstart livecd-tools
+ anaconda-runtime squashfs-tools busybox-anaconda notify-python usermode
+ pam python automake intltool gettext desktop-file-utils glib2-devel gcc
+ cobbler koan deltarpm pygtk pygtk2-libglade gnome-python2-gconf
+ system-config-kickstart jigdo livecd-tools python-virtinst git sudo
+ spin-kickstarts mock"
-mock -v -r fedora-10-x86_64 init && \
-mock -v -r fedora-10-x86_64 install comps-extras createrepo rhpl pykickstart \
- livecd-tools anaconda-runtime squashfs-tools \
- busybox-anaconda notify-python usermode \
- pam python automake intltool gettext \
- desktop-file-utils glib2-devel gcc \
- cobbler koan deltarpm pygtk pygtk2-libglade \
- gnome-python2-gconf system-config-kickstart jigdo \
- livecd-tools python-virtinst git sudo spin-kickstarts mock && \
-echo -en "git clone git://git.fedorahosted.org/revisor\n" | mock -r fedora-10-x86_64 shell && \
-echo -en "cd /revisor; ./switchhere --yes\n" | mock -r fedora-10-x86_64 shell && \
-echo -en "cd /revisor; autoreconf && ./configure\n" | mock -r fedora-10-x86_64 shell && \
-echo -en "rm -rf /var/lib/rpm/__db.00*\n" | mock -r fedora-10-x86_64 shell && \
-echo -en "cd /revisor; ./revisor.py --cli --config /etc/revisor-unity/f10-install-respin.conf --model f10-x86_64-respin --debug 9\n" | mock -r fedora-10-x86_64 shell
+while [ $# -gt 0 ]; do
+ case $1 in
+ --version)
+ version=$2
+ shift; shift
+ ;;
+ --arch)
+ arches="$arches $2"
+ shift; shift
+ ;;
+ esac
+done
+for arch in $arches; do
+ mock -v -r fedora-$version-$arch init && \
+ mock -v -r fedora-$version-$arch install $revisor_deps && \
+ echo -en "git clone git://git.fedorahosted.org/revisor\n" | mock -r fedora-$version-$arch shell
+ echo -en "cd /revisor; ./switchhere --yes\n" | mock -r fedora-$version-$arch shell
+ echo -en "cd /revisor; autoreconf && ./configure\n" | mock -r fedora-$version-$arch shell
+ echo -en "rm -rf /var/lib/rpm/__db.00*\n" | mock -r fedora-$version-$arch shell
+ echo -en "cd /revisor; ./revisor.py --cli --config /etc/revisor-unity/f10-install-respin.conf --model f$version-$arch-respin --debug 9\n" | mock -r fedora-$version-$arch shell;
+done
commit 1fc1e5930f75d6ea62d2fe508eaeafd502a499e6
Author: Piotr Drąg <piotrdrag(a)gmail.com>
Date: Tue Feb 17 23:05:28 2009 +0000
Updated Polish translation
Transmitted-via: Transifex (translate.fedoraproject.org)
diff --git a/po/Changelog b/po/Changelog
index de64ae7..ae88fe2 100644
--- a/po/Changelog
+++ b/po/Changelog
@@ -1,5 +1,7 @@
Updated Polish translation
+Transmitted-via: Transifex (translate.fedoraproject.org)Updated Polish translation
+
Transmitted-via: Transifex (translate.fedoraproject.org)updated italian translation
Transmitted-via: Transifex (translate.fedoraproject.org)Updated Polish translation
diff --git a/po/pl.po b/po/pl.po
index d25d979..82a50a4 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: pl\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-04 20:39+0100\n"
-"PO-Revision-Date: 2009-02-04 20:53+0100\n"
+"POT-Creation-Date: 2009-02-17 23:34+0100\n"
+"PO-Revision-Date: 2009-02-18 00:04+0100\n"
"Last-Translator: Piotr Drąg <piotrdrag(a)gmail.com>\n"
"Language-Team: Polish <pl(a)li.org>\n"
"MIME-Version: 1.0\n"
@@ -1571,23 +1571,23 @@ msgstr "Rozpoczynanie paska postępu dla "
msgid "Apparently we have not yet entered the Build Media stage"
msgstr "Najwyraźniej nie przeszliśmy jeszcze do etapu budowania nośnika"
-#: ../revisor/base.py:820 ../revisor/misc.py:181
+#: ../revisor/base.py:820 ../revisor/misc.py:185
#, python-format
msgid "Checking dependencies for %s.%s"
msgstr "Sprawdzanie zależności %s.%s"
#. pbar.cur_task += 1.0
-#: ../revisor/base.py:842 ../revisor/misc.py:207
+#: ../revisor/base.py:842 ../revisor/misc.py:211
#, 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:849 ../revisor/misc.py:214
+#: ../revisor/base.py:849 ../revisor/misc.py:218
#, 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:852 ../revisor/misc.py:155
+#: ../revisor/base.py:852 ../revisor/misc.py:159
msgid "Checking dependencies - allowing conflicts within the package set"
msgstr "Sprawdzanie zależności - pozwalanie na konflikty w zestawie pakietów"
@@ -1737,123 +1737,123 @@ msgstr "%s. Ten pakiet jest wymagany."
msgid "Adding suggested package %s-%s:%s-%s.%s"
msgstr "Dodawanie sugerowanego pakietu %s-%s:%s-%s.%s"
-#: ../revisor/base.py:1179
+#: ../revisor/base.py:1180
#, python-format
-msgid "Packages that do not need to be on the media: %s"
-msgstr "Pakiety, które nie muszą być na nośniku: %s"
+msgid "Adding all-arch package %s-%s:%s-%s.%s"
+msgstr "Dodawanie pakietu dla wszystkich architektur %s-%s:%s-%s.%s"
-#: ../revisor/base.py:1204 ../revisor/base.py:1230
+#: ../revisor/base.py:1216 ../revisor/base.py:1242
msgid "Did not succeed in adding in all required packages"
msgstr "Dodanie wszystkich wymaganych pakietów nie powiodło się"
-#: ../revisor/base.py:1238
+#: ../revisor/base.py:1250
msgid "Populating statistics"
msgstr "Tworzenie statystyk"
-#: ../revisor/base.py:1254
+#: ../revisor/base.py:1266
#, python-format
msgid "Package %s-%s:%s-%s.%s does not seem to have a archivesize header"
msgstr ""
"Wydaje się, że pakiet %s-%s:%s-%s.%s nie posiada nagłówka rozmiaru archiwum"
-#: ../revisor/base.py:1262
+#: ../revisor/base.py:1274
#, python-format
msgid "Package %s-%s:%s-%s.%s does not seem to have a installedsize header"
msgstr ""
"Wydaje się, że pakiet %s-%s:%s-%s.%s nie posiada nagłówka rozmiaru po "
"zainstalowaniu"
-#: ../revisor/base.py:1270
+#: ../revisor/base.py:1282
#, python-format
msgid "Package %s-%s:%s-%s.%s does not seem to have a packagesize header"
msgstr ""
"Wydaje się, że pakiet %s-%s:%s-%s.%s nie posiada nagłówka rozmiaru pakietu"
-#: ../revisor/base.py:1280
+#: ../revisor/base.py:1292
#, python-format
msgid "Total size of all packages (archivesize): %s %s"
msgstr "Całkowity rozmiar wszystkich pakietów (rozmiar archiwum): %s %s"
-#: ../revisor/base.py:1281
+#: ../revisor/base.py:1293
#, python-format
msgid "Total size of all packages, (installedsize): %s %s"
msgstr ""
"Całkowity rozmiar wszystkich pakietów (rozmiar po zainstalowaniu): %s %s"
-#: ../revisor/base.py:1282
+#: ../revisor/base.py:1294
#, python-format
msgid "Total size of all packages, (packagesize): %s %s"
msgstr "Całkowity rozmiar wszystkich pakietów (rozmiar pakietu): %s %s"
-#: ../revisor/base.py:1317
+#: ../revisor/base.py:1329
#, python-format
msgid "Report of the %d most space consuming packages"
msgstr "Zgłoś %d pakietów zajmujących najwięcej miejsca"
-#: ../revisor/base.py:1412 ../revisor/base.py:1426 ../revisor/base.py:2056
+#: ../revisor/base.py:1424 ../revisor/base.py:1438 ../revisor/base.py:2068
#, python-format
msgid "Creating pkgdir: %s"
msgstr "Tworzenie pkgdir: %s"
#. Now for each txmbr in
#. Link the localPkg() result into the build tree
-#: ../revisor/base.py:1435
+#: ../revisor/base.py:1447
msgid "Linking in packages"
msgstr "Dowiązywanie pakietów"
-#: ../revisor/base.py:1454 ../revisor/base.py:2080
+#: ../revisor/base.py:1466 ../revisor/base.py:2092
#, python-format
msgid "Package hard link failed: %s: %s"
msgstr "Twarde dowiązanie pakietów nie powiodło się: %s: %s"
-#: ../revisor/base.py:1459 ../revisor/base.py:2085
+#: ../revisor/base.py:1471 ../revisor/base.py:2097
#, python-format
msgid "Copying: %s to %s"
msgstr "Kopiowanie: %s do %s"
-#: ../revisor/base.py:1462 ../revisor/base.py:2088
+#: ../revisor/base.py:1474 ../revisor/base.py:2100
#, python-format
msgid "Symlinking: %s to %s"
msgstr "Dowiązywanie symboliczne: %s do %s"
-#: ../revisor/base.py:1465 ../revisor/base.py:2091
+#: ../revisor/base.py:1477 ../revisor/base.py:2103
msgid "Package symlink succeeded"
msgstr "Dowiązanie symboliczne pakietów powiodło się"
-#: ../revisor/base.py:1467 ../revisor/base.py:1474 ../revisor/base.py:2093
-#: ../revisor/base.py:2100
+#: ../revisor/base.py:1479 ../revisor/base.py:1486 ../revisor/base.py:2105
+#: ../revisor/base.py:2112
#, python-format
msgid "Package link failed, trying copy: %s: %s"
msgstr "Dowiązanie pakietów nie powiodło się, próbowanie skopiowania: %s: %s"
-#: ../revisor/base.py:1484
+#: ../revisor/base.py:1496
msgid "Creating Repository Information"
msgstr "Tworzenie informacji o repozytoriach"
#. FIXME: Optionally recompose installer images
-#: ../revisor/base.py:1499
+#: ../revisor/base.py:1511
msgid "Building Installation Images"
msgstr "Budowanie obrazów instalacyjnych"
-#: ../revisor/base.py:1516
+#: ../revisor/base.py:1528
msgid "Using already existing installer images"
msgstr "Używanie już istniejących obrazów instalatora"
-#: ../revisor/base.py:1530
+#: ../revisor/base.py:1542
msgid "Linking in release notes"
msgstr "Dowiązywanie informacji o wydaniu"
-#: ../revisor/base.py:1542
+#: ../revisor/base.py:1554
#, python-format
msgid "Copying updates.img from %s to %s"
msgstr "Kopiowanie updates.img z %s do %s"
-#: ../revisor/base.py:1551 ../revisor/pungi.py:417
+#: ../revisor/base.py:1563 ../revisor/pungi.py:417
#, python-format
msgid "copy_dir '%s' not accessible"
msgstr "Nie można uzyskać dostępu do copy_dir \"%s\""
-#: ../revisor/base.py:1562
+#: ../revisor/base.py:1574
#, python-format
msgid "Size of the installation tree is %s MB"
msgstr "Rozmiar drzewa instalacyjnego wynosi %s MB"
@@ -1862,25 +1862,25 @@ msgstr "Rozmiar drzewa instalacyjnego wynosi %s MB"
#. That makes our lives difficult, hihi
#. So, make sure that if we're on el_linux, the repository gets
#. bind mounted and configured appropriately
-#: ../revisor/base.py:1612
+#: ../revisor/base.py:1624
msgid "Running pkgorder"
msgstr "Wykonywanie pkgorder"
-#: ../revisor/base.py:1673
+#: ../revisor/base.py:1685
#, python-format
msgid "Running with grouplist: %r"
msgstr "Uruchamianie z grouplist: %r"
-#: ../revisor/base.py:1676
+#: ../revisor/base.py:1688
#, python-format
msgid "Running with packagelist: %r"
msgstr "Uruchamianie z packagelist: %r"
-#: ../revisor/base.py:1683
+#: ../revisor/base.py:1695
msgid "Appending group core and base"
msgstr "Dołączanie grup core i base"
-#: ../revisor/base.py:1695
+#: ../revisor/base.py:1707
#, python-format
msgid "Appending default group %s"
msgstr "Dołączanie domyślnej grupy %s"
@@ -1888,7 +1888,7 @@ msgstr "Dołączanie 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:1717
+#: ../revisor/base.py:1729
#, python-format
msgid "Appending non-default group %s"
msgstr "Dołączanie nie domyślnej grupy %s"
@@ -1896,85 +1896,85 @@ 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:1727
+#: ../revisor/base.py:1739
#, python-format
msgid "Appending non-default support group %s"
msgstr "Dołączanie nie domyślnych grup obsługi %s"
-#: ../revisor/base.py:1793
+#: ../revisor/base.py:1805
#, 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:1795
+#: ../revisor/base.py:1807
msgid "Not running package ordering"
msgstr "Porządkowanie kolejności pakietów nie zostanie wykonane"
-#: ../revisor/base.py:1827
+#: ../revisor/base.py:1839
msgid "^Install using kickstart"
msgstr "^Zainstaluj używając kickstart"
#. Split Tree
-#: ../revisor/base.py:1850
+#: ../revisor/base.py:1862
#, python-format
msgid "Splitting Build Tree (%s)"
msgstr "Rozdzielanie drzewa budowania (%s)"
#. Split repo
-#: ../revisor/base.py:1856
+#: ../revisor/base.py:1868
#, python-format
msgid "Splitting Repository (%s)"
msgstr "Rozdzielanie repozytorium (%s)"
-#: ../revisor/base.py:1870 ../revisor/modgui/build_media.py:244
+#: ../revisor/base.py:1882 ../revisor/modgui/build_media.py:244
#, python-format
msgid "Creating %s ISO Image #%d"
msgstr "Tworzenie %s obrazu ISO #%d"
-#: ../revisor/base.py:1875 ../revisor/modgui/build_media.py:248
+#: ../revisor/base.py:1887 ../revisor/modgui/build_media.py:248
#, python-format
msgid "Creating %s ISO Image"
msgstr "Tworzenie %s obrazu ISO"
#. For all images but source images; implant the md5 into the ISO for the media check
#. FIXME: Well, it seems we don't deal with source images here.
-#: ../revisor/base.py:1889
+#: ../revisor/base.py:1901
msgid "Implanting MD5 into ISO Images"
msgstr "Wprowadzanie MD5 do obrazów ISO"
#. mediatype = built_image["mediatype"]
#. if not mediatype == 'source':
-#: ../revisor/base.py:1897
+#: ../revisor/base.py:1909
#, python-format
msgid "Implanting md5 into ISO Image: %s"
msgstr "Wprowadzanie MD5 do obrazu ISO: %s"
-#: ../revisor/base.py:1903
+#: ../revisor/base.py:1915
msgid "Cannot implant ISO md5sum"
msgstr "Nie można wprowadzić md5sum ISO"
#. Do some SHA1SUMMONING
-#: ../revisor/base.py:1911
+#: ../revisor/base.py:1923
msgid "Creating SHA1SUMs for Images"
msgstr "Tworzenie plików SHA1SUM dla obrazów"
-#: ../revisor/base.py:1927
+#: ../revisor/base.py:1939
msgid "Creating Rescue ISO Image"
msgstr "Tworzenie ratunkowego obrazu ISO"
-#: ../revisor/base.py:1987
+#: ../revisor/base.py:1999
#, python-format
msgid "Copying %s to %s (%d files)"
msgstr "Kopiowanie %s do %s (%d plików)"
-#: ../revisor/base.py:1991
+#: ../revisor/base.py:2003
#, python-format
msgid "Moving %s to %s (%d files)"
msgstr "Przenoszenie %s do %s (%d plików)"
-#: ../revisor/base.py:1994
+#: ../revisor/base.py:2006
#, python-format
msgid ""
"Moving of the source tree failed (trying copy):\n"
@@ -1985,7 +1985,7 @@ msgstr ""
"\n"
"%s"
-#: ../revisor/base.py:1997
+#: ../revisor/base.py:2009
#, python-format
msgid ""
"Copying of the source tree failed:\n"
@@ -1996,12 +1996,12 @@ msgstr ""
"\n"
"%s"
-#: ../revisor/base.py:2002 ../revisor/pungi.py:413
+#: ../revisor/base.py:2014 ../revisor/pungi.py:413
#, python-format
msgid "Copying %s to %s"
msgstr "Kopiowanie %s do %s"
-#: ../revisor/base.py:2006
+#: ../revisor/base.py:2018
#, python-format
msgid ""
"Copying of the installation tree failed:\n"
@@ -2012,41 +2012,41 @@ msgstr ""
"\n"
"%s"
-#: ../revisor/base.py:2012
+#: ../revisor/base.py:2024
msgid "Creating ext3 filesystem"
msgstr "Tworzenie systemu plików ext3"
-#: ../revisor/base.py:2019
+#: ../revisor/base.py:2031
msgid "Configuring System"
msgstr "Konfigurowanie systemu"
#. Now for each txmbr in
#. Link the localPkg() result into the build tree
-#: ../revisor/base.py:2065
+#: ../revisor/base.py:2077
msgid "Linking in Source packages"
msgstr "Dowiązywanie pakietów źródłowych"
-#: ../revisor/base.py:2120
+#: ../revisor/base.py:2132
#, python-format
msgid "Setting rundir to %s"
msgstr "Ustawianie rundir na %s"
-#: ../revisor/base.py:2126
+#: ../revisor/base.py:2138
#, python-format
msgid "Directory %s could not be created. Aborting"
msgstr "Nie można utworzyć folderu %s. Przerywanie"
-#: ../revisor/base.py:2128
+#: ../revisor/base.py:2140
#, python-format
msgid "Running command: %s"
msgstr "Wykonywanie polecenia: %s"
-#: ../revisor/base.py:2129
+#: ../revisor/base.py:2141
#, python-format
msgid "Extra information: %s %s %s"
msgstr "Dodatkowe informacje: %s %s %s"
-#: ../revisor/base.py:2157
+#: ../revisor/base.py:2169
#, python-format
msgid "Got an error from %s (return code %s)"
msgstr "Otrzymano błąd z %s (kod zwrotny %s)"
@@ -2450,35 +2450,31 @@ msgstr ""
#. #
#. # Runtime Options
#. #
-#: ../revisor/__init__.py.in:86
+#: ../revisor/__init__.py.in:89
msgid "Runtime Options"
msgstr "Opcje uruchamiania"
-#: ../revisor/__init__.py.in:91
+#: ../revisor/__init__.py.in:94
msgid "Use the CLI rather then GUI"
msgstr "Użyj CLI zamiast GUI"
-#: ../revisor/__init__.py.in:96
-msgid ""
-"Force Revisor to use the GUI. Does not fallback to CLI and thus shows GUI "
-"related errors"
-msgstr ""
-"Wymuś, aby Revisor użył GUI. Nie powraca do CLI, więc wyświetla błędy "
-"związane z GUI"
+#: ../revisor/__init__.py.in:100
+msgid "Force Revisor to use the "
+msgstr "Wymuś, aby Revisor użył "
-#: ../revisor/__init__.py.in:101
+#: ../revisor/__init__.py.in:109
msgid "List available models"
msgstr "Wyświetl listę dostępnych modułów"
-#: ../revisor/__init__.py.in:106
+#: ../revisor/__init__.py.in:115
msgid "Development mode. Skips some tasks that take time."
msgstr "Tryb programistyczny. Pomija kilka czasochłonnych zadań."
-#: ../revisor/__init__.py.in:111
+#: ../revisor/__init__.py.in:121
msgid "Report the sizes of all RPMs selected in a list"
msgstr "Zgłoś rozmiary wszystkich RPM-ów wybranych na liście"
-#: ../revisor/__init__.py.in:116
+#: ../revisor/__init__.py.in:127
msgid ""
"Force Revisor to interpret the package manifest as complete package nevra "
"(name, epoch, version, release and architecture). Implies --kickstart-exact"
@@ -2486,7 +2482,7 @@ msgstr ""
"Wymuś, aby Revisor interpretował manifest pakietu jako jego kompletny opis "
"(nazwa, epoka, wersja, wydanie i architektura). Wymusza --kickstart-exact"
-#: ../revisor/__init__.py.in:121
+#: ../revisor/__init__.py.in:133
msgid ""
"Tells Revisor to ignore @core and @base (or %packages --nobase) and only add "
"what is in the package manifest"
@@ -2494,7 +2490,7 @@ msgstr ""
"Rozkaż Revisorowi zignorowanie @core i @base (lub %packages --nobase) i "
"dodanie tylko tego z manifestu pakietu"
-#: ../revisor/__init__.py.in:127
+#: ../revisor/__init__.py.in:140
msgid ""
"Should Revisor not clean up at all (0), clean up it's temporary build data "
"(1), or everything -this includes the yum cache (2)"
@@ -2502,60 +2498,60 @@ msgstr ""
"Czy Revisor nie powinien wyczyścić wszystkiego (0), wyczyścić swoje "
"tymczasowe dane budowania (1), czy wszystko, w tym pamięć podręczną yuma (2)"
-#: ../revisor/__init__.py.in:133
+#: ../revisor/__init__.py.in:147
msgid "Size of the USB Thumb Drive. Default to 4G."
msgstr "Rozmiar nośnika USB. Domyślnie 4G."
-#: ../revisor/__init__.py.in:142
+#: ../revisor/__init__.py.in:156
msgid "Set debugging level (0 by default)"
msgstr "Włącz poziom debugowania (domyślnie 0)"
-#: ../revisor/__init__.py.in:151
+#: ../revisor/__init__.py.in:165
msgid "Answer all questions as 'yes'"
msgstr "Na wszystkie pytania odpowiedz \"tak\""
#. #
#. # Configuration Options
#. #
-#: ../revisor/__init__.py.in:156
+#: ../revisor/__init__.py.in:170
msgid "Configuration Options"
msgstr "Opcje konfiguracji"
#. Might be disabled for testing purposes
#. default = os.path.join(BASE_CONFD_DIR,"fedora-7-gold.cfg"),
-#: ../revisor/__init__.py.in:163
+#: ../revisor/__init__.py.in:177
msgid "Use kickstart file"
msgstr "Użyj pliku kickstart"
-#: ../revisor/__init__.py.in:169
+#: ../revisor/__init__.py.in:184
msgid "Save options to given file (as a kickstart)"
msgstr "Zapisz opcje do podanego pliki (jako kickstart)"
-#: ../revisor/__init__.py.in:175
+#: ../revisor/__init__.py.in:191
msgid "Revisor configuration file to use"
msgstr "Użyty plik konfiguracji Revisora"
-#: ../revisor/__init__.py.in:181
+#: ../revisor/__init__.py.in:198
msgid "Get the sources to go with the binaries"
msgstr "Uzyskaj źródła razem z binariami"
-#: ../revisor/__init__.py.in:186
+#: ../revisor/__init__.py.in:204
msgid "Destination directory for products"
msgstr "Folder docelowy dla produktów"
-#: ../revisor/__init__.py.in:192
+#: ../revisor/__init__.py.in:211
msgid "Working directory"
msgstr "Folder roboczy"
-#: ../revisor/__init__.py.in:198
+#: ../revisor/__init__.py.in:218
msgid "Model to use for composing"
msgstr "Użyty model do komponowania"
-#: ../revisor/__init__.py.in:204
+#: ../revisor/__init__.py.in:225
msgid "Mode to use for composing updated spins"
msgstr "Tryb użyty do komponowania zaktualizowanych kompozycji"
-#: ../revisor/__init__.py.in:209
+#: ../revisor/__init__.py.in:231
msgid ""
"Sometimes, it's better to copy local data rather then (sym)linking it. If "
"you have enough space..."
@@ -2563,56 +2559,56 @@ msgstr ""
"Czasami lepiej jest skopiować lokalne dane, niż je dowiązywać "
"(symbolicznie). Jeśli masz wystarczającą ilość miejsca..."
-#: ../revisor/__init__.py.in:214
+#: ../revisor/__init__.py.in:237
msgid "Directory to copy onto the media"
msgstr "Folder do skopiowania na nośnik"
#. #
#. # Installation Media Options
#. #
-#: ../revisor/__init__.py.in:219
+#: ../revisor/__init__.py.in:242
msgid "Installation Media Options"
msgstr "Opcje nośników instalacyjnych"
-#: ../revisor/__init__.py.in:224
+#: ../revisor/__init__.py.in:247
msgid "Create Installation Media CDs (Capacity per disc: 685MB)"
msgstr "Utwórz instalacyjne nośniki CD (pojemność jednej płyty: 685MB)"
-#: ../revisor/__init__.py.in:229
+#: ../revisor/__init__.py.in:253
msgid "Create Installation Media DVDs (Capacity per disc: 4.3GB)"
msgstr "Utwórz instalacyjne nośniki DVD (pojemność jednej płyty: 4.3GB)"
-#: ../revisor/__init__.py.in:234
+#: ../revisor/__init__.py.in:259
msgid "Create Installation Media Dual-Layered DVDs (Capacity per disc: 8.5GB)"
msgstr ""
"Utwórz instalacyjne dwuwarstwowe nośniki DVD (pojemność jednej płyty: 8.5GB)"
-#: ../revisor/__init__.py.in:239
+#: ../revisor/__init__.py.in:265
msgid "Create Installation Media Blu-Ray Discs (Capacity per disc: 25GB)"
msgstr "Utwórz instalacyjne nośniki Blu-Ray (pojemność jednej płyty: 25GB)"
-#: ../revisor/__init__.py.in:244
+#: ../revisor/__init__.py.in:271
msgid ""
"Create Installation Media Duallayer Blu-Ray Discs (Capacity per disc: 50GB)"
msgstr "Utwórz instalacyjne nośniki Blu-Ray (pojemność jednej płyty: 50GB)"
-#: ../revisor/__init__.py.in:249
+#: ../revisor/__init__.py.in:277
msgid "Create Unified ISO from install tree"
msgstr "Utwórz obraz ISO z drzewa instalacji"
-#: ../revisor/__init__.py.in:260
+#: ../revisor/__init__.py.in:290
msgid "Create the Installation Tree."
msgstr "Utwórz drzewo instalacyjne."
-#: ../revisor/__init__.py.in:265
+#: ../revisor/__init__.py.in:296
msgid "Create Media without graphical installer."
msgstr "Utwórz nośnik bez instalatora graficznego."
-#: ../revisor/__init__.py.in:270
+#: ../revisor/__init__.py.in:302
msgid "Include kickstart file on media or in the tree"
msgstr "Dołącz plik kickstart do nośnika lub w drzewie"
-#: ../revisor/__init__.py.in:275
+#: ../revisor/__init__.py.in:308
msgid ""
"In the bootloader menu (isolinux.cfg), set kickstart to boot by default "
"(works with --kickstart-include)"
@@ -2620,32 +2616,32 @@ msgstr ""
"W menu programu startowego (isolinux.cfg) ustaw domyślne uruchamianie "
"kickstart (działa z --kickstart-include)"
-#: ../revisor/__init__.py.in:280
+#: ../revisor/__init__.py.in:314
msgid "Filter anything from comps that is not in the package set"
msgstr "Filtruj z comps wszystko, co nie znajduje się w zestawie pakietów"
-#: ../revisor/__init__.py.in:285
+#: ../revisor/__init__.py.in:320
msgid "Use Revisor's comps file instead of those from the repositories"
msgstr "Użyj pliku comps Revisora zamiast pliku comps z repozytoriów"
-#: ../revisor/__init__.py.in:290
+#: ../revisor/__init__.py.in:326
msgid "Comps file to include on the installation media"
msgstr "Plik comps do dołączenia do nośnika instalacyjnego"
-#: ../revisor/__init__.py.in:295
+#: ../revisor/__init__.py.in:332
msgid "Include specified updates.img on installation media."
msgstr "Dołącz określony updates.img do nośnika instalacyjnego."
-#: ../revisor/__init__.py.in:301
+#: ../revisor/__init__.py.in:339
msgid "Product Name"
msgstr "Nazwa produktu"
-#: ../revisor/__init__.py.in:306
+#: ../revisor/__init__.py.in:345
msgid ""
"Product Path (e.g. Fedora/ or Packages/ -but without the appending slash)"
msgstr "Ścieżka do produktu (np. Fedora/ lub Packages/ - ale bez ukośnika)"
-#: ../revisor/__init__.py.in:311
+#: ../revisor/__init__.py.in:351
msgid ""
"ISO Label Base. Note that other things are appended but that the length can "
"be 32 chars maximum."
@@ -2653,15 +2649,15 @@ msgstr ""
"Podstawa etykiety ISO. Zauważ, że mogą występować inne rzeczy, ale nie może "
"mieć więcej niż 32 znaki."
-#: ../revisor/__init__.py.in:316
+#: ../revisor/__init__.py.in:357
msgid "The base name for the ISOs"
msgstr "Podstawowa nazwa dla ISO"
-#: ../revisor/__init__.py.in:321
+#: ../revisor/__init__.py.in:363
msgid "Product Version"
msgstr "Wersja produktu"
-#: ../revisor/__init__.py.in:326
+#: ../revisor/__init__.py.in:369
msgid ""
"Base Product Version - relevant to required packages and pykickstart "
"compatibility"
@@ -2672,50 +2668,50 @@ msgstr ""
#. #
#. # Utility Media Options
#. #
-#: ../revisor/__init__.py.in:331
+#: ../revisor/__init__.py.in:374
msgid "Utility Media Options"
msgstr "Opcje nośników narzędziowych"
-#: ../revisor/__init__.py.in:336
+#: ../revisor/__init__.py.in:379
msgid "Create Rescue Media"
msgstr "Utwórz nośnik ratunkowy"
#. #
#. # Live Media Options
#. #
-#: ../revisor/__init__.py.in:341
+#: ../revisor/__init__.py.in:384
msgid "Live Media Options"
msgstr "Opcje nośników Live"
-#: ../revisor/__init__.py.in:346
+#: ../revisor/__init__.py.in:389
msgid "Create Live Media CD/DVD"
msgstr "Utwórz nośnik CD/DVD Live"
-#: ../revisor/__init__.py.in:351
+#: ../revisor/__init__.py.in:395
msgid "Create Live Media Thumb Drive Image (will be depreciated)"
msgstr "Utwórz obraz nośnika Live dla dysku USB (przestarzałe)"
-#: ../revisor/__init__.py.in:356
+#: ../revisor/__init__.py.in:401
msgid "Create Live Media Hard Disk Image (will be depreciated)"
msgstr "Utwórz obraz nośnika Live dla dysku twardego (przestarzałe)"
-#: ../revisor/__init__.py.in:361
+#: ../revisor/__init__.py.in:407
msgid "Create Live Media Raw Hard Disk Image"
msgstr "Utwórz surowy obraz nośnika Live dla dysku twardego"
-#: ../revisor/__init__.py.in:366
+#: ../revisor/__init__.py.in:413
msgid "Interactively work in the live image before building the ISO image."
msgstr "Działania interaktywne w obrazie Live przed budowaniem obrazu ISO."
-#: ../revisor/__init__.py.in:371
+#: ../revisor/__init__.py.in:419
msgid "Skip file system compression."
msgstr "Pomiń kompresję systemu plików."
-#: ../revisor/__init__.py.in:376
+#: ../revisor/__init__.py.in:425
msgid "Skip prelinking the contents of the filesystem."
msgstr "Pomiń prekonsolidowanie zawartości systemu plików."
-#: ../revisor/__init__.py.in:381
+#: ../revisor/__init__.py.in:431
msgid ""
"Ignore filesystem overhead. Useless blocks will not be removed from the "
"filesystem."
@@ -2723,20 +2719,20 @@ msgstr ""
"Zignoruj wyższy system plików. Mimo to bloki nie zostaną usunięte z systemu "
"plików."
-#: ../revisor/__init__.py.in:386
+#: ../revisor/__init__.py.in:437
msgid "Set the preferred kernel. One of normal, PAE, xen or debug."
msgstr "Ustaw preferowane jądro: normal, PAE, xen lub debug."
-#: ../revisor/__init__.py.in:427
+#: ../revisor/__init__.py.in:478
#, python-format
msgid " %s - No Description"
msgstr "%s - brak opisu"
-#: ../revisor/__init__.py.in:453
+#: ../revisor/__init__.py.in:504
msgid "Interrupted by user"
msgstr "Przerwano przez użytkownika"
-#: ../revisor/__init__.py.in:459
+#: ../revisor/__init__.py.in:510
msgid ""
"Traceback occurred, please report a bug at http://fedorahosted.org/revisor"
msgstr "Wystąpił błąd, proszę zgłosić błąd na http://fedorahosted.org/revisor"
@@ -2780,12 +2776,12 @@ msgstr ""
"posiadały SELinuksa, a w rezultacie system zainstalowany z tego nośnika "
"również nie będzie posiadał SELinuksa."
-#: ../revisor/misc.py:137 ../revisor/misc.py:144
+#: ../revisor/misc.py:141 ../revisor/misc.py:148
#, python-format
msgid "Resolved %s"
msgstr "Rozwiązano %s"
-#: ../revisor/misc.py:147
+#: ../revisor/misc.py:151
#, python-format
msgid ""
"Looking to resolve package %s to a Provides, but we still can't find it."
commit c76d857046e931121ab8241a268fd921dfa8960a
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Tue Feb 17 16:35:42 2009 +0100
Fix the case where allarch packages like glibc and openssl are not being pulled in properly
diff --git a/revisor/base.py b/revisor/base.py
index af18de5..77cf11b 100644
--- a/revisor/base.py
+++ b/revisor/base.py
@@ -1107,10 +1107,10 @@ class RevisorBase:
def pkglist_required(self, mode='installation'):
- required_pkgs = revisor.misc.resolve_pkgs(self.cfg.yumobj, self.cfg.get_package_list(mode,['require']), log=self.log)
- suggested_pkgs = revisor.misc.resolve_pkgs(self.cfg.yumobj, self.cfg.get_package_list(mode,['suggest']), log=self.log)
- allarch_pkgs = revisor.misc.resolve_pkgs(self.cfg.yumobj, self.cfg.get_package_list(mode,['allarch']), log=self.log)
- onearch_pkgs = revisor.misc.resolve_pkgs(self.cfg.yumobj, self.cfg.get_package_list(mode,['onearch']), log=self.log)
+ required_pkgs = revisor.misc.resolve_pkgs(self.cfg.yumobj, self.cfg.get_package_list(mode, ['require']), log=self.log)
+ suggested_pkgs = revisor.misc.resolve_pkgs(self.cfg.yumobj, self.cfg.get_package_list(mode, ['suggest']), log=self.log)
+ allarch_pkgs = revisor.misc.resolve_pkgs(self.cfg.yumobj, self.cfg.get_package_list(mode, ['allarch']), log=self.log)
+ onearch_pkgs = revisor.misc.resolve_pkgs(self.cfg.yumobj, self.cfg.get_package_list(mode, ['onearch']), log=self.log)
packages_to_add = required_pkgs + suggested_pkgs + allarch_pkgs + onearch_pkgs
packages_to_skip = []
@@ -1170,13 +1170,25 @@ class RevisorBase:
except:
pass
- self.added_pkgs = []
+ # From the list of packages that need all architectures
+ for pkg in allarch_pkgs:
+ if not pkg in packages_to_skip:
+ try:
+ pkgs = self.cfg.yumobj.pkgSack.returnNewestByName(pkg)
+ for po in pkgs:
+ self.cfg.yumobj.tsInfo.addInstall(po)
+ self.log.debug(_("Adding all-arch package %s-%s:%s-%s.%s") % (po.name, po.epoch, po.version, po.release, po.arch), level=4)
+ except:
+ pass
+
+ #self.added_pkgs = []
+
+ #for package in packages_to_add:
+ #if not package in packages_to_skip:
+ #self.added_pkgs.append(package)
- for package in packages_to_add:
- if not package in packages_to_skip:
- self.added_pkgs.append(package)
+ #self.log.debug(_("Packages that do not need to be on the media: %s") % str(self.added_pkgs), level=9)
- self.log.debug(_("Packages that do not need to be on the media: %s") % str(self.added_pkgs), level=9)
return True
def lift_off(self):
commit bae7b025b6cbc0a61043f7b788fdbd5c039dccca
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Tue Feb 17 15:26:33 2009 +0100
Update the description for rawhide spins
diff --git a/unity/conf/rawhide-install-respin.conf b/unity/conf/rawhide-install-respin.conf
index 21c29c2..f4e0f18 100644
--- a/unity/conf/rawhide-install-respin.conf
+++ b/unity/conf/rawhide-install-respin.conf
@@ -23,7 +23,7 @@ getsource = 1
bugurl = http://bugzilla.redhat.com
[rawhide-i386-respin]
-description = Fedora Unity Re-Spin Model for Fedora 9
+description = Fedora Unity Re-Spin Model for Fedora Rawhide
main = /etc/revisor-unity/conf.d/revisor-rawhide-i386-respin.conf
product_name = Fedora
product_path = Packages
@@ -35,7 +35,7 @@ version_from = DEVEL
kickstart_file = /usr/share/spin-kickstarts/fedora-install-fedora.ks
[rawhide-x86_64-respin]
-description = Fedora Unity Re-Spin Model for Fedora 9
+description = Fedora Unity Re-Spin Model for Fedora Rawhide
main = /etc/revisor-unity/conf.d/revisor-rawhide-x86_64-respin.conf
product_name = Fedora
product_path = Packages
@@ -47,7 +47,7 @@ version_from = DEVEL
kickstart_file = /usr/share/spin-kickstarts/fedora-install-fedora.ks
[rawhide-ppc-respin]
-description = Fedora Unity Re-Spin Model for Fedora 9
+description = Fedora Unity Re-Spin Model for Fedora Rawhide
main = /etc/revisor-unity/conf.d/revisor-rawhide-ppc-respin.conf
product_name = Fedora
product_path = Packages
@@ -59,7 +59,7 @@ version_from = DEVEL
kickstart_file = /usr/share/spin-kickstarts/fedora-install-fedora.ks
[rawhide-ppc64-respin]
-description = Fedora Unity Re-Spin Model for Fedora 9
+description = Fedora Unity Re-Spin Model for Fedora Rawhide
main = /etc/revisor-unity/conf.d/revisor-rawhide-ppc64-respin.conf
product_name = Fedora
product_path = Packages
commit 01893ac59b2b963c32723332b72764e3dcde8fa7
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Tue Feb 17 15:25:11 2009 +0100
Remove the extra verbose execution
diff --git a/scripts/F10-buildinstall b/scripts/F10-buildinstall
index 64c3d06..3cd7cdd 100755
--- a/scripts/F10-buildinstall
+++ b/scripts/F10-buildinstall
@@ -197,17 +197,17 @@ BUILDINSTALL=$BUILDINSTDIR/buildinstall
if [ -n "$UPDATES" ]; then UPDATES="--updates $UPDATES"; fi
echo "Building images..."
-sh -x $UPD_INSTROOT $DEBUGSTR $NOGRSTR --arch $BUILDARCH $UPDATES --imgdir $TREEDIR/install $yumconf
+$UPD_INSTROOT $DEBUGSTR $NOGRSTR --arch $BUILDARCH $UPDATES --imgdir $TREEDIR/install $yumconf
echo "Writing .treeinfo file..."
$MK_TREEINFO --family="$PRODUCTSTR" ${VARIANT:+--variant="$VARIANT"} --version=$VERSION --arch=$BUILDARCH --outfile=$OUTPUT/.treeinfo
# FIXME: need to update mk-images to take the yumconf
echo "Making images..."
-sh -x $MK_IMAGES $DEBUGSTR $NOGRSTR --imgdir $TREEDIR/install --arch $BUILDARCH --product "$PRODUCTSTR" --version $VERSION --bugurl "$BUGURL" --output $OUTPUT $yumconf
+$MK_IMAGES $DEBUGSTR $NOGRSTR --imgdir $TREEDIR/install --arch $BUILDARCH --product "$PRODUCTSTR" --version $VERSION --bugurl "$BUGURL" --output $OUTPUT $yumconf
echo "Writing .discinfo file"
$MK_STAMP --releasestr="$RELEASESTR" --arch=$BUILDARCH --discNum="ALL" --outfile=$OUTPUT/.discinfo
-#rm -rf $TREEDIR $BUILDINSTDIR
-#rm -f $yumconf
+rm -rf $TREEDIR $BUILDINSTDIR
+rm -f $yumconf
commit 9a94eefe5daf620cb77f0bf61dbb8f292407a857
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Tue Feb 17 15:24:28 2009 +0100
Make the cache for anacondarepos more consistent, rather then random
diff --git a/scripts/DEVEL-buildinstall b/scripts/DEVEL-buildinstall
index 614623f..8453ba1 100755
--- a/scripts/DEVEL-buildinstall
+++ b/scripts/DEVEL-buildinstall
@@ -142,7 +142,7 @@ done
yumconf=$(mktemp ${TMPDIR:-/tmp}/yum.conf.XXXXXX)
cat > $yumconf <<EOF
[main]
-cachedir=$CACHEDIR
+cachedir=/var/tmp/revisor-yumcache
keepcache=0
gpgcheck=0
plugins=0
diff --git a/scripts/F10-buildinstall b/scripts/F10-buildinstall
index 97eaf61..64c3d06 100755
--- a/scripts/F10-buildinstall
+++ b/scripts/F10-buildinstall
@@ -123,7 +123,7 @@ CACHEDIR=$(mktemp -d ${TMPDIR:-/tmp}/yumcache.XXXXXX)
yumconf=$(mktemp ${TMPDIR:-/tmp}/yum.conf.XXXXXX)
cat > $yumconf <<EOF
[main]
-cachedir=$CACHEDIR
+cachedir=/var/tmp/revisor-yumcache
keepcache=0
gpgcheck=0
plugins=0
@@ -197,17 +197,17 @@ BUILDINSTALL=$BUILDINSTDIR/buildinstall
if [ -n "$UPDATES" ]; then UPDATES="--updates $UPDATES"; fi
echo "Building images..."
-$UPD_INSTROOT $DEBUGSTR $NOGRSTR --arch $BUILDARCH $UPDATES --imgdir $TREEDIR/install $yumconf
+sh -x $UPD_INSTROOT $DEBUGSTR $NOGRSTR --arch $BUILDARCH $UPDATES --imgdir $TREEDIR/install $yumconf
echo "Writing .treeinfo file..."
$MK_TREEINFO --family="$PRODUCTSTR" ${VARIANT:+--variant="$VARIANT"} --version=$VERSION --arch=$BUILDARCH --outfile=$OUTPUT/.treeinfo
# FIXME: need to update mk-images to take the yumconf
echo "Making images..."
-$MK_IMAGES $DEBUGSTR $NOGRSTR --imgdir $TREEDIR/install --arch $BUILDARCH --product "$PRODUCTSTR" --version $VERSION --bugurl "$BUGURL" --output $OUTPUT $yumconf
+sh -x $MK_IMAGES $DEBUGSTR $NOGRSTR --imgdir $TREEDIR/install --arch $BUILDARCH --product "$PRODUCTSTR" --version $VERSION --bugurl "$BUGURL" --output $OUTPUT $yumconf
echo "Writing .discinfo file"
$MK_STAMP --releasestr="$RELEASESTR" --arch=$BUILDARCH --discNum="ALL" --outfile=$OUTPUT/.discinfo
-rm -rf $TREEDIR $BUILDINSTDIR
-rm -f $yumconf
+#rm -rf $TREEDIR $BUILDINSTDIR
+#rm -f $yumconf
commit 02a7d2c93b3bf70b01027c4d29efa71660c4c478
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Tue Feb 17 15:24:00 2009 +0100
Cosmetic
diff --git a/revisor/misc.py b/revisor/misc.py
index bde8f4f..8df46bc 100644
--- a/revisor/misc.py
+++ b/revisor/misc.py
@@ -112,10 +112,14 @@ def check_file(file_name, checksum=None, destroy=False):
return False
def resolve_pkgs(yumobj, package_list, log=None):
- """Given a list of 'packages', resolves these 'packages' into package names so that later
- they can be selected. A good example is the suggested package 'system-logos', which just so
- happens to be 'fedora-logos', or 'generic-logos', or 'redhat-logos', or 'centos-logos'. We don't
- know, and neither do you"""
+ """
+ Given a list of 'packages', resolves these 'packages' into package names
+ so that later they can be selected. A good example is the suggested
+ package 'system-logos', which just so happens to be 'fedora-logos', or
+ 'generic-logos', or 'redhat-logos', or 'centos-logos'. We don't know,
+ and neither do you
+ """
+
final_package_list = []
for pkg in package_list:
commit 1db25c660bfa4d569b5420f625812aa3c7820fb5
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Tue Feb 17 15:23:38 2009 +0100
Cosmetic
diff --git a/revisor/__init__.py.in b/revisor/__init__.py.in
index dce9aef..97cba53 100644
--- a/revisor/__init__.py.in
+++ b/revisor/__init__.py.in
@@ -69,10 +69,13 @@ class Revisor:
self.base = revisor.base.RevisorBase(self)
def parse_options(self, load_plugins=True):
- """Create the OptionParser for the options passed to us from runtime cli"""
+ """
+ Create the OptionParser for the options passed to us from runtime
+ Command Line Interface.
+ """
- epilog = """Revisor is a Fedora Unity product. For more information about Revisor, visit
- http://revisor.fedoraunity.org/"""
+ epilog = """Revisor is a Fedora Unity product. For more information
+ about Revisor, visit http://revisor.fedoraunity.org/"""
# Enterprise Linux 5 does not have an "epilog" parameter to OptionParser
try:
@@ -89,42 +92,53 @@ class Revisor:
action = "store_true",
default = False,
help = _("Use the CLI rather then GUI"))
+
runtime_group.add_option( "--gui",
dest = "gui_mode",
action = "store_true",
default = False,
- help = _("Force Revisor to use the GUI. Does not fallback to CLI and thus shows GUI related errors"))
+ help = _("Force Revisor to use the " + \
+ "GUI. Does not fallback to " + \
+ "CLI and thus shows GUI " + \
+ "related errors"))
+ "
runtime_group.add_option( "--list-models",
dest = "list_models",
action = "store_true",
default = False,
help = _("List available models"))
+
runtime_group.add_option( "--devel",
dest = "mode_devel",
action = "store_true",
default = False,
help = _("Development mode. Skips some tasks that take time."))
+
runtime_group.add_option( "--report-sizes",
dest = "report_sizes",
action = "store_true",
default = False,
help = _("Report the sizes of all RPMs selected in a list"))
+
runtime_group.add_option( "--kickstart-exact-nevra",
dest = "kickstart_exact_nevra",
action = "store_true",
default = False,
help = _("Force Revisor to interpret the package manifest as complete package nevra (name, epoch, version, release and architecture). Implies --kickstart-exact"))
+
runtime_group.add_option( "--kickstart-exact",
dest = "kickstart_exact",
action = "store_true",
default = False,
help = _("Tells Revisor to ignore @core and @base (or %packages --nobase) and only add what is in the package manifest"))
+
runtime_group.add_option( "--clean-up",
dest = "clean_up",
action = "store",
type = 'int',
default = 1,
help = _("Should Revisor not clean up at all (0), clean up it's temporary build data (1), or everything -this includes the yum cache (2)"))
+
runtime_group.add_option( "--usb-size",
dest = "usb_size",
action = "store",
@@ -162,51 +176,60 @@ class Revisor:
# default = os.path.join(BASE_CONFD_DIR,"fedora-7-gold.cfg"),
help = _("Use kickstart file"),
metavar = "[kickstart file]")
+
config_group.add_option( "--kickstart-save",
dest = "kickstart_save",
action ="store",
default = "",
help = _("Save options to given file (as a kickstart)"),
metavar = "[file name]")
+
config_group.add_option( "-c", "--config",
dest = "config",
action = "store",
default = os.path.join(BASE_CONF_DIR,"revisor.conf"),
help = _("Revisor configuration file to use"),
metavar = "[config file]")
+
config_group.add_option( "--source",
dest = "getsource",
action = "store_true",
default = False,
help = _("Get the sources to go with the binaries"))
+
config_group.add_option( "--destination-directory",
dest = "destination_directory",
action = "store",
default = "/srv/revisor/",
help = _("Destination directory for products"),
metavar = "[directory]")
+
config_group.add_option( "--working-directory",
dest = "working_directory",
action = "store",
default = "/var/tmp/",
help = _("Working directory"),
metavar = "[directory]")
+
config_group.add_option( "--model",
dest = "model",
action = "store",
default = "",
help = _("Model to use for composing"),
metavar = "[model]")
+
config_group.add_option( "--respin",
dest = "mode_respin",
action = "store_true",
default = False,
help = _("Mode to use for composing updated spins"))
+
config_group.add_option( "--copy-local",
dest = "copy_local",
action = "store_true",
default = False,
help = _("Sometimes, it's better to copy local data rather then (sym)linking it. If you have enough space..."))
+
config_group.add_option( "--copy-dir",
dest = "copy_dir",
action = "store",
@@ -222,103 +245,123 @@ class Revisor:
action = "store_true",
default = False,
help = _("Create Installation Media CDs (Capacity per disc: 685MB)"))
+
install_group.add_option( "--install-dvd",
dest = "media_installation_dvd",
action = "store_true",
default = False,
help = _("Create Installation Media DVDs (Capacity per disc: 4.3GB)"))
+
install_group.add_option( "--install-dvd-dl",
dest = "media_installation_dvd_duallayer",
action = "store_true",
default = False,
help = _("Create Installation Media Dual-Layered DVDs (Capacity per disc: 8.5GB)"))
+
install_group.add_option( "--install-bluray",
dest = "media_installation_bluray",
action = "store_true",
default = False,
help = _("Create Installation Media Blu-Ray Discs (Capacity per disc: 25GB)"))
+
install_group.add_option( "--install-bluray-dl",
dest = "media_installation_bluray_duallayer",
action = "store_true",
default = False,
help = _("Create Installation Media Duallayer Blu-Ray Discs (Capacity per disc: 50GB)"))
+
install_group.add_option( "--install-unified",
dest = "media_installation_unified",
action = "store_true",
default = False,
help = _("Create Unified ISO from install tree"))
+
# This doesn't work because anaconda doesn't allow expanded tree installations from hard drive
#install_group.add_option( "--install-usb",
#dest = "media_installation_usb",
#action = "store_true",
#default = False,
#help = _("Build install image for use on USB thumb drives (Remember to specify the size of the USB Thumb Drive with --usb-size)"))
+
install_group.add_option( "--install-tree",
dest = "media_installation_tree",
action = "store_true",
default = False,
help = _("Create the Installation Tree."))
+
install_group.add_option( "--install-nogr",
dest = "install_nogr",
action = "store_true",
default = False,
help = _("Create Media without graphical installer."))
+
install_group.add_option( "--kickstart-include",
dest = "kickstart_include",
action = "store_true",
default = False,
help = _("Include kickstart file on media or in the tree"))
+
install_group.add_option( "--kickstart-default",
dest = "kickstart_default",
action = "store_true",
default = False,
help = _("In the bootloader menu (isolinux.cfg), set kickstart to boot by default (works with --kickstart-include)"))
+
install_group.add_option( "--filter-comps",
dest = "comps_filter",
action = "store_true",
default = False,
help = _("Filter anything from comps that is not in the package set"))
+
install_group.add_option( "--revisor-comps",
dest = "revisor_comps",
action = "store_true",
default = False,
help = _("Use Revisor's comps file instead of those from the repositories"))
+
install_group.add_option( "--comps",
dest = "comps",
action = "store",
default = "/usr/share/revisor/comps-f7.xml",
help = _("Comps file to include on the installation media"))
+
install_group.add_option( "--updates-img",
dest = "updates_img",
action = "store",
default = "",
help = _("Include specified updates.img on installation media."),
metavar = "[updates image]")
+
install_group.add_option( "--product-name",
dest = "product_name",
action = "store",
default = "Fedora",
help = _("Product Name"))
+
install_group.add_option( "--product-path",
dest = "product_path",
action = "store",
default = "Fedora",
help = _("Product Path (e.g. Fedora/ or Packages/ -but without the appending slash)"))
+
install_group.add_option( "--iso-label",
dest = "iso_label",
action = "store",
default = "Fedora",
help = _("ISO Label Base. Note that other things are appended but that the length can be 32 chars maximum."))
+
install_group.add_option( "--iso-basename",
dest = "iso_basename",
action = "store",
default = "Fedora",
help = _("The base name for the ISOs"))
+
install_group.add_option( "--product-version",
dest = "version",
action = "store",
default = "8",
help = _("Product Version"))
+
install_group.add_option( "--product-version-from",
dest = "version_from",
action = "store",
@@ -344,41 +387,49 @@ class Revisor:
action = "store_true",
default = False,
help = _("Create Live Media CD/DVD"))
+
live_group.add_option( "--live-usb-thumb",
dest = "media_live_thumb",
action = "store_true",
default = False,
help = _("Create Live Media Thumb Drive Image (will be depreciated)"))
+
live_group.add_option( "--live-usb-hd",
dest = "media_live_hd",
action = "store_true",
default = False,
help = _("Create Live Media Hard Disk Image (will be depreciated)"))
+
live_group.add_option( "--live-raw",
dest = "media_live_raw",
action = "store_true",
default = False,
help = _("Create Live Media Raw Hard Disk Image"))
+
live_group.add_option( "--live-shell",
dest = "lm_chroot_shell",
action = "store_true",
default = False,
help = _("Interactively work in the live image before building the ISO image."))
+
live_group.add_option( "--skip-compression",
dest = "lm_skip_fs_compression",
action = "store_true",
default = False,
help = _("Skip file system compression."))
+
live_group.add_option( "--skip-prelink",
dest = "lm_skip_prelink",
action = "store_true",
default = False,
help = _("Skip prelinking the contents of the filesystem."))
+
live_group.add_option( "--ignore-deleted",
dest = "lm_ignore_deleted",
action = "store_true",
default = False,
help = _("Ignore filesystem overhead. Useless blocks will not be removed from the filesystem."))
+
live_group.add_option( "--preferred-kernel",
dest = "lm_preferred_kernel",
action = "store",
commit 34ea5b5e58d208e87c900dea03294d12c20c6121
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Wed Feb 11 16:31:46 2009 +0100
This does not help because it's copying symbolic links
Revert "Make copying the installation tree over to it's new location a little more efficient"
This reverts commit 0323188416a673417015104a5c50c35144b0aa19.
diff --git a/revisor/base.py b/revisor/base.py
index 75ae3c6..af18de5 100644
--- a/revisor/base.py
+++ b/revisor/base.py
@@ -1999,23 +1999,9 @@ class RevisorBase:
if self.cfg.media_installation_tree:
tree_dst = os.path.join(self.cfg.destination_directory,"os",self.cfg.architecture)
tree_src = mypungi.topdir
-
- # Find the number of files in tree_src for a progress bar
- num_files = 0
- for root, dirs, files in os.walk(tree_src):
- num_files += len(files)
-
+ self.log.debug(_("Copying %s to %s") % (tree_src,tree_dst), level=1)
try:
- if self.cfg.copy_local:
- self.log.debug(_("Copying %s to %s (%d files)") % (tree_src,tree_dst,num_files), level=1)
- shutil.copytree(tree_src,tree_dst)
- else:
- try:
- self.log.debug(_("Moving %s to %s (%d files)") % (tree_src,tree_dst,num_files), level=1)
- shutil.move(tree_src,tree_dst)
- except Exception, e:
- self.log.error(_("Moving of the installation tree failed (trying copy):\n\n%s") % '\n'.join(e), recoverable=True)
- shutil.copytree(tree_src,tree_dst)
+ shutil.copytree(tree_src,tree_dst)
except Exception, e:
self.log.error(_("Copying of the installation tree failed:\n\n%s") % '\n'.join(e), recoverable=True)
commit 4221c77781bd9cf5410b47e49da9529329f15eeb
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Wed Feb 11 01:58:32 2009 +0100
Update documentation
diff --git a/doc/Revisor_Documentation/en-US/Appendix.xml b/doc/Revisor_Documentation/en-US/Appendix.xml
index 55d3e01..38ee4a0 100644
--- a/doc/Revisor_Documentation/en-US/Appendix.xml
+++ b/doc/Revisor_Documentation/en-US/Appendix.xml
@@ -9,6 +9,9 @@
<title>Terminology</title>
<formalpara id="Revisor_Documentation-Appendix-Terminology-Remix">
<title>Remix</title>
+ <indexterm>
+ <primary>Remix</primary>
+ </indexterm>
<para>
A Fedora Remix is a product based on Fedora, with Fedora packages and optionally, other packages as well, such as those from third-party repositories.
</para>
@@ -16,6 +19,10 @@
<formalpara id="Revisor_Documentation-Appendix-Terminology-Re-Spin">
<title>Re-Spin</title>
+ <indexterm>
+ <primary>Re-Spin</primary>
+ <secondary>Fedora Unity Re-Spin</secondary>
+ </indexterm>
<para>
A Fedora Re-Spin is a product that is composed for the single purpose of including updated software packages into the product. It uses the same compose procedure as the media that the Fedora Project composes and releases, but includes updates.
</para>
@@ -26,6 +33,9 @@
<formalpara id="Revisor_Documentation-Appendix-Terminology-Spin">
<title>Spin</title>
+ <indexterm>
+ <primary>Spin</primary>
+ </indexterm>
<para>
A Fedora Spin is a custom set of software packages, often for a specific audience. Spins include a KDE Spin, which contains KDE software packages rather then the Desktop spin, which is based around GNOME. Similarly, there are XFCE, LXDE, Sugar, Education, Games and Developer Spins.
</para>
@@ -36,6 +46,9 @@
<formalpara id="Revisor_Documentation-Appendix-Terminology-Package_Sack">
<title>Package Sack</title>
+ <indexterm>
+ <primary>Package Sack</primary>
+ </indexterm>
<para>
para
</para>
@@ -80,6 +93,19 @@
</thead>
<tbody>
<row>
+ <entry namest="column1" nameend="column25"><literal>answer_yes</literal></entry>
+ <entry namest="column67" nameend="column89"><literal>-y</literal>, <literal>--yes</literal></entry>
+ </row>
+ <row>
+ <entry namest="column25">0, 1</entry>
+ <entry>0</entry>
+ <entry>global, model</entry>
+ </row>
+ <row>
+ <entry namest="column25" nameend="column89">Answer <emphasis>yes</emphasis> to all questions.</entry>
+ </row>
+
+ <row>
<entry namest="column1" nameend="column25"><literal>clean_up</literal></entry>
<entry namest="column67" nameend="column89"><literal>--clean-up</literal></entry>
</row>
@@ -93,6 +119,32 @@
</row>
<row>
+ <entry namest="column1" nameend="column25"><literal>copy_dir</literal></entry>
+ <entry namest="column67" nameend="column89"><literal>--copy-dir</literal></entry>
+ </row>
+ <row>
+ <entry namest="column25"><code>[dir]</code></entry>
+ <entry>False</entry>
+ <entry>global, model</entry>
+ </row>
+ <row>
+ <entry namest="column25" nameend="column89">A directory tree to copy onto the media created. In the case of installation media, the contents of the directory specified are copied onto <code>cdrom:/files/</code>. In the case of live media, the contents of the directory specified are copied onto the root filesystem of the live system.</entry>
+ </row>
+
+ <row>
+ <entry namest="column1" nameend="column25"><literal>copy_local</literal></entry>
+ <entry namest="column67" nameend="column89"><literal>--copy-local</literal></entry>
+ </row>
+ <row>
+ <entry namest="column25"> </entry>
+ <entry>False</entry>
+ <entry>global, model</entry>
+ </row>
+ <row>
+ <entry namest="column25" nameend="column89">Tell Revisor to copy files, even when they are local. This applies to relative corner-cases where the repositories or the <code>destination_directory</code> is mounted over NFS, and some actions cannot be performed.</entry>
+ </row>
+
+ <row>
<entry namest="column1" nameend="column25"><literal>debuglevel</literal></entry>
<entry namest="column67" nameend="column89"><literal>-d</literal>, <literal>--debug</literal></entry>
</row>
@@ -106,6 +158,32 @@
</row>
<row>
+ <entry namest="column1" nameend="column25"><literal>destination_directory</literal></entry>
+ <entry namest="column67" nameend="column89"><literal>--destination-directory</literal></entry>
+ </row>
+ <row>
+ <entry namest="column25"><code>/srv/revisor/</code></entry>
+ <entry><code>[path]</code></entry>
+ <entry>global, model</entry>
+ </row>
+ <row>
+ <entry namest="column25" nameend="column89">The destination directory for the product. Revisor creates a sub-directory with the name of the model used, and places the product in that directory.</entry>
+ </row>
+
+ <row>
+ <entry namest="column1" nameend="column25"><literal>getsource</literal></entry>
+ <entry namest="column67" nameend="column89"><literal>--source</literal></entry>
+ </row>
+ <row>
+ <entry namest="column25"> </entry>
+ <entry>False</entry>
+ <entry>global, model</entry>
+ </row>
+ <row>
+ <entry namest="column25" nameend="column89">Whether to obtain the source along with the binary RPMs used. This is False by default, and therefor the source is not included by default. Note that if you are distributing your product to third parties, you need to be able to provide the sources along with the binary product.</entry>
+ </row>
+
+ <row>
<entry namest="column1" nameend="column25"><literal>include_bootiso</literal></entry>
<entry namest="column67" nameend="column89"><literal> </literal></entry>
</row>
@@ -119,6 +197,19 @@
</row>
<row>
+ <entry namest="column1" nameend="column25"><literal>kickstart_default</literal></entry>
+ <entry namest="column67" nameend="column89"><literal>--kickstart-default</literal></entry>
+ </row>
+ <row>
+ <entry namest="column25">0, 1</entry>
+ <entry>0</entry>
+ <entry>global, model</entry>
+ </row>
+ <row>
+ <entry namest="column25" nameend="column89">Whether to set the isolinux.cfg entry that makes the installer use the kickstart included on the media, as a default.</entry>
+ </row>
+
+ <row>
<entry namest="column1" nameend="column25"><literal>kickstart_exact</literal></entry>
<entry namest="column67" nameend="column89"><literal>--kickstart-exact</literal></entry>
</row>
@@ -145,6 +236,45 @@
</row>
<row>
+ <entry namest="column1" nameend="column25"><literal>kickstart_file</literal></entry>
+ <entry namest="column67" nameend="column89"><literal>--kickstart</literal></entry>
+ </row>
+ <row>
+ <entry namest="column25"><code>[file]</code></entry>
+ <entry>0</entry>
+ <entry>global, model</entry>
+ </row>
+ <row>
+ <entry namest="column25" nameend="column89">What kickstart file to use. When in CLI mode, this is a mandatory setting.</entry>
+ </row>
+
+ <row>
+ <entry namest="column1" nameend="column25"><literal>kickstart_include</literal></entry>
+ <entry namest="column67" nameend="column89"><literal>--kickstart-include</literal></entry>
+ </row>
+ <row>
+ <entry namest="column25">0, 1</entry>
+ <entry>0</entry>
+ <entry>global, model</entry>
+ </row>
+ <row>
+ <entry namest="column25" nameend="column89">Whether to include the kickstart on the media so that the installer may find it as <filename>cdrom:/ks.cfg</filename>.</entry>
+ </row>
+
+ <row>
+ <entry namest="column1" nameend="column25"><literal>kickstart_save</literal></entry>
+ <entry namest="column67" nameend="column89"><literal>--kickstart-save</literal></entry>
+ </row>
+ <row>
+ <entry namest="column25">0, 1</entry>
+ <entry>0</entry>
+ <entry>global, model</entry>
+ </row>
+ <row>
+ <entry namest="column25" nameend="column89">Where to save the resulting kickstart. In GUI mode, when changes to the package set can be applied, saves those changes out into a new kickstart file.</entry>
+ </row>
+
+ <row>
<entry namest="column1" nameend="column25"><literal>media_installation_bluray_duallayer</literal></entry>
<entry namest="column67" nameend="column89"><literal>--install-bluray-dl</literal></entry>
</row>
@@ -262,6 +392,19 @@
</row>
<row>
+ <entry namest="column1" nameend="column25"><literal>model</literal></entry>
+ <entry namest="column67" nameend="column89"><literal>--model</literal></entry>
+ </row>
+ <row>
+ <entry namest="column25"> </entry>
+ <entry><code>[model]</code></entry>
+ <entry>global</entry>
+ </row>
+ <row>
+ <entry namest="column25" nameend="column89">The model to use.</entry>
+ </row>
+
+ <row>
<entry namest="column1" nameend="column25"><literal>report_sizes</literal></entry>
<entry namest="column67" nameend="column89"><literal>--report_sizes</literal></entry>
</row>
@@ -274,6 +417,32 @@
<entry namest="column25" nameend="column89">Report the sizes of RPM packages used. Lists the biggest packages in the transaction</entry>
</row>
+ <row>
+ <entry namest="column1" nameend="column25"><literal>mode_respin</literal></entry>
+ <entry namest="column67" nameend="column89"><literal>--respin</literal></entry>
+ </row>
+ <row>
+ <entry namest="column25"> </entry>
+ <entry>False</entry>
+ <entry>global, model</entry>
+ </row>
+ <row>
+ <entry namest="column25" nameend="column89">Whether Revisor should operate in <emphasis>respin</emphasis> mode. See also <xref linkend="Revisor_Documentation-Compose_Process_Details-Respin_Mode" /></entry>
+ </row>
+
+ <row>
+ <entry namest="column1" nameend="column25"><literal>working_directory</literal></entry>
+ <entry namest="column67" nameend="column89"><literal>-d</literal>, <literal>--debug</literal></entry>
+ </row>
+ <row>
+ <entry namest="column25">0 - 9</entry>
+ <entry>0</entry>
+ <entry>global, model</entry>
+ </row>
+ <row>
+ <entry namest="column25" nameend="column89">The level of debugging. 0 is the lowest debug level, whereas 9 is the highest. Revisor turns up the volume quickly. The logfile on debug level 9 may very easily become 20-30MB.</entry>
+ </row>
+
</tbody>
</tgroup>
</table>
diff --git a/doc/Revisor_Documentation/en-US/Revisor_Documentation.xml b/doc/Revisor_Documentation/en-US/Revisor_Documentation.xml
index bddccdd..1e09676 100644
--- a/doc/Revisor_Documentation/en-US/Revisor_Documentation.xml
+++ b/doc/Revisor_Documentation/en-US/Revisor_Documentation.xml
@@ -577,8 +577,177 @@
<para>
para
</para>
+
+ <section id="Revisor_Documentation-Compose_Process_Details-Overview">
+ <title>Overview</title>
+ <para>
+ Of course, the compose process for installation media is a little different then the compose process for live media.
+ </para>
+ <para>
+ When composing, Revisor starts out doing the following:
+ </para>
+ <para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ Revisor reads the options from the CLI and takes <code>--config</code>, if specified.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Revisor reads the configuration file specified with <code>--config</code>, or it's default, <filename>/etc/revisor/revisor.conf</filename>.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Revisor reads the global <code>[revisor]</code> section for all settings available and sets those configured in the global section.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ If a model is specified in the configuration file's global section <code>[revisor]</code>, Revisor will set that model to be used and loads it.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ If a model has been specified on the command-line, with option <code>--model</code>, Revisor loads that model.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Revisor checks every settings against a function that is specifically written to check such setting. For example, the label of an ISO cannot be longer then 32 characters.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Especially in CLI mode, these settings build up the task list for Revisor. If there's nothing to do, Revisor will throw an error explaining what's missing. If there's things to do that cannot be done in one run, Revisor will throw an error explaining that.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ In GUI mode however, if the settings are compatible, the GUI will start.
+ </para>
+ </listitem>
+ </itemizedlist>
+ </para>
+ </section>
+
+ <section id="Revisor_Documentation-Compose_Process_Details-Respin_Mode">
+ <title>Respin Mode</title>
+ <para>
+ Revisor has a respin mode that in some aspects differs from the regular routines. It is intended to reflect behaviour of tools in use by the Fedora Project Release Engineering team as closely as possible.
+ </para>
+ <para>
+ Re-Spin mode only affects installation media products.
+ </para>
+ <para>
+ In Re-Spin mode, the way the RPM payload is determined from kickstart differs from Revisor's normal procedures. See <xref linkend="Revisor_Documentation-Using_Kickstart" /> for more details on using a kickstart package manifest.
+ </para>
+ <para>
+ A kickstart file's so-called package manifest usually looks like:
+ </para>
+ <para>
+ <screen>%packages
+@group1
+@group2 --nodefaults
+@group3 --optional
+package1
+package2
+-package3
+%end</screen>
+ </para>
+ <para>
+ Which tells us the following:
+ </para>
+ <para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ Include all mandatory and default packages from group1
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Include all mandatory packages from group2
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Include all mandatory, default and optional packages from group3
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Include package1, and package2
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Exclude package3
+ </para>
+ </listitem>
+ </itemizedlist>
+ </para>
+ <para>
+ Depending on how you use this instructions or information, there is a slight difference in the package set that ends up on the media you compose.
+ </para>
+
+ <section id="Revisor_Documentation-Compose_Process_Details-Respin_Mode-Selecting_Groups">
+ <title>Selecting Groups</title>
+ <para>
+ Selecting groups has the following logic: When you load a repository you may also load the groups file (often referred to as 'comps' or 'comps.xml'). This comps file is an XML file with categories, groups (per category), and per group:
+ </para>
+ <para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ a list of mandatory packages. If you select or include the group, these packages come with it.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ a list of default packages. If you select or include the group, these packages will come with it as a default. If you only want the mandatory, minimum set of packages for this group, in a kickstart package manifest append <code>--nodefaults</code> to the group line or in the Revisor GUI, right-click on the group and choose <emphasis>Deselect all packages</emphasis>.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ a list of optional packages. If you select a group you have not yet selected these packages. To select the optional packages of a group, in a kickstart package manifest append <code>--optional</code> to the group line or in the Revisor GUI, right-click on the group and choose <emphasis>Select all optional packages</emphasis>.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ a list of conditionals. If you select this group, these conditionals are thrown into the package sack and transaction information and include or exclude other packages. Suppose you select the '@nl-support' or “Dutch Support” group from the Languages or Localization category, you would end up with support for the Dutch language in all applications that have that kind of support.
+ </para>
+ </listitem>
+ </itemizedlist>
+ </para>
+ </section>
+
+ <section id="Revisor_Documentation-Compose_Process_Details-Respin_Mode-Select_Matching_Packages">
+ <title>Select Matching Packages</title>
+ <para>
+ This is the logic Revisor applies when running in Re-Spin mode (on the CLI, specify <code>--respin</code>). It imitates the behavior pungi has, and thus enables you to copy that behavior. Note that <code>--respin</code> has other implications as well.
+ </para>
+ <para>
+ First of all, it iterates the groups in the kickstart package manifest. For each group, it appends the names of the mandatory packages to a list, and depending on the additional parameters specified with that group (<code>--nodefaults</code> or <code>--optional</code>), appends the names of the other packages in that group as well.
+ </para>
+ <para>
+ Then it iterates over the package names in the package manifest. These package names are appended to the same list of package names too. This includes package 'names' with some sort of wildcard (?, or *).
+ </para>
+ <para>
+ Then it iterates over all the excluded packages, appending each of those to the YUM configuration exclude list.
+ </para>
+ <para>
+ Now that Revisor has a very simple, flat list of package names, it uses YUM's internal matching logic 5 to get what packages in the repositories matched exactly (by name), matched (by wildcard) and did not match at all. Revisor then selects the exact matches and matches, adding them to the transaction.
+ </para>
+ </section>
+ </section>
+
<section id="Revisor_Documentation-Compose_Process_Details-Dependency_Resolving">
<title>Dependency Resolving</title>
+ <indexterm>
+ <primary>Dependency Resolving</primary>
+ </indexterm>
<para>
Dependency resolving is the area where some of the efficiency Revisor can gain for you comes from. While of course there is specific reasons to do things one way, or the other, most people I speak to about Revisor, it is not very clear why, or what Revisor does in this area. First of all, there's two ways of resolving dependencies:
</para>
@@ -587,6 +756,10 @@
<listitem>
<formalpara>
<title>Inclusive Dependency Resolving</title>
+ <indexterm>
+ <primary>Dependency Resolving</primary>
+ <secondary>Inclusive</secondary>
+ </indexterm>
<para>
Iterate all packages in the transaction and list their requirements, then for each of those requirements, find all packages that provide a matching capability, add those packages to the transaction, and don't forget to add the requirements those packages have themselves, back into the pile of (unmet) requirements.
</para>
@@ -595,6 +768,10 @@
<listitem>
<formalpara>
<title>Exclusive Dependency Resolving</title>
+ <indexterm>
+ <primary>Dependency Resolving</primary>
+ <secondary>Inclusive</secondary>
+ </indexterm>
<para>
Iterate all the packages and for each of the requirements found, find the best package that meets the requirement. This is also YUMs default behavior. Anaconda uses YUM during the installation, and this is the behaviour of YUM used during the installation.
</para>
@@ -905,6 +1082,20 @@ while more_to_do:
</para>
</formalpara>
+ <formalpara id="Revisor_Documentation-Frequently_Asked_Questions-Relationship_Between_Revisor_and_Pungi">
+ <title>What is the relationship between Revisor and Pungi?</title>
+ <para>
+ Where pungi builds a bunch of RPMs into ISO images and installation trees through one single procedure, perfect for Release Engineering on something like the Fedora Project, Revisor does it different entirely.
+ </para>
+ </formalpara>
+
+ <formalpara id="Revisor_Documentation-Frequently_Asked_Questions-Relationship_Between_Revisor_and_Livecd-tools">
+ <title>What is the relationship between Revisor and livecd-tools?</title>
+ <para>
+ Revisor depends on livecd-tools for the composing of live media. Creating the filesystem to install the packages to, turning that image file into a SquashFS file, and applying the settings inside the chroot.
+ </para>
+ </formalpara>
+
<formalpara id="Revisor_Documentation-Frequently_Asked_Questions-Why_Rebuild_Installer_Images">
<title>Why Rebuild Installer Images?</title>
<para>
@@ -923,8 +1114,87 @@ while more_to_do:
<section id="Revisor_Documentation-Testing-Simple_Test_Cases">
<title>Simple Test Cases</title>
<para>
- para
+ This section has a few simple test cases ensuring configuration shipped with Revisor works as anticipated.
</para>
+
+ <section id="Revisor_Documentation-Testing-Simple_Test_Cases-Configuration_Files">
+ <title>Configuration Files</title>
+ <para>
+ The main Revisor configuration file is <filename>/etc/revisor/revisor.conf</filename>. The file lists a series of models, each having their own YUM configuration file in <filename>/etc/revisor/conf.d/</filename>.
+ </para>
+ <formalpara>
+ <title>Testing</title>
+ <para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ For each model in <filename>/etc/revisor/revisor.conf</filename>, the <code>main</code> setting for that model should point to a valid file.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Each YUM configuration file should work. To verify, run the following command for each configuration file:
+ </para>
+ <para>
+ <screen>$ yum -c <replaceable>$file</replaceable> list kernel</screen>
+ </para>
+ </listitem>
+ </itemizedlist>
+ </para>
+ </formalpara>
+ <formalpara>
+ <title>Known Errors</title>
+ <para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ Revisor has baseurls in YUM repositories set to <ulink url="http://localrepo" />. This URL will not be retrievable for many people, but allows the developers to quickly change mirrors.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Repositories that are unavailable at the moment of testing will throw errors Revisor can't do anything about.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ If the directories <filename>revisor-yumcache/</filename> and <filename>revisor/</filename> in <filename>/var/tmp/</filename>, the default working directory, are not writeable for the user then YUM will throw permission denied errors.
+ </para>
+ <para>
+ Remove <filename>/var/tmp/revisor/</filename> and <filename>/var/tmp/revisor-yumcache/</filename> or run the command with root permissions.
+ </para>
+ </listitem>
+ </itemizedlist>
+ </para>
+ </formalpara>
+ </section>
+
+ <section id="Revisor_Documentation-Testing-Simple_Test_Cases-Compose_Results">
+ <title>Requirements for Compose Results</title>
+ <para>
+ Although heavily dependent on Anaconda for this part, these are still requirements
+ </para>
+
+ <formalpara>
+ <title>ld-linux.so.2</title>
+ <para>
+ In the <filename>initrd.img</filename> of the composed product, if 32-bit, <filename>/lib/ld-linux.so.2</filename> (or any other version) should link to <filename>/lib/ld-2.9.so</filename> (or any other version). If <filename>/lib/ld-linux.so.2</filename> links to itself, the media will fail to install.
+ </para>
+ </formalpara>
+ <formalpara>
+ <title>How to test</title>
+ <para>
+ In a terminal, type the following command:
+ </para>
+ </formalpara>
+ <para>
+ <screen>$ <userinput>lsinitrd /path/to/initrd | grep ld-linux</userinput></screen>
+ </para>
+ <para>
+ See also: <ulink url="https://www.redhat.com/archives/anaconda-devel-list/2009-February/msg00115.…" />
+ </para>
+
+ </section>
</section>
<section id="Revisor_Documentation-Testing-Complex_Test_Cases">
@@ -1081,6 +1351,68 @@ while more_to_do:
</para>
</section>
+ <section id="Revisor_Documentation-Development-Adding_A_New_Spin">
+ <title>Adding a new spin or remix</title>
+ <para>
+ <orderedlist>
+ <listitem>
+ <para>
+ Add the appropriate models in the appropriate configuration file for Revisor.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Add the appropriate configuration file to the appropriate automake Makefile
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Run autoreconf && ./configure && make rpm to verify the rpm building
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Create the model's YUM configuration files with the following repositories:
+ </para>
+ <para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ fedora, enabled, pointing to Everything
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ fedora-source, disabled, pointing to Everything
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ fedora-updates, enabled, pointing to the updates repository
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ fedora-updates-source, disabled, pointing to the updates repository
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ anaconda-updates, enabled, pointing to the anaconda updates repository
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ anaconda-updates-source, disabled, pointing to the ananconda updates repository
+ </para>
+ </listitem>
+ </itemizedlist>
+ </para>
+ </listitem>
+ </orderedlist>
+ </para>
+ </section>
+
<section id="Revisor_Documentation-Development-Versioning_Schema">
<title>Versioning Schema</title>
<para>
commit 0323188416a673417015104a5c50c35144b0aa19
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Wed Feb 11 01:57:35 2009 +0100
Make copying the installation tree over to it's new location a little more efficient
diff --git a/revisor/base.py b/revisor/base.py
index af18de5..75ae3c6 100644
--- a/revisor/base.py
+++ b/revisor/base.py
@@ -1999,9 +1999,23 @@ class RevisorBase:
if self.cfg.media_installation_tree:
tree_dst = os.path.join(self.cfg.destination_directory,"os",self.cfg.architecture)
tree_src = mypungi.topdir
- self.log.debug(_("Copying %s to %s") % (tree_src,tree_dst), level=1)
+
+ # Find the number of files in tree_src for a progress bar
+ num_files = 0
+ for root, dirs, files in os.walk(tree_src):
+ num_files += len(files)
+
try:
- shutil.copytree(tree_src,tree_dst)
+ if self.cfg.copy_local:
+ self.log.debug(_("Copying %s to %s (%d files)") % (tree_src,tree_dst,num_files), level=1)
+ shutil.copytree(tree_src,tree_dst)
+ else:
+ try:
+ self.log.debug(_("Moving %s to %s (%d files)") % (tree_src,tree_dst,num_files), level=1)
+ shutil.move(tree_src,tree_dst)
+ except Exception, e:
+ self.log.error(_("Moving of the installation tree failed (trying copy):\n\n%s") % '\n'.join(e), recoverable=True)
+ shutil.copytree(tree_src,tree_dst)
except Exception, e:
self.log.error(_("Copying of the installation tree failed:\n\n%s") % '\n'.join(e), recoverable=True)
commit 7f7958fa59d94aaef70ea2a0a1d7dc9f32f2715a
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Wed Feb 11 01:57:07 2009 +0100
Add mock_respins.sh
diff --git a/unity/scripts/mock_respins.sh b/unity/scripts/mock_respins.sh
new file mode 100755
index 0000000..286ea26
--- /dev/null
+++ b/unity/scripts/mock_respins.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+mock -v -r fedora-10-i386 init && \
+mock -v -r fedora-10-i386 install comps-extras createrepo rhpl pykickstart \
+ livecd-tools anaconda-runtime squashfs-tools \
+ busybox-anaconda notify-python usermode \
+ pam python automake intltool gettext \
+ desktop-file-utils glib2-devel gcc \
+ cobbler koan deltarpm pygtk pygtk2-libglade \
+ gnome-python2-gconf system-config-kickstart jigdo \
+ livecd-tools python-virtinst git sudo spin-kickstarts mock && \
+echo -en "git clone git://git.fedorahosted.org/revisor\n" | mock -r fedora-10-i386 shell
+echo -en "cd /revisor; ./switchhere --yes\n" | mock -r fedora-10-i386 shell
+echo -en "cd /revisor; autoreconf && ./configure\n" | mock -r fedora-10-i386 shell
+echo -en "rm -rf /var/lib/rpm/__db.00*\n" | mock -r fedora-10-i386 shell
+echo -en "cd /revisor; ./revisor.py --cli --config /etc/revisor-unity/f10-install-respin.conf --model f10-i386-respin --debug 9\n" | mock -r fedora-10-i386 shell
+
+mock -v -r fedora-10-x86_64 init && \
+mock -v -r fedora-10-x86_64 install comps-extras createrepo rhpl pykickstart \
+ livecd-tools anaconda-runtime squashfs-tools \
+ busybox-anaconda notify-python usermode \
+ pam python automake intltool gettext \
+ desktop-file-utils glib2-devel gcc \
+ cobbler koan deltarpm pygtk pygtk2-libglade \
+ gnome-python2-gconf system-config-kickstart jigdo \
+ livecd-tools python-virtinst git sudo spin-kickstarts mock && \
+echo -en "git clone git://git.fedorahosted.org/revisor\n" | mock -r fedora-10-x86_64 shell && \
+echo -en "cd /revisor; ./switchhere --yes\n" | mock -r fedora-10-x86_64 shell && \
+echo -en "cd /revisor; autoreconf && ./configure\n" | mock -r fedora-10-x86_64 shell && \
+echo -en "rm -rf /var/lib/rpm/__db.00*\n" | mock -r fedora-10-x86_64 shell && \
+echo -en "cd /revisor; ./revisor.py --cli --config /etc/revisor-unity/f10-install-respin.conf --model f10-x86_64-respin --debug 9\n" | mock -r fedora-10-x86_64 shell
+
commit cd93aba6ec7c582492d8aebdeac4d61df8f64e2b
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Tue Feb 10 22:50:14 2009 +0100
Have ./switchhere take --yes
diff --git a/switchhere b/switchhere
index 1de8675..26455a9 100755
--- a/switchhere
+++ b/switchhere
@@ -1,7 +1,12 @@
#!/bin/bash
-read -a answer -n 1 -p "This script is going to remove some, and then add some symlinks and/or files. Continue? [y/N] " INPUT
-echo ""
+if [ "$1" != "--yes" ]; then
+ read -a answer -n 1 -p "This script is going to remove some, and then add some symlinks and/or files. Continue? [y/N] " INPUT
+ echo ""
+else
+ answer=y
+fi
+
if [ -z "$answer" -o "${answer[0]}" == "N" -o "${answer[0]}" == "n" ]; then
echo "Quitting."
exit 0
commit 6c96db179bf5130695fc1d148d9c246e09f9a98a
Author: Piotr Drąg <piotrdrag(a)gmail.com>
Date: Wed Feb 4 20:12:28 2009 +0000
Updated Polish translation
Transmitted-via: Transifex (translate.fedoraproject.org)
diff --git a/po/Changelog b/po/Changelog
index 9b80c62..de64ae7 100644
--- a/po/Changelog
+++ b/po/Changelog
@@ -1,4 +1,6 @@
-updated italian translation
+Updated Polish translation
+
+Transmitted-via: Transifex (translate.fedoraproject.org)updated italian translation
Transmitted-via: Transifex (translate.fedoraproject.org)Updated Polish translation
diff --git a/po/pl.po b/po/pl.po
index 8706fdf..d25d979 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: pl\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-20 00:07+0100\n"
-"PO-Revision-Date: 2008-12-20 00:46+0100\n"
+"POT-Creation-Date: 2009-02-04 20:39+0100\n"
+"PO-Revision-Date: 2009-02-04 20:53+0100\n"
"Last-Translator: Piotr Drąg <piotrdrag(a)gmail.com>\n"
"Language-Team: Polish <pl(a)li.org>\n"
"MIME-Version: 1.0\n"
@@ -1701,154 +1701,159 @@ msgid "Downloading Packages"
msgstr "Pobieranie pakietów"
#: ../revisor/base.py:1077
+#, 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/base.py:1087
msgid "Unable to find a suitable mirror."
msgstr "Nie można znaleźć odpowiedniego serwera lustrzanego."
-#: ../revisor/base.py:1089
+#: ../revisor/base.py:1099
#, python-format
msgid "Errors were encountered while downloading packages: %s"
msgstr "Podczas pobierania pakietów pakietów wystąpiły błędy: %s"
-#: ../revisor/base.py:1131
+#: ../revisor/base.py:1141
#, python-format
msgid "Overriding auto package selection with user package selection for %s..."
msgstr ""
"Zastępowanie automatycznego wyboru pakietów pakietami wybranymi przez "
"użytkownika dla %s..."
-#: ../revisor/base.py:1144
+#: ../revisor/base.py:1154
#, python-format
msgid "Adding required package %s-%s:%s-%s.%s"
msgstr "Dodawanie wymaganego pakietu %s-%s:%s-%s.%s"
#. This list has already been resolved
-#: ../revisor/base.py:1147
+#: ../revisor/base.py:1157
#, python-format
msgid "%s. This is a required package."
msgstr "%s. Ten pakiet jest wymagany."
-#: ../revisor/base.py:1159
+#: ../revisor/base.py:1169
#, python-format
msgid "Adding suggested package %s-%s:%s-%s.%s"
msgstr "Dodawanie sugerowanego pakietu %s-%s:%s-%s.%s"
-#: ../revisor/base.py:1169
+#: ../revisor/base.py:1179
#, python-format
msgid "Packages that do not need to be on the media: %s"
msgstr "Pakiety, które nie muszą być na nośniku: %s"
-#: ../revisor/base.py:1194 ../revisor/base.py:1220
+#: ../revisor/base.py:1204 ../revisor/base.py:1230
msgid "Did not succeed in adding in all required packages"
msgstr "Dodanie wszystkich wymaganych pakietów nie powiodło się"
-#: ../revisor/base.py:1228
+#: ../revisor/base.py:1238
msgid "Populating statistics"
msgstr "Tworzenie statystyk"
-#: ../revisor/base.py:1244
+#: ../revisor/base.py:1254
#, python-format
msgid "Package %s-%s:%s-%s.%s does not seem to have a archivesize header"
msgstr ""
"Wydaje się, że pakiet %s-%s:%s-%s.%s nie posiada nagłówka rozmiaru archiwum"
-#: ../revisor/base.py:1252
+#: ../revisor/base.py:1262
#, python-format
msgid "Package %s-%s:%s-%s.%s does not seem to have a installedsize header"
msgstr ""
"Wydaje się, że pakiet %s-%s:%s-%s.%s nie posiada nagłówka rozmiaru po "
"zainstalowaniu"
-#: ../revisor/base.py:1260
+#: ../revisor/base.py:1270
#, python-format
msgid "Package %s-%s:%s-%s.%s does not seem to have a packagesize header"
msgstr ""
"Wydaje się, że pakiet %s-%s:%s-%s.%s nie posiada nagłówka rozmiaru pakietu"
-#: ../revisor/base.py:1270
+#: ../revisor/base.py:1280
#, python-format
msgid "Total size of all packages (archivesize): %s %s"
msgstr "Całkowity rozmiar wszystkich pakietów (rozmiar archiwum): %s %s"
-#: ../revisor/base.py:1271
+#: ../revisor/base.py:1281
#, python-format
msgid "Total size of all packages, (installedsize): %s %s"
msgstr ""
"Całkowity rozmiar wszystkich pakietów (rozmiar po zainstalowaniu): %s %s"
-#: ../revisor/base.py:1272
+#: ../revisor/base.py:1282
#, python-format
msgid "Total size of all packages, (packagesize): %s %s"
msgstr "Całkowity rozmiar wszystkich pakietów (rozmiar pakietu): %s %s"
-#: ../revisor/base.py:1307
+#: ../revisor/base.py:1317
#, python-format
msgid "Report of the %d most space consuming packages"
msgstr "Zgłoś %d pakietów zajmujących najwięcej miejsca"
-#: ../revisor/base.py:1402 ../revisor/base.py:1416 ../revisor/base.py:2043
+#: ../revisor/base.py:1412 ../revisor/base.py:1426 ../revisor/base.py:2056
#, python-format
msgid "Creating pkgdir: %s"
msgstr "Tworzenie pkgdir: %s"
#. Now for each txmbr in
#. Link the localPkg() result into the build tree
-#: ../revisor/base.py:1425
+#: ../revisor/base.py:1435
msgid "Linking in packages"
msgstr "Dowiązywanie pakietów"
-#: ../revisor/base.py:1444 ../revisor/base.py:2067
+#: ../revisor/base.py:1454 ../revisor/base.py:2080
#, python-format
msgid "Package hard link failed: %s: %s"
msgstr "Twarde dowiązanie pakietów nie powiodło się: %s: %s"
-#: ../revisor/base.py:1449 ../revisor/base.py:2072
+#: ../revisor/base.py:1459 ../revisor/base.py:2085
#, python-format
msgid "Copying: %s to %s"
msgstr "Kopiowanie: %s do %s"
-#: ../revisor/base.py:1452 ../revisor/base.py:2075
+#: ../revisor/base.py:1462 ../revisor/base.py:2088
#, python-format
msgid "Symlinking: %s to %s"
msgstr "Dowiązywanie symboliczne: %s do %s"
-#: ../revisor/base.py:1455 ../revisor/base.py:2078
+#: ../revisor/base.py:1465 ../revisor/base.py:2091
msgid "Package symlink succeeded"
msgstr "Dowiązanie symboliczne pakietów powiodło się"
-#: ../revisor/base.py:1457 ../revisor/base.py:1464 ../revisor/base.py:2080
-#: ../revisor/base.py:2087
+#: ../revisor/base.py:1467 ../revisor/base.py:1474 ../revisor/base.py:2093
+#: ../revisor/base.py:2100
#, python-format
msgid "Package link failed, trying copy: %s: %s"
msgstr "Dowiązanie pakietów nie powiodło się, próbowanie skopiowania: %s: %s"
-#: ../revisor/base.py:1474
+#: ../revisor/base.py:1484
msgid "Creating Repository Information"
msgstr "Tworzenie informacji o repozytoriach"
#. FIXME: Optionally recompose installer images
-#: ../revisor/base.py:1489
+#: ../revisor/base.py:1499
msgid "Building Installation Images"
msgstr "Budowanie obrazów instalacyjnych"
-#: ../revisor/base.py:1506
+#: ../revisor/base.py:1516
msgid "Using already existing installer images"
msgstr "Używanie już istniejących obrazów instalatora"
-#: ../revisor/base.py:1520
+#: ../revisor/base.py:1530
msgid "Linking in release notes"
msgstr "Dowiązywanie informacji o wydaniu"
-#: ../revisor/base.py:1532
+#: ../revisor/base.py:1542
#, python-format
msgid "Copying updates.img from %s to %s"
msgstr "Kopiowanie updates.img z %s do %s"
-#: ../revisor/base.py:1541 ../revisor/pungi.py:417
+#: ../revisor/base.py:1551 ../revisor/pungi.py:417
#, python-format
msgid "copy_dir '%s' not accessible"
msgstr "Nie można uzyskać dostępu do copy_dir \"%s\""
-#: ../revisor/base.py:1552
+#: ../revisor/base.py:1562
#, python-format
msgid "Size of the installation tree is %s MB"
msgstr "Rozmiar drzewa instalacyjnego wynosi %s MB"
@@ -1857,25 +1862,25 @@ msgstr "Rozmiar drzewa instalacyjnego wynosi %s MB"
#. That makes our lives difficult, hihi
#. So, make sure that if we're on el_linux, the repository gets
#. bind mounted and configured appropriately
-#: ../revisor/base.py:1602
+#: ../revisor/base.py:1612
msgid "Running pkgorder"
msgstr "Wykonywanie pkgorder"
-#: ../revisor/base.py:1661
+#: ../revisor/base.py:1673
#, python-format
msgid "Running with grouplist: %r"
msgstr "Uruchamianie z grouplist: %r"
-#: ../revisor/base.py:1664
+#: ../revisor/base.py:1676
#, python-format
msgid "Running with packagelist: %r"
msgstr "Uruchamianie z packagelist: %r"
-#: ../revisor/base.py:1671
+#: ../revisor/base.py:1683
msgid "Appending group core and base"
msgstr "Dołączanie grup core i base"
-#: ../revisor/base.py:1682
+#: ../revisor/base.py:1695
#, python-format
msgid "Appending default group %s"
msgstr "Dołączanie domyślnej grupy %s"
@@ -1883,7 +1888,7 @@ msgstr "Dołączanie 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:1704
+#: ../revisor/base.py:1717
#, python-format
msgid "Appending non-default group %s"
msgstr "Dołączanie nie domyślnej grupy %s"
@@ -1891,85 +1896,85 @@ 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:1714
+#: ../revisor/base.py:1727
#, python-format
msgid "Appending non-default support group %s"
msgstr "Dołączanie nie domyślnych grup obsługi %s"
-#: ../revisor/base.py:1780
+#: ../revisor/base.py:1793
#, 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:1782
+#: ../revisor/base.py:1795
msgid "Not running package ordering"
msgstr "Porządkowanie kolejności pakietów nie zostanie wykonane"
-#: ../revisor/base.py:1814
+#: ../revisor/base.py:1827
msgid "^Install using kickstart"
msgstr "^Zainstaluj używając kickstart"
#. Split Tree
-#: ../revisor/base.py:1837
+#: ../revisor/base.py:1850
#, python-format
msgid "Splitting Build Tree (%s)"
msgstr "Rozdzielanie drzewa budowania (%s)"
#. Split repo
-#: ../revisor/base.py:1843
+#: ../revisor/base.py:1856
#, python-format
msgid "Splitting Repository (%s)"
msgstr "Rozdzielanie repozytorium (%s)"
-#: ../revisor/base.py:1857 ../revisor/modgui/build_media.py:244
+#: ../revisor/base.py:1870 ../revisor/modgui/build_media.py:244
#, python-format
msgid "Creating %s ISO Image #%d"
msgstr "Tworzenie %s obrazu ISO #%d"
-#: ../revisor/base.py:1862 ../revisor/modgui/build_media.py:248
+#: ../revisor/base.py:1875 ../revisor/modgui/build_media.py:248
#, python-format
msgid "Creating %s ISO Image"
msgstr "Tworzenie %s obrazu ISO"
#. For all images but source images; implant the md5 into the ISO for the media check
#. FIXME: Well, it seems we don't deal with source images here.
-#: ../revisor/base.py:1876
+#: ../revisor/base.py:1889
msgid "Implanting MD5 into ISO Images"
msgstr "Wprowadzanie MD5 do obrazów ISO"
#. mediatype = built_image["mediatype"]
#. if not mediatype == 'source':
-#: ../revisor/base.py:1884
+#: ../revisor/base.py:1897
#, python-format
msgid "Implanting md5 into ISO Image: %s"
msgstr "Wprowadzanie MD5 do obrazu ISO: %s"
-#: ../revisor/base.py:1890
+#: ../revisor/base.py:1903
msgid "Cannot implant ISO md5sum"
msgstr "Nie można wprowadzić md5sum ISO"
#. Do some SHA1SUMMONING
-#: ../revisor/base.py:1898
+#: ../revisor/base.py:1911
msgid "Creating SHA1SUMs for Images"
msgstr "Tworzenie plików SHA1SUM dla obrazów"
-#: ../revisor/base.py:1914
+#: ../revisor/base.py:1927
msgid "Creating Rescue ISO Image"
msgstr "Tworzenie ratunkowego obrazu ISO"
-#: ../revisor/base.py:1974
+#: ../revisor/base.py:1987
#, python-format
msgid "Copying %s to %s (%d files)"
msgstr "Kopiowanie %s do %s (%d plików)"
-#: ../revisor/base.py:1978
+#: ../revisor/base.py:1991
#, python-format
msgid "Moving %s to %s (%d files)"
msgstr "Przenoszenie %s do %s (%d plików)"
-#: ../revisor/base.py:1981
+#: ../revisor/base.py:1994
#, python-format
msgid ""
"Moving of the source tree failed (trying copy):\n"
@@ -1980,7 +1985,7 @@ msgstr ""
"\n"
"%s"
-#: ../revisor/base.py:1984
+#: ../revisor/base.py:1997
#, python-format
msgid ""
"Copying of the source tree failed:\n"
@@ -1991,12 +1996,12 @@ msgstr ""
"\n"
"%s"
-#: ../revisor/base.py:1989 ../revisor/pungi.py:413
+#: ../revisor/base.py:2002 ../revisor/pungi.py:413
#, python-format
msgid "Copying %s to %s"
msgstr "Kopiowanie %s do %s"
-#: ../revisor/base.py:1993
+#: ../revisor/base.py:2006
#, python-format
msgid ""
"Copying of the installation tree failed:\n"
@@ -2007,41 +2012,41 @@ msgstr ""
"\n"
"%s"
-#: ../revisor/base.py:1999
+#: ../revisor/base.py:2012
msgid "Creating ext3 filesystem"
msgstr "Tworzenie systemu plików ext3"
-#: ../revisor/base.py:2006
+#: ../revisor/base.py:2019
msgid "Configuring System"
msgstr "Konfigurowanie systemu"
#. Now for each txmbr in
#. Link the localPkg() result into the build tree
-#: ../revisor/base.py:2052
+#: ../revisor/base.py:2065
msgid "Linking in Source packages"
msgstr "Dowiązywanie pakietów źródłowych"
-#: ../revisor/base.py:2107
+#: ../revisor/base.py:2120
#, python-format
msgid "Setting rundir to %s"
msgstr "Ustawianie rundir na %s"
-#: ../revisor/base.py:2113
+#: ../revisor/base.py:2126
#, python-format
msgid "Directory %s could not be created. Aborting"
msgstr "Nie można utworzyć folderu %s. Przerywanie"
-#: ../revisor/base.py:2115
+#: ../revisor/base.py:2128
#, python-format
msgid "Running command: %s"
msgstr "Wykonywanie polecenia: %s"
-#: ../revisor/base.py:2116
+#: ../revisor/base.py:2129
#, python-format
msgid "Extra information: %s %s %s"
msgstr "Dodatkowe informacje: %s %s %s"
-#: ../revisor/base.py:2144
+#: ../revisor/base.py:2157
#, python-format
msgid "Got an error from %s (return code %s)"
msgstr "Otrzymano błąd z %s (kod zwrotny %s)"
@@ -2391,11 +2396,11 @@ msgstr "wybieranie self.packages_list[%r][%r][%r][%r]"
msgid "returning pkg_list: %r"
msgstr "zwracanie pkg_list: %r"
-#: ../revisor/cfg.py:1089
+#: ../revisor/cfg.py:1092
msgid "Run from image"
msgstr "Uruchom z obrazu"
-#: ../revisor/cfg.py:1090
+#: ../revisor/cfg.py:1093
msgid "Run from RAM - requires 1 GB+"
msgstr "Uruchom z pamięci RAM - wymaga 1 GB+"
@@ -2832,73 +2837,73 @@ msgstr ""
msgid "-> package %s"
msgstr "-> pakiet %s"
-#: ../revisor/plugins.py:59 ../revisor/plugins.py:76
+#: ../revisor/plugins.py:60 ../revisor/plugins.py:77
#, python-format
msgid "Plugin %s failed to load (%s: %s)"
msgstr "Wczytanie wtyczki %s nie powiodło się (%s: %s)"
-#: ../revisor/plugins.py:70
+#: ../revisor/plugins.py:71
#, python-format
msgid "ImportError for plugin %s: %s"
msgstr "Błąd importowania wtyczki %s: %s"
-#: ../revisor/plugins.py:73
+#: ../revisor/plugins.py:74
#, python-format
msgid "RuntimeError for plugin %s: %s"
msgstr "Błąd wykonywania wtyczki %s: %s"
-#: ../revisor/plugins.py:93 ../revisor/plugins.py:95
+#: ../revisor/plugins.py:94 ../revisor/plugins.py:96
#, python-format
msgid "Cannot set defaults for plugin %s: %s"
msgstr "Nie można ustawić domyślnych dla wtyczki %s: %s"
-#: ../revisor/plugins.py:97
+#: ../revisor/plugins.py:98
#, python-format
msgid "Cannot set defaults for plugin %s: Unknown Error"
msgstr "Nie można ustawić domyślnych dla wtyczki %s: nieznany błąd"
-#: ../revisor/plugins.py:100
+#: ../revisor/plugins.py:101
#, python-format
msgid "Not setting defaults for plugin %s: No function 'set_defaults()'"
msgstr ""
"Domyślne nie zostaną ustawione dla wtyczki %s: brak funkcji \"set_defaults()"
"\""
-#: ../revisor/plugins.py:117
+#: ../revisor/plugins.py:118
#, python-format
msgid "Cannot set runtime for plugin %s: %s"
msgstr "Nie można ustawić środowiska wykonawczego dla wtyczki %s: %s"
-#: ../revisor/plugins.py:119
+#: ../revisor/plugins.py:120
#, python-format
msgid "Not setting runtime for plugin %s: No function 'set_runtime()'"
msgstr ""
"Środowisko wykonawcze nie zostanie ustawione dla wtyczki %s: brak funkcji "
"\"set_runtime()\""
-#: ../revisor/plugins.py:136
+#: ../revisor/plugins.py:137
#, python-format
msgid "Cannot add options for plugin %s: %s"
msgstr "Nie można dodać opcji dla wtyczki %s: %s"
-#: ../revisor/plugins.py:138
+#: ../revisor/plugins.py:139
#, python-format
msgid "Not adding options for plugin %s: No function 'add_options()'"
msgstr ""
"Opcje nie zostaną ustawione dla wtyczki %s: brak funkcji \"add_options()\""
-#: ../revisor/plugins.py:156
+#: ../revisor/plugins.py:157
#, python-format
msgid "Cannot check options for plugin %s: %s"
msgstr "Nie można sprawdzić opcji dla wtyczki %s: %s"
-#: ../revisor/plugins.py:158
+#: ../revisor/plugins.py:159
#, python-format
msgid "Not checking options for plugin %s: No function 'check_options()'"
msgstr ""
"Opcje nie zostaną sprawdzone dla wtyczki %s: brak funkcji \"check_options()\""
-#: ../revisor/plugins.py:194
+#: ../revisor/plugins.py:195
#, python-format
msgid "Cannot execute hook %s for plugin %s: %s"
msgstr "Nie można wykonać haka %s dla wtyczki %s: %s"
@@ -3041,22 +3046,22 @@ msgstr "Nie można utworzyć folderu files/: %s"
msgid "Creating %s"
msgstr "Tworzenie %s"
-#: ../revisor/pungi.py:459
+#: ../revisor/pungi.py:460
#, python-format
msgid "Disc %s #%d is oversized (%r > %r)"
msgstr "Płyta %s #%d ma za duży rozmiar (%r > %r)"
-#: ../revisor/pungi.py:463
+#: ../revisor/pungi.py:464
#, python-format
msgid "Removing tree %s"
msgstr "Usuwanie drzewa %s"
-#: ../revisor/pungi.py:471
+#: ../revisor/pungi.py:472
#, python-format
msgid "Disc %s #%d is OK in size (%r <= %r)"
msgstr "Płyta %s #%d ma prawidłowy rozmiar (%r <= %r)"
-#: ../revisor/pungi.py:522
+#: ../revisor/pungi.py:523
msgid ""
"Hacking anaconda's .discinfo because it'll shit itself if it reads it's own "
"output"
@@ -3630,7 +3635,7 @@ msgstr "Nie można znaleźć pliku comps"
msgid "Custom isolinux.cfg to replace the standard isolinux.cfg with."
msgstr "Własny plik isolinux.cfg do zastąpienia standardowego isolinux.cfg."
-#: ../revisor/modisolinux/__init__.py:57
+#: ../revisor/modisolinux/__init__.py:57 ../revisor/modisolinux/__init__.py:64
msgid ""
"Both --kickstart-default and --isolinux-cfg have been specified, while they "
"are mutually exclusive. --isolinux-cfg is going to be used."
@@ -3638,44 +3643,70 @@ msgstr ""
"Podano zarówno --kickstart-default, jak i --isolinux-cfg. Nie można ich "
"używać razem. Zostanie użyta opcja --isolinux-cfg."
-#: ../revisor/modisolinux/__init__.py:69
+#: ../revisor/modisolinux/__init__.py:73
#, python-format
msgid "File %s is not readable"
msgstr "Plik %s jest nieczytelny"
-#: ../revisor/modisolinux/__init__.py:74
+#: ../revisor/modisolinux/__init__.py:78
+msgid "How come isolinux_cfg is set to False?"
+msgstr "Jak isolinux_cfg może być ustawiony na Fałsz?"
+
+#: ../revisor/modisolinux/__init__.py:81
+msgid "How come isolinux_cfg is an empty string?"
+msgstr "Jak isolinux_cfg może być pustym łańcuchem?"
+
+#: ../revisor/modisolinux/__init__.py:84
#, python-format
msgid "Going to replace isolinux/isolinux.cfg with %s"
msgstr "Plik isolinux/isolinux.cfg zostanie zastąpiony plikiem %s"
-#: ../revisor/modisolinux/__init__.py:77
+#: ../revisor/modisolinux/__init__.py:87
msgid "Deleted the old isolinux.cfg"
msgstr "Usunięto stary plik isolinux.cfg"
-#: ../revisor/modisolinux/__init__.py:80
+#: ../revisor/modisolinux/__init__.py:90
msgid "Inserted the new isolinux.cfg"
msgstr "Umieszczono nowy plik isolinux.cfg"
-#: ../revisor/modisolinux/__init__.py:82
+#: ../revisor/modisolinux/__init__.py:92
msgid "Could not copy in the new isolinux.cfg"
msgstr "Nie można skopiować nowego pliku isolinux.cfg"
-#: ../revisor/modisolinux/__init__.py:84
+#: ../revisor/modisolinux/__init__.py:94
msgid "Could not unlink the old isolinux.cfg?"
msgstr "Nie można usunąć dowiązania do starego isolinux.cfg?"
-#: ../revisor/modrebrand/__init__.py:79
+#: ../revisor/modisolinux/__init__.py:96
+msgid "Not replacing isolinux.cfg"
+msgstr "Plik isolinux.cfg nie zostanie zastąpiony"
+
+#: ../revisor/modrebrand/__init__.py:43
+msgid "Not rebranding pre_resolve_dependencies"
+msgstr "Zmiana marki pre_resolve_dependencies nie zostanie wykonana"
+
+#: ../revisor/modrebrand/__init__.py:57
+#, python-format
+msgid "Adding %s-%s-%s.%s"
+msgstr "Dodawanie %s-%s-%s.%s"
+
+#: ../revisor/modrebrand/__init__.py:60
#, python-format
-msgid "Removing package %s-%s:%s-%s.%s for rebranding"
-msgstr "Usuwanie pakietu %s-%s:%s-%s.%s, aby zmienić nazwę"
+msgid "Removing %s-%s-%s.%s"
+msgstr "Usuwanie %s-%s-%s.%s"
-#: ../revisor/modrebrand/__init__.py:91
+#: ../revisor/modrebrand/__init__.py:77
msgid ""
"Rebrand name. Revisor will select <name>-logos, <name>-release and <name>-"
"release-notes packages, if available."
msgstr ""
-"Zmień nazwę. Revisor wybierze pakiety <name>-logos, <name>-release oraz "
-"<name>-release-notes, jeśli są dostępne."
+"Zmień markę nazwy. Revisor wybierze pakiety <name>-logos, <name>-release "
+"oraz <name>-release-notes, jeśli są dostępne."
+
+#: ../revisor/modrebrand/__init__.py:85
+#, python-format
+msgid "Setting rebrand to %s"
+msgstr "Ustawianie zmiany marki na %s"
#: ../revisor/modreuseinstaller/__init__.py:48
msgid "The URI to a tree we're supposed to reuse the installer images from."
@@ -3792,6 +3823,23 @@ msgstr "Zamontowanie \"%s\" do \"%s\" nie powiodło się"
msgid "Starting the virtual guest provision..."
msgstr "Uruchamianie zarządzania wirtualnym gościem..."
+#: ../revisor/modwui/modwui/controllers.py:75
+#, python-format
+msgid "The path %s cannot be found"
+msgstr "Nie można znaleźć ścieżki %s"
+
+#: ../revisor/modwui/modwui/grids.py:22
+msgid "Name"
+msgstr "Nazwa"
+
+#: ../revisor/modwui/modwui/grids.py:23
+msgid "Description"
+msgstr "Opis"
+
+#: ../revisor/modwui/modwui/options.py:90
+msgid "Submit"
+msgstr "Wyślij"
+
#: ../conf/revisor.desktop.in.h:2
msgid "Revisor, Pimp your distro"
msgstr "Revisor, odpicuj swoją dystrybucję!"
commit b394518366295d10d6cd9d5dee15527a70ad5c13
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Sun Feb 1 20:52:54 2009 +0100
Add a script that creates the torrents
diff --git a/unity/scripts/torrentify_respin.sh b/unity/scripts/torrentify_respin.sh
new file mode 100755
index 0000000..918e95e
--- /dev/null
+++ b/unity/scripts/torrentify_respin.sh
@@ -0,0 +1,55 @@
+#!/bin/bash
+
+TORRENTDIR=/data/bittorrent/
+REVISORDIR=/data/revisor/
+
+while [ $# -gt 0 ]; do
+ case $1 in
+ --datestamp)
+ DATESTAMP=$2
+ shift; shift
+ ;;
+ --version)
+ VERSION=$2
+ shift; shift
+ ;;
+ --arch)
+ ARCHES="$ARCHES $2"
+ shift; shift
+ ;;
+ --source)
+ SOURCE=1
+ shift
+ ;;
+ --media)
+ MEDIATYPES="$MEDIATYPES $2"
+ shift; shift
+ ;;
+ esac
+done
+
+for arch in $ARCHES; do
+ for media in $MEDIATYPES; do
+ mkdir -p $TORRENTDIR/Fedora-Unity-$DATESTAMP-$VERSION-${arch}-${media}/
+ ln $REVISORDIR/$DATESTAMP/f${VERSION}-${arch}-respin/iso/*${media}*.iso $TORRENTDIR/Fedora-Unity-$DATESTAMP-$VERSION-${arch}-${media}/
+ ln $REVISORDIR/$DATESTAMP/f${VERSION}-${arch}-respin/iso/SHA1SUM $TORRENTDIR/Fedora-Unity-$DATESTAMP-$VERSION-${arch}-${media}/SHA1SUM
+ maketorrent-console --piece_size_pow2 19 \
+ --tracker_name http://spinner.fedoraunity.org:6969/announce \
+ --comment "Fedora Unity $DATESTAMP $VERSION ${arch} ${media}" \
+ --target $TORRENTDIR/Fedora-Unity-$DATESTAMP-$VERSION-${arch}-${media}.torrent \
+ http://spinner.fedoraunity.org:6969/announce \
+ $TORRENTDIR/Fedora-Unity-$DATESTAMP-$VERSION-${arch}-${media}/;
+ done;
+done
+
+mkdir -p $TORRENTDIR/Fedora-Unity-$DATESTAMP-$VERSION-Source-DVD/
+ln $REVISORDIR/$DATESTAMP/f${VERSION}-source-respin/iso/*.iso $TORRENTDIR/Fedora-Unity-$DATESTAMP-$VERSION-Source-DVD/
+ln $REVISORDIR/$DATESTAMP/f${VERSION}-source-respin/iso/SHA1SUM $TORRENTDIR/Fedora-Unity-$DATESTAMP-$VERSION-Source-DVD/SHA1SUM
+maketorrent-console --piece_size_pow2 19 \
+ --tracker_name http://spinner.fedoraunity.org:6969/announce \
+ --comment "Fedora Unity $DATESTAMP $VERSION Source ${media}" \
+ --target $TORRENTDIR/Fedora-Unity-$DATESTAMP-$VERSION-Source-${media}.torrent \
+ http://spinner.fedoraunity.org:6969/announce \
+ $TORRENTDIR/Fedora-Unity-$DATESTAMP-$VERSION-Source-${media}/;
+
+chown -R torrent:torrent $TORRENTDIR
commit 54548e7a49697c11808e97f5ef9494f8c29c7344
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Sun Feb 1 20:52:31 2009 +0100
Update the script that builds a source iso
diff --git a/unity/scripts/make_me_source_iso.sh b/unity/scripts/make_me_source_iso.sh
index e41f06f..38c9dc2 100755
--- a/unity/scripts/make_me_source_iso.sh
+++ b/unity/scripts/make_me_source_iso.sh
@@ -1,39 +1,57 @@
#!/bin/bash
-DATA=/data/revisor/20080814
+DATA=/data/revisor/
DIR1=$1
DIR2=$2
DIR3=$3
usage() {
- echo Usage: $0 dir1 dir2 [dir3]
+ echo Usage:" $0 --datestamp <date> --version <version> --arch <arch> [--arch <arch> [--arch <arch>]]"
+ exit 1
}
-if [ -z "$DIR1" -o -z "$DIR2" ]; then
- usage
- exit
+while [ $# -gt 0 ]; do
+ case $1 in
+ --datestamp)
+ DATA=$DATA/$2
+ shift; shift
+ ;;
+ --arch)
+ ARCHES="$ARCHES $2"
+ shift; shift
+ ;;
+ --version)
+ VERSION=$2
+ shift; shift
+ ;;
+ *)
+ usage
+ ;;
+ esac
+done
+
+[ -z "${VERSION}" ] && usage
+
+if [ ! -d "$DATA" ]; then
+ echo No such file or directory: $DATA/
+ usage
fi
-if [ ! -d "$DATA/$DIR1" ]; then
- echo No such file or directory: $DATA/$DIR1
- exit
-fi
-if [ ! -d "$DATA/$DIR2" ]; then
- echo No such file or directory: $DATA/$DIR2
- exit
-fi
+for arch in $ARCHES; do
+ [ ! -d "$DATA/f${VERSION}-$arch-respin/" ] && usage
+done
-DIR_SOURCE=`echo $DIR1 | sed -e 's/i386/source/g' | sed -e 's/x86_64/source/g'`
+DIR_SOURCE="f${VERSION}-source-respin"
[ -d "$DATA/$DIR_SOURCE" ] && rm -rf "$DATA/$DIR_SOURCE"
mkdir -p $DATA/$DIR_SOURCE/os/source/SRPMS
mkdir -p $DATA/$DIR_SOURCE/iso
-[ -d "$DATA/$DIR1/os" ] && ln -v $DATA/$DIR1/os/source/SRPMS/* $DATA/$DIR_SOURCE/os/source/SRPMS/. 2>/dev/null
-[ -d "$DATA/$DIR2/os" ] && ln $DATA/$DIR2/os/source/SRPMS/* $DATA/$DIR_SOURCE/os/source/SRPMS/. 2>/dev/null
-[ ! -z "$3" ] && ln $DATA/$DIR3/os/source/SRPMS/* $DATA/$DIR_SOURCE/os/source/SRPMS/. 2>/dev/null
+for arch in $ARCHES; do
+ ln -v $DATA/f${VERSION}-$arch-respin/os/source/SRPMS/* $DATA/$DIR_SOURCE/os/source/SRPMS/. 2>/dev/null
+done
-iso=`ls $DATA/$DIR1/iso/*DVD*.iso | head -n 1`
+iso=`find $DATA/*-respin/iso/ -name "*DVD*.iso" | head -n 1`
basename=`echo $iso | sed -e 's/i386/source/g' | sed -e 's/x86_64/source/g'`
echo Found iso $iso
commit d7708383439f291a064bb893929e5fb9300979b7
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Sun Feb 1 20:51:57 2009 +0100
Add this to the distribution
diff --git a/unity/Makefile.am b/unity/Makefile.am
index 559c81a..cc91663 100644
--- a/unity/Makefile.am
+++ b/unity/Makefile.am
@@ -60,6 +60,8 @@ revisorconf_DATA = \
conf/conf.d/revisor-f10-ppc64-single-cd.conf \
conf/conf.d/revisor-f10-ppc-single-cd.conf \
conf/conf.d/revisor-f10-x86_64-single-cd.conf \
+ conf/conf.d/revisor-f10-i386-live-aos-respin.conf \
+ conf/conf.d/revisor-f10-i386-live-broffice.org-respin.conf \
conf/conf.d/revisor-f10-i386-live-desktop-respin.conf \
conf/conf.d/revisor-f10-i386-live-developer-respin.conf \
conf/conf.d/revisor-f10-i386-live-education-math-respin.conf \
@@ -68,6 +70,8 @@ revisorconf_DATA = \
conf/conf.d/revisor-f10-i386-live-kde-respin.conf \
conf/conf.d/revisor-f10-i386-live-sugar-respin.conf \
conf/conf.d/revisor-f10-i386-live-xfce-respin.conf \
+ conf/conf.d/revisor-f10-ppc64-live-aos-respin.conf \
+ conf/conf.d/revisor-f10-ppc64-live-broffice.org-respin.conf \
conf/conf.d/revisor-f10-ppc64-live-desktop-respin.conf \
conf/conf.d/revisor-f10-ppc64-live-developer-respin.conf \
conf/conf.d/revisor-f10-ppc64-live-education-math-respin.conf \
@@ -76,6 +80,8 @@ revisorconf_DATA = \
conf/conf.d/revisor-f10-ppc64-live-kde-respin.conf \
conf/conf.d/revisor-f10-ppc64-live-sugar-respin.conf \
conf/conf.d/revisor-f10-ppc64-live-xfce-respin.conf \
+ conf/conf.d/revisor-f10-ppc-live-aos-respin.conf \
+ conf/conf.d/revisor-f10-ppc-live-broffice.org-respin.conf \
conf/conf.d/revisor-f10-ppc-live-desktop-respin.conf \
conf/conf.d/revisor-f10-ppc-live-developer-respin.conf \
conf/conf.d/revisor-f10-ppc-live-education-math-respin.conf \
@@ -84,6 +90,8 @@ revisorconf_DATA = \
conf/conf.d/revisor-f10-ppc-live-kde-respin.conf \
conf/conf.d/revisor-f10-ppc-live-sugar-respin.conf \
conf/conf.d/revisor-f10-ppc-live-xfce-respin.conf \
+ conf/conf.d/revisor-f10-x86_64-live-aos-respin.conf \
+ conf/conf.d/revisor-f10-x86_64-live-broffice.org-respin.conf \
conf/conf.d/revisor-f10-x86_64-live-desktop-respin.conf \
conf/conf.d/revisor-f10-x86_64-live-developer-respin.conf \
conf/conf.d/revisor-f10-x86_64-live-education-math-respin.conf \
commit 885bf06f7349b94dd8f988b00933f842e46465a0
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Sun Feb 1 20:44:03 2009 +0100
Add new files
diff --git a/unity/conf/conf.d/revisor-f10-i386-live-aos-respin.conf b/unity/conf/conf.d/revisor-f10-i386-live-aos-respin.conf
new file mode 100644
index 0000000..7020f55
--- /dev/null
+++ b/unity/conf/conf.d/revisor-f10-i386-live-aos-respin.conf
@@ -0,0 +1,87 @@
+[main]
+cachedir=-yumcache
+reposdir=
+keepcache=1
+debuglevel=1
+logfile=-yum.log
+pkgpolicy=newest
+distroverpkg=redhat-release
+tolerant=1
+exactarch=1
+obsoletes=1
+gpgcheck=1
+plugins=1
+metadata_expire=1800
+installroot=/var/tmp/revisor
+failovermethod=priority
+
+[fedora]
+name=Fedora 10 - i386
+baseurl=http://localrepo/fedora/releases/10/Everything/i386/os/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-10&arch=i386
+enabled=1
+gpgcheck=1
+
+[fedora-source]
+name=Fedora 10 - Source
+baseurl=http://localrepo/fedora/releases/10/Everything/source/SRPMS/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-10&arch=src
+enabled=0
+gpgcheck=1
+
+[updates]
+name=Fedora 10 - i386 - Updates
+baseurl=http://localrepo/fedora/updates/10/i386/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f10&arch=i386
+exclude=
+enabled=1
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
+
+[updates-source]
+name=Fedora 10 - Source - Updates
+baseurl=http://localrepo/fedora/updates/10/SRPMS/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-source-f10&arch=src
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
+
+[updates-testing]
+name=Fedora 10 - i386 - Test Updates
+baseurl=http://localrepo/fedora/updates/testing/10/i386/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f10&arch=i386
+enabled=0
+includepkgs=
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test
+
+[updates-testing-source]
+name=Fedora 10 - Source - Test Updates
+baseurl=http://localrepo/fedora/updates/testing/10/SRPMS/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-source-f10&arch=src
+enabled=0
+includepkgs=
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test
+
+[koji]
+name=Fedora 10 - i386 - Just Born
+baseurl=http://koji.fedoraproject.org/static-repos/dist-fc10-build-current/i386/
+enabled=0
+includepkgs=
+
+[koji-source]
+name=Fedora 10 - Source - Just Born
+baseurl=http://koji.fedoraproject.org/static-repos/dist-fc10-build-current/i386/SRPMS/
+enabled=0
+includepkgs=
+
+[anaconda-updates]
+name=Fedora Unity Anaconda Updates for Fedora 10
+baseurl=http://www.kanarip.com/anaconda/f10/i386/
+enabled=1
+
+[anaconda-updates-source]
+name=Fedora Unity Anaconda Updates for Fedora 10 - Sources
+baseurl=http://www.kanarip.com/anaconda/f10/SRPMS/
+enabled=0
diff --git a/unity/conf/conf.d/revisor-f10-i386-live-broffice.org-respin.conf b/unity/conf/conf.d/revisor-f10-i386-live-broffice.org-respin.conf
new file mode 100644
index 0000000..7020f55
--- /dev/null
+++ b/unity/conf/conf.d/revisor-f10-i386-live-broffice.org-respin.conf
@@ -0,0 +1,87 @@
+[main]
+cachedir=-yumcache
+reposdir=
+keepcache=1
+debuglevel=1
+logfile=-yum.log
+pkgpolicy=newest
+distroverpkg=redhat-release
+tolerant=1
+exactarch=1
+obsoletes=1
+gpgcheck=1
+plugins=1
+metadata_expire=1800
+installroot=/var/tmp/revisor
+failovermethod=priority
+
+[fedora]
+name=Fedora 10 - i386
+baseurl=http://localrepo/fedora/releases/10/Everything/i386/os/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-10&arch=i386
+enabled=1
+gpgcheck=1
+
+[fedora-source]
+name=Fedora 10 - Source
+baseurl=http://localrepo/fedora/releases/10/Everything/source/SRPMS/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-10&arch=src
+enabled=0
+gpgcheck=1
+
+[updates]
+name=Fedora 10 - i386 - Updates
+baseurl=http://localrepo/fedora/updates/10/i386/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f10&arch=i386
+exclude=
+enabled=1
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
+
+[updates-source]
+name=Fedora 10 - Source - Updates
+baseurl=http://localrepo/fedora/updates/10/SRPMS/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-source-f10&arch=src
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
+
+[updates-testing]
+name=Fedora 10 - i386 - Test Updates
+baseurl=http://localrepo/fedora/updates/testing/10/i386/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f10&arch=i386
+enabled=0
+includepkgs=
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test
+
+[updates-testing-source]
+name=Fedora 10 - Source - Test Updates
+baseurl=http://localrepo/fedora/updates/testing/10/SRPMS/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-source-f10&arch=src
+enabled=0
+includepkgs=
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test
+
+[koji]
+name=Fedora 10 - i386 - Just Born
+baseurl=http://koji.fedoraproject.org/static-repos/dist-fc10-build-current/i386/
+enabled=0
+includepkgs=
+
+[koji-source]
+name=Fedora 10 - Source - Just Born
+baseurl=http://koji.fedoraproject.org/static-repos/dist-fc10-build-current/i386/SRPMS/
+enabled=0
+includepkgs=
+
+[anaconda-updates]
+name=Fedora Unity Anaconda Updates for Fedora 10
+baseurl=http://www.kanarip.com/anaconda/f10/i386/
+enabled=1
+
+[anaconda-updates-source]
+name=Fedora Unity Anaconda Updates for Fedora 10 - Sources
+baseurl=http://www.kanarip.com/anaconda/f10/SRPMS/
+enabled=0
diff --git a/unity/conf/conf.d/revisor-f10-ppc-live-aos-respin.conf b/unity/conf/conf.d/revisor-f10-ppc-live-aos-respin.conf
new file mode 100644
index 0000000..eb8e83d
--- /dev/null
+++ b/unity/conf/conf.d/revisor-f10-ppc-live-aos-respin.conf
@@ -0,0 +1,87 @@
+[main]
+cachedir=-yumcache
+reposdir=
+keepcache=1
+debuglevel=1
+logfile=-yum.log
+pkgpolicy=newest
+distroverpkg=redhat-release
+tolerant=1
+exactarch=1
+obsoletes=1
+gpgcheck=1
+plugins=1
+metadata_expire=1800
+installroot=/var/tmp/revisor
+failovermethod=priority
+
+[fedora]
+name=Fedora 10 - ppc
+baseurl=http://localrepo/fedora/releases/10/Everything/ppc/os/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-10&arch=ppc
+enabled=1
+gpgcheck=1
+
+[fedora-source]
+name=Fedora 10 - Source
+baseurl=http://localrepo/fedora/releases/10/Everything/source/SRPMS/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-10&arch=src
+enabled=0
+gpgcheck=1
+
+[updates]
+name=Fedora 10 - ppc - Updates
+baseurl=http://localrepo/fedora/updates/10/ppc/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f10&arch=ppc
+exclude=
+enabled=1
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
+
+[updates-source]
+name=Fedora 10 - Source - Updates
+baseurl=http://localrepo/fedora/updates/10/SRPMS/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-source-f10&arch=src
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
+
+[updates-testing]
+name=Fedora 10 - ppc - Test Updates
+baseurl=http://localrepo/fedora/updates/testing/10/ppc/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f10&arch=ppc
+enabled=0
+includepkgs=
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test
+
+[updates-testing-source]
+name=Fedora 10 - Source - Test Updates
+baseurl=http://localrepo/fedora/updates/testing/10/SRPMS/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-source-f10&arch=src
+enabled=0
+includepkgs=
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test
+
+[koji]
+name=Fedora 10 - ppc - Just Born
+baseurl=http://koji.fedoraproject.org/static-repos/dist-fc10-build-current/ppc/
+enabled=0
+includepkgs=
+
+[koji-source]
+name=Fedora 10 - Source - Just Born
+baseurl=http://koji.fedoraproject.org/static-repos/dist-fc10-build-current/ppc/SRPMS/
+enabled=0
+includepkgs=
+
+[anaconda-updates]
+name=Fedora Unity Anaconda Updates for Fedora 10
+baseurl=http://www.kanarip.com/anaconda/f10/ppc/
+enabled=1
+
+[anaconda-updates-source]
+name=Fedora Unity Anaconda Updates for Fedora 10 - Sources
+baseurl=http://www.kanarip.com/anaconda/f10/SRPMS/
+enabled=0
diff --git a/unity/conf/conf.d/revisor-f10-ppc-live-broffice.org-respin.conf b/unity/conf/conf.d/revisor-f10-ppc-live-broffice.org-respin.conf
new file mode 100644
index 0000000..eb8e83d
--- /dev/null
+++ b/unity/conf/conf.d/revisor-f10-ppc-live-broffice.org-respin.conf
@@ -0,0 +1,87 @@
+[main]
+cachedir=-yumcache
+reposdir=
+keepcache=1
+debuglevel=1
+logfile=-yum.log
+pkgpolicy=newest
+distroverpkg=redhat-release
+tolerant=1
+exactarch=1
+obsoletes=1
+gpgcheck=1
+plugins=1
+metadata_expire=1800
+installroot=/var/tmp/revisor
+failovermethod=priority
+
+[fedora]
+name=Fedora 10 - ppc
+baseurl=http://localrepo/fedora/releases/10/Everything/ppc/os/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-10&arch=ppc
+enabled=1
+gpgcheck=1
+
+[fedora-source]
+name=Fedora 10 - Source
+baseurl=http://localrepo/fedora/releases/10/Everything/source/SRPMS/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-10&arch=src
+enabled=0
+gpgcheck=1
+
+[updates]
+name=Fedora 10 - ppc - Updates
+baseurl=http://localrepo/fedora/updates/10/ppc/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f10&arch=ppc
+exclude=
+enabled=1
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
+
+[updates-source]
+name=Fedora 10 - Source - Updates
+baseurl=http://localrepo/fedora/updates/10/SRPMS/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-source-f10&arch=src
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
+
+[updates-testing]
+name=Fedora 10 - ppc - Test Updates
+baseurl=http://localrepo/fedora/updates/testing/10/ppc/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f10&arch=ppc
+enabled=0
+includepkgs=
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test
+
+[updates-testing-source]
+name=Fedora 10 - Source - Test Updates
+baseurl=http://localrepo/fedora/updates/testing/10/SRPMS/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-source-f10&arch=src
+enabled=0
+includepkgs=
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test
+
+[koji]
+name=Fedora 10 - ppc - Just Born
+baseurl=http://koji.fedoraproject.org/static-repos/dist-fc10-build-current/ppc/
+enabled=0
+includepkgs=
+
+[koji-source]
+name=Fedora 10 - Source - Just Born
+baseurl=http://koji.fedoraproject.org/static-repos/dist-fc10-build-current/ppc/SRPMS/
+enabled=0
+includepkgs=
+
+[anaconda-updates]
+name=Fedora Unity Anaconda Updates for Fedora 10
+baseurl=http://www.kanarip.com/anaconda/f10/ppc/
+enabled=1
+
+[anaconda-updates-source]
+name=Fedora Unity Anaconda Updates for Fedora 10 - Sources
+baseurl=http://www.kanarip.com/anaconda/f10/SRPMS/
+enabled=0
diff --git a/unity/conf/conf.d/revisor-f10-ppc64-live-aos-respin.conf b/unity/conf/conf.d/revisor-f10-ppc64-live-aos-respin.conf
new file mode 100644
index 0000000..fd7f509
--- /dev/null
+++ b/unity/conf/conf.d/revisor-f10-ppc64-live-aos-respin.conf
@@ -0,0 +1,87 @@
+[main]
+cachedir=-yumcache
+reposdir=
+keepcache=1
+debuglevel=1
+logfile=-yum.log
+pkgpolicy=newest
+distroverpkg=redhat-release
+tolerant=1
+exactarch=1
+obsoletes=1
+gpgcheck=1
+plugins=1
+metadata_expire=1800
+installroot=/var/tmp/revisor
+failovermethod=priority
+
+[fedora]
+name=Fedora 10 - ppc64
+baseurl=http://localrepo/fedora/releases/10/Everything/ppc64/os/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-10&arch=ppc64
+enabled=1
+gpgcheck=1
+
+[fedora-source]
+name=Fedora 10 - Source
+baseurl=http://localrepo/fedora/releases/10/Everything/source/SRPMS/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-10&arch=src
+enabled=0
+gpgcheck=1
+
+[updates]
+name=Fedora 10 - ppc64 - Updates
+baseurl=http://localrepo/fedora/updates/10/ppc64/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f10&arch=ppc64
+exclude=
+enabled=1
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
+
+[updates-source]
+name=Fedora 10 - Source - Updates
+baseurl=http://localrepo/fedora/updates/10/SRPMS/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-source-f10&arch=src
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
+
+[updates-testing]
+name=Fedora 10 - ppc64 - Test Updates
+baseurl=http://localrepo/fedora/updates/testing/10/ppc64/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f10&arch=ppc64
+enabled=0
+includepkgs=
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test
+
+[updates-testing-source]
+name=Fedora 10 - Source - Test Updates
+baseurl=http://localrepo/fedora/updates/testing/10/SRPMS/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-source-f10&arch=src
+enabled=0
+includepkgs=
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test
+
+[koji]
+name=Fedora 10 - ppc64 - Just Born
+baseurl=http://koji.fedoraproject.org/static-repos/dist-fc10-build-current/ppc64/
+enabled=0
+includepkgs=
+
+[koji-source]
+name=Fedora 10 - Source - Just Born
+baseurl=http://koji.fedoraproject.org/static-repos/dist-fc10-build-current/ppc64/SRPMS/
+enabled=0
+includepkgs=
+
+[anaconda-updates]
+name=Fedora Unity Anaconda Updates for Fedora 10
+baseurl=http://www.kanarip.com/anaconda/f10/ppc64/
+enabled=1
+
+[anaconda-updates-source]
+name=Fedora Unity Anaconda Updates for Fedora 10 - Sources
+baseurl=http://www.kanarip.com/anaconda/f10/SRPMS/
+enabled=0
diff --git a/unity/conf/conf.d/revisor-f10-ppc64-live-broffice.org-respin.conf b/unity/conf/conf.d/revisor-f10-ppc64-live-broffice.org-respin.conf
new file mode 100644
index 0000000..fd7f509
--- /dev/null
+++ b/unity/conf/conf.d/revisor-f10-ppc64-live-broffice.org-respin.conf
@@ -0,0 +1,87 @@
+[main]
+cachedir=-yumcache
+reposdir=
+keepcache=1
+debuglevel=1
+logfile=-yum.log
+pkgpolicy=newest
+distroverpkg=redhat-release
+tolerant=1
+exactarch=1
+obsoletes=1
+gpgcheck=1
+plugins=1
+metadata_expire=1800
+installroot=/var/tmp/revisor
+failovermethod=priority
+
+[fedora]
+name=Fedora 10 - ppc64
+baseurl=http://localrepo/fedora/releases/10/Everything/ppc64/os/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-10&arch=ppc64
+enabled=1
+gpgcheck=1
+
+[fedora-source]
+name=Fedora 10 - Source
+baseurl=http://localrepo/fedora/releases/10/Everything/source/SRPMS/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-10&arch=src
+enabled=0
+gpgcheck=1
+
+[updates]
+name=Fedora 10 - ppc64 - Updates
+baseurl=http://localrepo/fedora/updates/10/ppc64/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f10&arch=ppc64
+exclude=
+enabled=1
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
+
+[updates-source]
+name=Fedora 10 - Source - Updates
+baseurl=http://localrepo/fedora/updates/10/SRPMS/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-source-f10&arch=src
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
+
+[updates-testing]
+name=Fedora 10 - ppc64 - Test Updates
+baseurl=http://localrepo/fedora/updates/testing/10/ppc64/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f10&arch=ppc64
+enabled=0
+includepkgs=
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test
+
+[updates-testing-source]
+name=Fedora 10 - Source - Test Updates
+baseurl=http://localrepo/fedora/updates/testing/10/SRPMS/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-source-f10&arch=src
+enabled=0
+includepkgs=
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test
+
+[koji]
+name=Fedora 10 - ppc64 - Just Born
+baseurl=http://koji.fedoraproject.org/static-repos/dist-fc10-build-current/ppc64/
+enabled=0
+includepkgs=
+
+[koji-source]
+name=Fedora 10 - Source - Just Born
+baseurl=http://koji.fedoraproject.org/static-repos/dist-fc10-build-current/ppc64/SRPMS/
+enabled=0
+includepkgs=
+
+[anaconda-updates]
+name=Fedora Unity Anaconda Updates for Fedora 10
+baseurl=http://www.kanarip.com/anaconda/f10/ppc64/
+enabled=1
+
+[anaconda-updates-source]
+name=Fedora Unity Anaconda Updates for Fedora 10 - Sources
+baseurl=http://www.kanarip.com/anaconda/f10/SRPMS/
+enabled=0
diff --git a/unity/conf/conf.d/revisor-f10-x86_64-live-aos-respin.conf b/unity/conf/conf.d/revisor-f10-x86_64-live-aos-respin.conf
new file mode 100644
index 0000000..33a2a0d
--- /dev/null
+++ b/unity/conf/conf.d/revisor-f10-x86_64-live-aos-respin.conf
@@ -0,0 +1,87 @@
+[main]
+cachedir=-yumcache
+reposdir=
+keepcache=1
+debuglevel=1
+logfile=-yum.log
+pkgpolicy=newest
+distroverpkg=redhat-release
+tolerant=1
+exactarch=1
+obsoletes=1
+gpgcheck=1
+plugins=1
+metadata_expire=1800
+installroot=/var/tmp/revisor
+failovermethod=priority
+
+[fedora]
+name=Fedora 10 - x86_64
+baseurl=http://localrepo/fedora/releases/10/Everything/x86_64/os/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-10&arch=x86_64
+enabled=1
+gpgcheck=1
+
+[fedora-source]
+name=Fedora 10 - Source
+baseurl=http://localrepo/fedora/releases/10/Everything/source/SRPMS/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-10&arch=src
+enabled=0
+gpgcheck=1
+
+[updates]
+name=Fedora 10 - x86_64 - Updates
+baseurl=http://localrepo/fedora/updates/10/x86_64/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f10&arch=x86_64
+exclude=
+enabled=1
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
+
+[updates-source]
+name=Fedora 10 - Source - Updates
+baseurl=http://localrepo/fedora/updates/10/SRPMS/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-source-f10&arch=src
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
+
+[updates-testing]
+name=Fedora 10 - x86_64 - Test Updates
+baseurl=http://localrepo/fedora/updates/testing/10/x86_64/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f10&arch=x86_64
+enabled=0
+includepkgs=
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test
+
+[updates-testing-source]
+name=Fedora 10 - Source - Test Updates
+baseurl=http://localrepo/fedora/updates/testing/10/SRPMS/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-source-f10&arch=src
+enabled=0
+includepkgs=
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test
+
+[koji]
+name=Fedora 10 - x86_64 - Just Born
+baseurl=http://koji.fedoraproject.org/static-repos/dist-fc10-build-current/x86_64/
+enabled=0
+includepkgs=
+
+[koji-source]
+name=Fedora 10 - Source - Just Born
+baseurl=http://koji.fedoraproject.org/static-repos/dist-fc10-build-current/x86_64/SRPMS/
+enabled=0
+includepkgs=
+
+[anaconda-updates]
+name=Fedora Unity Anaconda Updates for Fedora 10
+baseurl=http://www.kanarip.com/anaconda/f10/x86_64/
+enabled=1
+
+[anaconda-updates-source]
+name=Fedora Unity Anaconda Updates for Fedora 10 - Sources
+baseurl=http://www.kanarip.com/anaconda/f10/SRPMS/
+enabled=0
diff --git a/unity/conf/conf.d/revisor-f10-x86_64-live-broffice.org-respin.conf b/unity/conf/conf.d/revisor-f10-x86_64-live-broffice.org-respin.conf
new file mode 100644
index 0000000..33a2a0d
--- /dev/null
+++ b/unity/conf/conf.d/revisor-f10-x86_64-live-broffice.org-respin.conf
@@ -0,0 +1,87 @@
+[main]
+cachedir=-yumcache
+reposdir=
+keepcache=1
+debuglevel=1
+logfile=-yum.log
+pkgpolicy=newest
+distroverpkg=redhat-release
+tolerant=1
+exactarch=1
+obsoletes=1
+gpgcheck=1
+plugins=1
+metadata_expire=1800
+installroot=/var/tmp/revisor
+failovermethod=priority
+
+[fedora]
+name=Fedora 10 - x86_64
+baseurl=http://localrepo/fedora/releases/10/Everything/x86_64/os/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-10&arch=x86_64
+enabled=1
+gpgcheck=1
+
+[fedora-source]
+name=Fedora 10 - Source
+baseurl=http://localrepo/fedora/releases/10/Everything/source/SRPMS/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-10&arch=src
+enabled=0
+gpgcheck=1
+
+[updates]
+name=Fedora 10 - x86_64 - Updates
+baseurl=http://localrepo/fedora/updates/10/x86_64/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f10&arch=x86_64
+exclude=
+enabled=1
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
+
+[updates-source]
+name=Fedora 10 - Source - Updates
+baseurl=http://localrepo/fedora/updates/10/SRPMS/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-source-f10&arch=src
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
+
+[updates-testing]
+name=Fedora 10 - x86_64 - Test Updates
+baseurl=http://localrepo/fedora/updates/testing/10/x86_64/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f10&arch=x86_64
+enabled=0
+includepkgs=
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test
+
+[updates-testing-source]
+name=Fedora 10 - Source - Test Updates
+baseurl=http://localrepo/fedora/updates/testing/10/SRPMS/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-source-f10&arch=src
+enabled=0
+includepkgs=
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test
+
+[koji]
+name=Fedora 10 - x86_64 - Just Born
+baseurl=http://koji.fedoraproject.org/static-repos/dist-fc10-build-current/x86_64/
+enabled=0
+includepkgs=
+
+[koji-source]
+name=Fedora 10 - Source - Just Born
+baseurl=http://koji.fedoraproject.org/static-repos/dist-fc10-build-current/x86_64/SRPMS/
+enabled=0
+includepkgs=
+
+[anaconda-updates]
+name=Fedora Unity Anaconda Updates for Fedora 10
+baseurl=http://www.kanarip.com/anaconda/f10/x86_64/
+enabled=1
+
+[anaconda-updates-source]
+name=Fedora Unity Anaconda Updates for Fedora 10 - Sources
+baseurl=http://www.kanarip.com/anaconda/f10/SRPMS/
+enabled=0
commit 5f656e72159da06b3e3253e215f622bce0a86946
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Sun Feb 1 20:36:32 2009 +0100
Add modmock
diff --git a/revisor/modmock/Makefile.am b/revisor/modmock/Makefile.am
new file mode 100644
index 0000000..394e1ac
--- /dev/null
+++ b/revisor/modmock/Makefile.am
@@ -0,0 +1,8 @@
+PYTHON_FILES = \
+ __init__.py
+
+EXTRA_DIST = \
+ $(PYTHON_FILES)
+
+pydir = $(pythondir)/revisor/modmock
+py_PYTHON = $(PYTHON_FILES)
diff --git a/revisor/modmock/__init__.py b/revisor/modmock/__init__.py
new file mode 100644
index 0000000..60ca15f
--- /dev/null
+++ b/revisor/modmock/__init__.py
@@ -0,0 +1,63 @@
+#
+# Copyright 2007 Fedora Unity
+#
+# Jonathan Steffan <jon a fedoraunity.org>
+# Jeroen van Meeuwen <kanarip a fedoraunity.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 only
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Library General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+import os
+import fnmatch
+import re
+import revisor.misc
+import shutil
+import sys
+import subprocess
+import yum.Errors
+
+# Translation
+from rhpl.translate import _
+
+class RevisorMock:
+ def __init__(self):
+ """Let's you supply a custom isolinux.cfg"""
+ pass
+
+ def set_defaults(self, defaults):
+ pass
+
+ def add_options(self, parser):
+ """Adds Mock Options group to the OptionParser instance you give it (parser),
+ and adds the options for this module to that group"""
+ mock_options = parser.add_option_group(_("Mock Options"))
+
+ mock_options.add_option("--mock-cfg",
+ dest = "mock_cfg",
+ action = "store",
+ default = "",
+ help = _("Mock configuration name to use."),
+ metavar = "[mock-config]")
+
+ def check_options(self, cfg, cli_options):
+ """This function checks the option rebrand"""
+ self.cfg = cfg
+ self.log = cfg.log
+
+ def pre_exec_buildinstall(self):
+ from mock.backend import Root
+
+ # mock -v -r fedora-10-i386 clean
+ # mock -v -r fedora-10-i386 init
+ # mock -v -r fedora-10-i386 install
+ pass
commit f61eec8e726837950064f543337d42fd5dfae902
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Sun Feb 1 16:27:50 2009 +0100
Have package ordering also pull in the mandatory packages
diff --git a/revisor/base.py b/revisor/base.py
index 701c6e4..af18de5 100644
--- a/revisor/base.py
+++ b/revisor/base.py
@@ -1630,6 +1630,8 @@ class RevisorBase:
ds.addPackages([ "kernel*", "iscsi-*", "mkinitrd", "mdadm", "*firmware*" ])
+ ds.addPackages(['authconfig', 'chkconfig', 'mkinitrd', 'rhpl', 'system-config-firewall-tui'])
+
pbar.set_fraction(2.0/38.0)
if self.cfg.version_from == "F7":
@@ -1662,7 +1664,7 @@ class RevisorBase:
"java-development", "kde-software-development",
"mail-server", "network-server", "legacy-network-server"])
- elif self.cfg.version_from in [ "F8", "F9", "F10" ]:
+ elif self.cfg.version_from in [ "F8", "F9", "F10", "DEVEL" ]:
# Here is where we add groups
groups_nondefault = []
groups_nondefault_support = []
commit 43df6fd8c11c8a08f57db44a7ab7ef26d94825e5
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Sun Feb 1 16:27:27 2009 +0100
Add Documentation in Publican
diff --git a/doc/Revisor_Documentation/en-US/Appendix.xml b/doc/Revisor_Documentation/en-US/Appendix.xml
new file mode 100644
index 0000000..55d3e01
--- /dev/null
+++ b/doc/Revisor_Documentation/en-US/Appendix.xml
@@ -0,0 +1,286 @@
+<?xml version='1.0'?>
+<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+]>
+
+<part id="Revisor_Documentation-Appendices">
+ <title>Appendices</title>
+
+ <appendix id="Revisor_Documentation-Appendix-Terminology" label="A">
+ <title>Terminology</title>
+ <formalpara id="Revisor_Documentation-Appendix-Terminology-Remix">
+ <title>Remix</title>
+ <para>
+ A Fedora Remix is a product based on Fedora, with Fedora packages and optionally, other packages as well, such as those from third-party repositories.
+ </para>
+ </formalpara>
+
+ <formalpara id="Revisor_Documentation-Appendix-Terminology-Re-Spin">
+ <title>Re-Spin</title>
+ <para>
+ A Fedora Re-Spin is a product that is composed for the single purpose of including updated software packages into the product. It uses the same compose procedure as the media that the Fedora Project composes and releases, but includes updates.
+ </para>
+ </formalpara>
+ <para>
+ Fedora Unity releases Fedora Re-Spins every so often, twice or trice per release.
+ </para>
+
+ <formalpara id="Revisor_Documentation-Appendix-Terminology-Spin">
+ <title>Spin</title>
+ <para>
+ A Fedora Spin is a custom set of software packages, often for a specific audience. Spins include a KDE Spin, which contains KDE software packages rather then the Desktop spin, which is based around GNOME. Similarly, there are XFCE, LXDE, Sugar, Education, Games and Developer Spins.
+ </para>
+ </formalpara>
+ <para>
+ Fedora Spins have gone through the Spins Process (<ulink url="http://fedoraproject.org/wiki/Spins_Process" />), and have been approved trademark usage by the Fedora Project Board.
+ </para>
+
+ <formalpara id="Revisor_Documentation-Appendix-Terminology-Package_Sack">
+ <title>Package Sack</title>
+ <para>
+ para
+ </para>
+ </formalpara>
+ </appendix>
+
+ <appendix id="Revisor_Documentation-Appendix-Configuration_Reference" label="B">
+ <title>Configuration Reference</title>
+ <para>
+ This is the configuration reference for Revisor. Options are listed in alphabetical order.
+ </para>
+
+ <section id="Revisor_Documentation-Appendix-Configuration_Reference-Media_Options">
+ <title>Configuration Options</title>
+ <para>
+ <table>
+ <title>Configuration Options</title>
+ <tgroup cols="4" title="Configuration Options">
+ <colspec colname="column1" colwidth="1*" />
+ <colspec colname="column25" colwidth="4*" />
+ <colspec colname="column67" colwidth="2*" />
+ <colspec colname="column89" colwidth="2*" />
+ <thead>
+ <row>
+ <entry namest="column1" nameend="column89" align="center">Configuration Options</entry>
+ </row>
+ <row>
+ <entry namest="column1" nameend="column25">Configuration Directive</entry>
+ <entry namest="column67" nameend="column89">CLI Option</entry>
+ </row>
+ <row>
+ <entry namest="column1"> </entry>
+ <entry namest="column25">Possible Values</entry>
+ <entry>Default</entry>
+ <entry>Context</entry>
+ </row>
+ <row>
+ <entry namest="column1"> </entry>
+ <entry namest="column25" nameend="column67">Description</entry>
+ <entry namest="column89"> </entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry namest="column1" nameend="column25"><literal>clean_up</literal></entry>
+ <entry namest="column67" nameend="column89"><literal>--clean-up</literal></entry>
+ </row>
+ <row>
+ <entry namest="column25">0, 1, 2</entry>
+ <entry>1</entry>
+ <entry>global, model</entry>
+ </row>
+ <row>
+ <entry namest="column25" nameend="column89">Should Revisor not clean up at all (0), clean up it's temporary build data (1), or everything -this includes the yum cache (2).</entry>
+ </row>
+
+ <row>
+ <entry namest="column1" nameend="column25"><literal>debuglevel</literal></entry>
+ <entry namest="column67" nameend="column89"><literal>-d</literal>, <literal>--debug</literal></entry>
+ </row>
+ <row>
+ <entry namest="column25">0 - 9</entry>
+ <entry>0</entry>
+ <entry>global, model</entry>
+ </row>
+ <row>
+ <entry namest="column25" nameend="column89">The level of debugging. 0 is the lowest debug level, whereas 9 is the highest. Revisor turns up the volume quickly. The logfile on debug level 9 may very easily become 20-30MB.</entry>
+ </row>
+
+ <row>
+ <entry namest="column1" nameend="column25"><literal>include_bootiso</literal></entry>
+ <entry namest="column67" nameend="column89"><literal> </literal></entry>
+ </row>
+ <row>
+ <entry namest="column25">0, 1</entry>
+ <entry>0</entry>
+ <entry>global, model</entry>
+ </row>
+ <row>
+ <entry namest="column25" nameend="column89">Whether to include the relatively large boot.iso on the optical installation media created. Setting this to 0 will still include boot.iso in the installation tree created (if configured with <code>media_installation_tree</code><footnote><para>Note that the installation tree is always created. See <xref linkend="Revisor_Documentation-Compose_Process_Details" /> for more details.</para></footnote>)</entry>
+ </row>
+
+ <row>
+ <entry namest="column1" nameend="column25"><literal>kickstart_exact</literal></entry>
+ <entry namest="column67" nameend="column89"><literal>--kickstart-exact</literal></entry>
+ </row>
+ <row>
+ <entry namest="column25">0, 1</entry>
+ <entry>0</entry>
+ <entry>global, model</entry>
+ </row>
+ <row>
+ <entry namest="column25" nameend="column89">Tells Revisor to ignore @core and @base groups (like with <code>%packages --nobase</code>) and only add what is in the package manifest.</entry>
+ </row>
+
+ <row>
+ <entry namest="column1" nameend="column25"><literal>kickstart_exact_nevra</literal></entry>
+ <entry namest="column67" nameend="column89"><literal>--kickstart-exact-nevra</literal></entry>
+ </row>
+ <row>
+ <entry namest="column25">0, 1</entry>
+ <entry>0</entry>
+ <entry>global, model</entry>
+ </row>
+ <row>
+ <entry namest="column25" nameend="column89">Tells Revisor to only add what is in the package manifest. In addition, if the transaction changes (because of dependency resolving, for example), Revisor will stop composing.</entry>
+ </row>
+
+ <row>
+ <entry namest="column1" nameend="column25"><literal>media_installation_bluray_duallayer</literal></entry>
+ <entry namest="column67" nameend="column89"><literal>--install-bluray-dl</literal></entry>
+ </row>
+ <row>
+ <entry namest="column25">0, 1</entry>
+ <entry>0</entry>
+ <entry>global, model</entry>
+ </row>
+ <row>
+ <entry namest="column25" nameend="column89">Whether to create Bluray Duallayer installation media (47GiB).</entry>
+ </row>
+
+ <row>
+ <entry namest="column1" nameend="column25"><literal>media_installation_bluray</literal></entry>
+ <entry namest="column67" nameend="column89"><literal>--install-bluray</literal></entry>
+ </row>
+ <row>
+ <entry namest="column25">0, 1</entry>
+ <entry>0</entry>
+ <entry>global, model</entry>
+ </row>
+ <row>
+ <entry namest="column25" nameend="column89">Whether to create Bluray installation media (23GiB).</entry>
+ </row>
+
+ <row>
+ <entry namest="column1" nameend="column25"><literal>media_installation_bluray_duallayer</literal></entry>
+ <entry namest="column67" nameend="column89"><literal>--install-bluray-dl</literal></entry>
+ </row>
+ <row>
+ <entry namest="column25">0, 1</entry>
+ <entry>0</entry>
+ <entry>global, model</entry>
+ </row>
+ <row>
+ <entry namest="column25" nameend="column89">Whether to create Bluray Duallayer installation media (47GiB).</entry>
+ </row>
+
+ <row>
+ <entry namest="column1" nameend="column25"><literal>media_installation_cd</literal></entry>
+ <entry namest="column67" nameend="column89"><literal>--install-cd</literal></entry>
+ </row>
+ <row>
+ <entry namest="column25">0, 1</entry>
+ <entry>0</entry>
+ <entry>global, model</entry>
+ </row>
+ <row>
+ <entry namest="column25" nameend="column89">Whether to create CD installation media (685MiB).</entry>
+ </row>
+
+ <row>
+ <entry namest="column1" nameend="column25"><literal>media_installation_dvd</literal></entry>
+ <entry namest="column67" nameend="column89"><literal>--install-dvd</literal></entry>
+ </row>
+ <row>
+ <entry namest="column25">0, 1</entry>
+ <entry>0</entry>
+ <entry>global, model</entry>
+ </row>
+ <row>
+ <entry namest="column25" nameend="column89">Whether to create DVD installation media (4.3GiB).</entry>
+ </row>
+
+ <row>
+ <entry namest="column1" nameend="column25"><literal>media_installation_dvd_duallayer</literal></entry>
+ <entry namest="column67" nameend="column89"><literal>--install-dvd-dl</literal></entry>
+ </row>
+ <row>
+ <entry namest="column25">0, 1</entry>
+ <entry>0</entry>
+ <entry>global, model</entry>
+ </row>
+ <row>
+ <entry namest="column25" nameend="column89">Whether to create DVD Duallayer installation media (8.0GiB).</entry>
+ </row>
+
+ <row>
+ <entry namest="column1" nameend="column25"><literal>media_installation_tree</literal></entry>
+ <entry namest="column67" nameend="column89"><literal>--install-tree</literal></entry>
+ </row>
+ <row>
+ <entry namest="column25">0, 1</entry>
+ <entry>0</entry>
+ <entry>global, model</entry>
+ </row>
+ <row>
+ <entry namest="column25" nameend="column89">Whether to create a an installation tree<footnote><para>Note that the installation tree is always created. See <xref linkend="Revisor_Documentation-Compose_Process_Details" /> for more details.</para></footnote> (for publication over HTTP or FTP, or through Cobbler). No size limit.</entry>
+ </row>
+
+ <row>
+ <entry namest="column1" nameend="column25"><literal>media_installation_unified</literal></entry>
+ <entry namest="column67" nameend="column89"><literal>--install-unified</literal></entry>
+ </row>
+ <row>
+ <entry namest="column25">0, 1</entry>
+ <entry>0</entry>
+ <entry>global, model</entry>
+ </row>
+ <row>
+ <entry namest="column25" nameend="column89">Whether to create a unified ISO, installation media (no size limit).</entry>
+ </row>
+
+ <row>
+ <entry namest="column1" nameend="column25"><literal>media_live_optical</literal></entry>
+ <entry namest="column67" nameend="column89"><literal>--live-optical</literal></entry>
+ </row>
+ <row>
+ <entry namest="column25">0, 1</entry>
+ <entry>0</entry>
+ <entry>global, model</entry>
+ </row>
+ <row>
+ <entry namest="column25" nameend="column89">Whether to create Optical Live media (size unknown).</entry>
+ </row>
+
+ <row>
+ <entry namest="column1" nameend="column25"><literal>report_sizes</literal></entry>
+ <entry namest="column67" nameend="column89"><literal>--report_sizes</literal></entry>
+ </row>
+ <row>
+ <entry namest="column25">0, 1</entry>
+ <entry>0</entry>
+ <entry>global, model</entry>
+ </row>
+ <row>
+ <entry namest="column25" nameend="column89">Report the sizes of RPM packages used. Lists the biggest packages in the transaction</entry>
+ </row>
+
+ </tbody>
+ </tgroup>
+ </table>
+ </para>
+
+ </section>
+
+ </appendix>
+
+</part>
diff --git a/doc/Revisor_Documentation/en-US/Author_Group.xml b/doc/Revisor_Documentation/en-US/Author_Group.xml
new file mode 100644
index 0000000..37b4bf5
--- /dev/null
+++ b/doc/Revisor_Documentation/en-US/Author_Group.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0'?>
+<!DOCTYPE authorgroup PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+]>
+
+<authorgroup>
+ <author>
+ <firstname>Jeroen</firstname>
+ <surname>van Meeuwen</surname>
+ <lineage>RHCE</lineage>
+ <affiliation>
+ <orgname>Fedora Project</orgname>
+ <orgdiv>Contributor</orgdiv>
+ </affiliation>
+ <email>kanarip(a)fedoraproject.org</email>
+ </author>
+</authorgroup>
diff --git a/doc/Revisor_Documentation/en-US/Book_Info.xml b/doc/Revisor_Documentation/en-US/Book_Info.xml
new file mode 100644
index 0000000..c7ebea9
--- /dev/null
+++ b/doc/Revisor_Documentation/en-US/Book_Info.xml
@@ -0,0 +1,34 @@
+<?xml version='1.0'?>
+<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+]>
+
+<bookinfo id="Revisor_Documentation-Documentation">
+ <title>Revisor Documentation</title>
+<!--
+ <subtitle>short descriptor</subtitle>
+ <productname>Documentation</productname>
+ <productnumber>0.1</productnumber>
+ <edition>0</edition>
+ <pubsnumber>0</pubsnumber>
+//-->
+ <abstract>
+ <para>A short overview and summary of the book's subject and purpose, traditionally no more than one paragraph long. Note: the abstract will appear in the front matter of your book and will also be placed in the #description field of the book's RPM spec file.</para>
+ </abstract>
+ <corpauthor>
+ <inlinemediaobject>
+ <imageobject>
+ <imagedata format='SVG' fileref="Common_Content/images/title_logo.svg" />
+ </imageobject>
+ <textobject><phrase>Logo</phrase></textobject>
+ </inlinemediaobject>
+ </corpauthor>
+ <copyright>
+ <year>&YEAR;</year>
+ <holder>&HOLDER;</holder>
+ </copyright>
+ <xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Author_Group.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+</bookinfo>
+
+
+
diff --git a/doc/Revisor_Documentation/en-US/Preface.xml b/doc/Revisor_Documentation/en-US/Preface.xml
new file mode 100644
index 0000000..02af0ea
--- /dev/null
+++ b/doc/Revisor_Documentation/en-US/Preface.xml
@@ -0,0 +1,56 @@
+<?xml version='1.0'?>
+<!DOCTYPE preface PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+]>
+
+<preface id="Revisor_Documentation-Preface">
+ <title>Preface</title>
+ <para>
+ This is the documentation for Revisor, a utility to create and customize your own Linux distribution based on Fedora, Red Hat Enterprise Linux or CentOS.
+ </para>
+
+ <section id="Revisor_Documentation-Preface-About_The_Contributors">
+ <title>About the Contributors</title>
+ <formalpara>
+ <title>Author</title>
+ <para>
+ <emphasis>Jeroen van Meeuwen</emphasis> (RHCE, LPIC-2, MCP, CCNA) is currently a Senior System Engineer, specialized in Linux systems and Systems Architecture, working for Operator Groep Delft in The Netherlands. His experience with computers goes back to the early '90s, with a Philips P2000T being over a decade old, little tapes containing programs but most importantly games, and 16K memory cartridges. Since 1998, he has been involved with Red Hat Linux (5.2 at that time), and was an early adopter of Fedora Core Linux in November 2003, until his first real contributions to Free and Open Source Software were made in 2005.
+ </para>
+ </formalpara>
+ <para>
+ As a contributor to Free and Open Source Software within the Fedora community, amongst other programs, Jeroen has developed Revisor, a Python framework to build distributions with. With regards to Configuration Management, Jeroen currently maintains or co-maintains -amongst other packages- the entire stack of packages related to Puppet
+ </para>
+
+ <formalpara>
+ <title>Contributors</title>
+ <para>
+ <emphasis>Jonathan Steffan</emphasis> is a community volunteer based in Colorado, USA, and has a long standing record within Fedora for packaging Zope (Web Application Server), Plone (Open Source Content Management System), providing compat-python2.4 packages for Fedora 7 and 8, and voluntarily administering the Fedora Unity servers, Zope and Plone instances, creating and further developing Revisor and pyJigdo.
+ </para>
+ </formalpara>
+ </section>
+
+ <section id="Revisor_Documentation-Preface-About_Fedora_Unity">
+ <title>About Fedora Unity</title>
+ <para>
+ The Fedora Unity Project consists of a group of concerned peers from within the Fedora community that strive to bring the best possible solutions to the community, in a consistent manner. This, amongst other things, resulted in extensive documentation on various topics often referred to on the Web, published under the Open Documentation License v1.0.
+ </para>
+ <para>
+ The Fedora Unity Project is a different project then the official Fedora Project. The people behind the Fedora Unity Project often contribute to the Fedora Project directly as well, but there's little to no bureaucracy in the Fedora Unity Project. Why do you think these Re-Spins are not released by the Fedora Project itself?
+ </para>
+ </section>
+
+ <section id="Revisor_Documentation-Preface-About_This_Document">
+ <title>About this Document</title>
+ <para>
+ This document is licensed under the Open Publication License version 1.0, which is available at <ulink url="http://www.opencontent.org/openpub/" />. You can get the latest version from <ulink url="http://kanarip.fedorapeople.org/Revisor_Documentation/en-US/pdf/Revisor_Doc…" /> (PDF), and it's sources live at <ulink url="http://git.fedorahosted.org/git/?p=revisor;a=tree;f=doc" />.
+ </para>
+ </section>
+
+ <xi:include href="Common_Content/Conventions.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+ <xi:include href="Feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
+ <xi:fallback xmlns:xi="http://www.w3.org/2001/XInclude">
+ <xi:include href="Common_Content/Feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ </xi:fallback>
+ </xi:include>
+
+</preface>
diff --git a/doc/Revisor_Documentation/en-US/Revision_History.xml b/doc/Revisor_Documentation/en-US/Revision_History.xml
new file mode 100644
index 0000000..68432a0
--- /dev/null
+++ b/doc/Revisor_Documentation/en-US/Revision_History.xml
@@ -0,0 +1,26 @@
+<?xml version='1.0'?>
+<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+]>
+
+<appendix id="appe-Publican-Revision_History">
+ <title>Revision History</title>
+ <simpara>
+ <revhistory>
+ <revision>
+ <revnumber>1.0</revnumber>
+ <date></date>
+ <author>
+ <firstname></firstname>
+ <surname></surname>
+ <email></email>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member></member>
+ </simplelist>
+ </revdescription>
+ </revision>
+ </revhistory>
+ </simpara>
+</appendix>
+
diff --git a/doc/Revisor_Documentation/en-US/Revisor_Documentation.ent b/doc/Revisor_Documentation/en-US/Revisor_Documentation.ent
new file mode 100644
index 0000000..9282cde
--- /dev/null
+++ b/doc/Revisor_Documentation/en-US/Revisor_Documentation.ent
@@ -0,0 +1,5 @@
+<!ENTITY PRODUCT "Documentation">
+<!ENTITY BOOKID "Revisor_Documentation">
+<!ENTITY YEAR "2008">
+<!ENTITY HOLDER "Jeroen van Meeuwen">
+
diff --git a/doc/Revisor_Documentation/en-US/Revisor_Documentation.xml b/doc/Revisor_Documentation/en-US/Revisor_Documentation.xml
new file mode 100644
index 0000000..bddccdd
--- /dev/null
+++ b/doc/Revisor_Documentation/en-US/Revisor_Documentation.xml
@@ -0,0 +1,1105 @@
+<?xml version='1.0'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+]>
+
+<book>
+ <xi:include href="Book_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Preface.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+ <chapter id="Revisor_Documentation-Introduction">
+ <title>Introduction</title>
+ <para>
+ Revisor is a community product by Fedora Unity. Amongst other features, it allows the creation of installation media and live media in the easiest possible manner, through a click-and-go GUI. This chapter gives some insight on how and why Revisor was born, and how the product evolved since.
+ </para>
+
+ <section id="Revisor_Documentation-Introduction-History_Of_Revisor">
+ <title>History of Revisor</title>
+ <para>
+ Revisor development started in December 2006, during the Fedora 7 development cycle, in which -you might recall- the Fedora Core repository, maintained by Red Hat, and Fedora Extras repository, mostly maintained by the community, were merged into one large repository being maintained by both community members as well as Red Hat employees -which are mostly community members hired by Red Hat -so community altogether. Before then Red Hat employees maintained Fedora Core -as the set of packages upstream for Red Hat's Enterprise product- and the community maintained a repository with additional software; Fedora Extras. Red Hat composed the Fedora distribution every once in a while, but the merge introduced the possibility for packages that were in Fedora Extras to be included in the main distribution, and for the community to also (co-)maintain the (former) Fedora Core packages that originally made up the distribution.
+ </para>
+ <para>
+ In addition to this huge merge of packages, Red Hat employees were also able to release the entire build process to the community, meaning that from the moment the source is committed up and until the release is announced, the entire process is open. Not that is was all behind closed doors or proprietary or anything, the community just couldn't really play with it as much. We now have koji (build system), mash (repository compose from build system products), bodhi (updates release system), livecd-tools (compose tool for live media) and pungi (compose tool for installation media).
+ </para>
+ <para>
+ Composing media was an obscure process up and until the moment these tools exposed the best way to compose (a set of) installation media. Fedora Unity had been building and releasing so-called Re-Spins1 regularly, but they were built using a not-so-very intelligent bash script. Like hundreds if not thousands of other parties that needed to build their own media one way or the other, the entire process was based on the best educated guess of what should happen. Luckily, in the FOSS world an educated guess is often a very good guess, despite the fact that one keeps learning even years after the original engagement.
+ </para>
+ <para>
+ When in December 2006 the compose tools hit a stage in which they were released to the public, Fedora Unity was eager to get these tools and study them and use them for composing their Re-Spins. Up and until then, Re-Spins were composed with the aforementioned bash script that didn't do much but trigger the appropriate commands in a sequence; There wasn't any dependency resolving between the packages included nor did we know exactly how a release was supposed to be composed -it was our educated guess of how it could happen. Although it often led to success, we've had many, many failed Re-Spins as well. With a handful of volunteers, you can imagine the amount of frustration that might give. Fedora Unity was eager to improve their Re-Spin process.
+ </para>
+ <para>
+ So, early February 2007, a number of Fedora Unity members attended “FUDCon 2007” in Boston, and presented a working GUI front-end to livecd-tools and pungi enabling regular users to also re-compose or re-spin the installation media and live media they had been getting from the Fedora Project. Revisor at this point just made it “as easy as possible”. Besides the possibilities of pungi and livecd-tools themselves, the wizard Revisor had apparently was very, very useful to mere mortals. From that point on, things took off.
+ </para>
+ <para>
+ Fedora Unity decided Revisor could accomplish more then just being a front-end to existing compose tools and enable someone to tweak a lot of settings as well. In March 2007, Revisor was rebuild from the ground up in March 2007 to allow a more flexible process, more dependent on the configuration directives it was given and less so on the processes of the existing tools. When in San Diego at the Red Hat Summit (early May 2007), Robert 'Bob' Jensen and Jonathan Steffan gave a presentation on “Customizing Fedora”, the responses were amazing. Since then Revisor has evolved from a front-end to existing tools to the complete compose tool it is today, with lots of configuration options for specific use-cases.
+ </para>
+ <para>
+ For users, Revisor is particularly useful because it has a GUI front-end wizard, which, with the defaults settings, will just succeed in getting a user the media he/she wants. If a user decides he needs little adjustment of the media, the GUI allows for selecting the most common options. If a user decides he needs some less common adjustments, the configuration options gives him very granular control -and as long as the documentation on all the options is sufficient, users will be able to make those less common adjustments.
+ </para>
+ <para>
+ For administrators on the other hand, Revisor is the tool that gives so much granular control over what happens, that it can serve almost every specific use-case. In this aspect, Revisor could potentially replace the compose tools administrators have been developing themselves with a consistent and flexible program flow.
+ </para>
+ <para>
+ This document should enable you to study the process of composing installation and live media, and comprehend the logic Revisor adds to that process.
+ </para>
+ </section>
+
+ <section id="Revisor_Documentation-Introduction-The_Installation_Media_Challenge">
+ <title>The Installation Media Challenge</title>
+ <para>
+ When Fedora Unity first started doing these so-called Re-Spins, the challenge ahead could maybe be explained like this:
+ </para>
+ <para>
+ <emphasis>When a user downloads a Fedora release and installs the distribution, the user will need to download and install a number of updates. The “older” the release becomes, the more updates will be available, and the greater the total download size of these updates the user will need to download on top of the download size of the original release media.</emphasis>
+ </para>
+ <para>
+ “older” is in quotes on purpose, because really for an operating system -or “distribution” if you will- being released every 6 months, “old” is quite a relative concept. The number of updates available however, at any given time during the release cycle, may range from 0 right after the release (which has never happened before), to the total amount of packages installed on the user's system (often over 2000). You can imagine the size of these updates ranging from 0 MB to an astonishing 2GB(!), only 6 months after the initial release.
+ </para>
+ <para>
+ Some of us do not have the bandwidth capacity or enough data transfer quota to download this many extra, rather useless bits. In addition, some of us do not have an Internet connection at all, and thus benefit getting the updates from Re-Spins directly.
+ </para>
+ <para>
+ The use of updates in Re-Spins has several more beneficial side-effects, which we'll explain in more detail later on in this document. Long story short; If for some reason the software used to compose the media (the release) with does not work for your hardware or your specific needs, updated software incorporated in the composed installer images might resolve that problem.
+ </para>
+ <para>
+ This is the original challenge the Fedora Unity team resolved a long time ago, and is at the base of what Revisor does nowadays.
+ </para>
+ </section>
+
+ <section id="Revisor_Documentation-Introduction-The_Live_Media_Challenge">
+ <title>The Live Media Challenge</title>
+ <para>
+ Back in the day Fedora Core 5 was the most recent release, Fedora Unity created so-called live media using Kadischi. In that time, live media could only have a read-only root file system and was not as feature-rich as live media is today. However, just before Revisor came to life, two applications were developed; pungi for creating installation media, and livecd-tools for creating live media. These two applications did their work well; The media composed for a release, including many different custom live media spins were, and still are, created with these tools. Immediately, the Revisor developers set themselves a target to provide a single interface to both of those tools.
+ </para>
+ </section>
+
+ </chapter>
+
+ <chapter id="Revisor_Documentation-Features">
+ <title>Features</title>
+ <para>
+ Revisor allows you to build and customize your own Remix, Re-Spin, Spin or even your own distribution, based on Fedora and derivative distributions such as Red Hat Enterprise Linux and CentOS.
+ </para>
+ <para>
+ Revisor builds installation media, live media, installation trees, cobbler distro's and profiles, virtualization images and more.
+ </para>
+
+ <section id="Revisor_Documentation-Features-Installation_Media">
+ <title>Installation Media</title>
+ <para>
+ Installation media is what you use to install a system with. The installation media composed will allow you to go through the installation process, answering a number of questions (either manually or through kickstart), and ends up in a system running the distribution you install.
+ </para>
+ <para>
+ Composing installation media using the Revisor GUI allows you to choose the media (CD, or DVD), the packages to be included on the media (also called <emphasis>RPM payload</emphasis>).
+ </para>
+ <para>
+ Using the command-line interface, Revisor also allows you to choose DVD Duallayer and single- or dual-layer Bluray.
+ </para>
+ </section>
+
+ <section id="Revisor_Documentation-Features-Installation_Trees">
+ <title>Installation Trees</title>
+ <para>
+ Installation trees are typically used in environments where a distribution needs to be deployed over multiple systems, or is very volatile. Installation trees are often made accessible through HTTP or FTP protocols, in one place, and do not have as much overhead (in creating .iso files, and burning those to optical media to distribute them).
+ </para>
+ </section>
+
+ <section id="Revisor_Documentation-Features-Live_Media">
+ <title>Live Media</title>
+ <para>
+ Live media often is a perfect showcase for an Operating system, Desktop Environment or any other thing you want to show. Also, since Live media is read-only, live media perfectly allows for a kiosk system, a system that may change while it's running, but restores all original settings when rebooted.
+ </para>
+ <para>
+ Live media is also installable. You start out with a system and boot it from live media, then choose to install the live media. This however is inferior to real installation media, but is convenient if you happen to like what you see when running from live media.
+ </para>
+ </section>
+
+ <section id="Revisor_Documentation-Features-Reproducibility">
+ <title>Reproducibility</title>
+ <para>
+ Media composed with Revisor is extremely reproducible. Using <literal>kickstart_exact_nevra</literal>, you can even select specific versions of packages to be included on the product.
+ </para>
+ </section>
+
+ <section id="Revisor_Documentation-Features-Consistency">
+ <title>Consistency</title>
+ <para>
+ When composing different types of media, such as CDs and DVDs, Revisor composes these discs in one run, making the different media completely consistent. <application>pungi</application> would require you to run twice, once for CDs, and once for DVDs. This is because <application>pungi</application> uses the <literal>part / <replaceable><size></replaceable></literal> kickstart configuration directive to set the maximum size of the media, and has no option to override the size on the command-line, nor to compose a certain set of media (it all depends on the size).
+ </para>
+ </section>
+
+ <section id="Revisor_Documentation-Features-Flexibility">
+ <title>Flexibility</title>
+ <para>
+ Over the years, Revisor has been adopted to serve a large number of use-cases, where use-cases stretch from media being composed as efficient as possible, as robust as possible, specific deployment needs and expectations, and to match the Fedora Project Release Engineering tools' behaviour. All this allows you to configure a lot, and thus customize a lot, making Revisor more of a flexible framework.
+ </para>
+ </section>
+
+ <section id="Revisor_Documentation-Features-Graphical_User_Interface">
+ <title>Graphical User Interface</title>
+ <para>
+ Revisor has a Graphical User Interface or GUI, in addition to the Command Line Interface or CLI, which makes Revisor more accessible to users then the other tools, which are CLI only. Most people only know of Revisor through the GUI, and may think there is no CLI to Revisor. Only when it comes down to many of the additional features that Revisor has, and that do not fit in a simplified GUI, one gets down with it using the CLI.
+ </para>
+ </section>
+
+ <section id="Revisor_Documentation-Features-Open_Development_Community">
+ <title>Open Development Community</title>
+ <para>
+ Revisor has one of those old-fashioned Free and Open Source Software development communities, allowing anyone to make a contribution to Revisor. In fact, Revisor has not bounced a single patch since the project started. Therefor, it improves faster then any of the other compose tools, and is better adaptible to your needs and expectations, because unlike the other utilities, Revisor is not limited to use-cases that apply to Fedora Project Release Engineering.
+ </para>
+ </section>
+
+ <section id="Revisor_Documentation-Features-Plugin_System">
+ <title>Plugin System</title>
+ <para>
+ Revisor has a plugin system so that you can easily extend Revisor. This plugin system gives you full control over the Revisor procedures, and hands you off anything Revisor knows about the compose process. There's are multiple plugins available from upstream as well. To give you an example, the ability to replace <filename>isolinux.cfg</filename> after the compose is done, is a plugin. See <xref linkend="Revisor_Documentation-Plugins" /> for more information.
+ </para>
+ </section>
+
+ <section id="Revisor_Documentation-Features-Extraneous_Debugging">
+ <title>Extraneous Debugging</title>
+ <para>
+ Revisor has extraneous debugging, which enables you, as well as the supporters and Revisor's developers, to trace down what happens exactly, and where anything might go wrong.
+ </para>
+ </section>
+
+ <section id="Revisor_Documentation-Features-Using_YUM_Configuration_Files">
+ <title>Using YUM Configuration Files</title>
+ <para>
+ Revisor uses YUM configuration files, where everyone else is not. With using YUM configuration files however, the control you have is nearly limitless. With all the features in YUM already, using it's configuration file format and letting YUM itself work with those allows Revisor to do a lot of cool things without doing anything itself:
+ </para>
+ <para>
+ <orderedlist>
+ <listitem>
+ <formalpara>
+ <title>Excluding packages from repositories</title>
+ <para>
+ Excluding packages from repositories means a great deal. Not having them exist in the <xref linkend="Revisor_Documentation-Appendix-Terminology-Package_Sack" /> ensures the package will not end up in the product. This may be what you want for maybe just a few, or maybe an awful lot of packages.
+ </para>
+ </formalpara>
+ <para>
+ Using the alternative configuration file format, kickstart, in use by every other compose tool, and the <literal>repo</literal> configuration directive that is available with kickstart, you can exclude packages using the <literal>--exclude=</literal> parameter to the <literal>repo</literal> configuration directive. However, that parameter does not allow wildcard matches.
+ </para>
+ </listitem>
+ <listitem>
+ <formalpara>
+ <title>Including only a certain (set of) package(s)</title>
+ <para>
+ Including only a certain package, or certain set of packages is valuable when a lot of packages exist in the repository configured, but you only need one or two.
+ </para>
+ </formalpara>
+ </listitem>
+ <listitem>
+ <formalpara>
+ <title>Concurrent use of baseurl(s) and the mirrorlist</title>
+ <para>
+ Like during normal YUM operations, the baseurl(s) and the mirrorlist configured for a repository are used concurrently. This is not possible with the kickstart configuration directive <literal>repo</literal>, which takes either <literal>--baseurl</literal> or <literal>--mirrorlist</literal>, but not both.
+ </para>
+ </formalpara>
+ </listitem>
+ <listitem>
+ <formalpara>
+ <title>Repository priorities</title>
+ <para>
+ Settings available with YUM are available within Revisor as well, like repository priorities. Using repository priorities, you can have YUM decide to pull a package from the repository with a higher priority (a lower priority number) rather then a repository with a lower priority.
+ </para>
+ </formalpara>
+ </listitem>
+ <listitem>
+ <formalpara>
+ <title>YUM Plugins</title>
+ <para>
+ YUM plugins, such as <application>yum-fastestmirror</application>, <application>yum-fedorakmod</application>, are available, giving you even more control over the behaviour of YUM.
+ </para>
+ </formalpara>
+ </listitem>
+ </orderedlist>
+ </para>
+ </section>
+ </chapter>
+
+ <chapter id="Revisor_Documentation-Installation">
+ <title>Installation</title>
+ <para>
+ This chapter contains the installation instructions for Revisor.
+ </para>
+
+ <section id="Revisor_Documentation-Installation-Packages">
+ <title>Packages</title>
+ <para>
+ You can install Revisor using RPM packages from the repositories already configured on your system.
+ </para>
+
+ <formalpara id="Revisor_Documentation-Installation-Packages-revisor">
+ <title><application>revisor</application></title>
+ <para>
+ Shorthand package for the Revisor GUI.
+ </para>
+ </formalpara>
+
+ <formalpara id="Revisor_Documentation-Installation-Packages-revisor-cli">
+ <title><application>revisor-cli</application></title>
+ <para>
+ The CLI version of Revisor. This package is always installed, as it contains the Python code for Revisor's core. Installing just this package will give you the command-line version of Revisor, and prevents the graphical dependencies from the <xref linkend="Revisor_Documentation-Installation-Packages-revisor-gui" /> package to be installed as well.
+ </para>
+ </formalpara>
+
+ <formalpara id="Revisor_Documentation-Installation-Packages-revisor-gui">
+ <title><application>revisor-gui</application></title>
+ <para>
+ The GUI version of Revisor. This is the actual package containing the Graphical User Interface, as opposed to <xref linkend="Revisor_Documentation-Installation-Packages-revisor" />. Depends on <xref linkend="Revisor_Documentation-Installation-Packages-revisor-cli" />, and thus also installs the command-line version of Revisor.
+ </para>
+ </formalpara>
+
+ <section id="Revisor_Documentation-Installation-Packages-YUM-RHEL">
+ <title>Red Hat Enterprise Linux 5 or higher</title>
+ <para>
+ On Red Hat Enterprise Linux 5 or higher, and derivatives, install the Extra Packages for Enterprise Linux (EPEL) repository.
+ </para>
+ <para>
+ Then, give the following command:
+ </para>
+ <para>
+ <screen># <userinput>yum install revisor</userinput></screen>
+ </para>
+ </section>
+
+ <section id="Revisor_Documentation-Installation-Packages-YUM-Fedora">
+ <title>Fedora 7 or higher</title>
+ <para>
+ On Fedora 7 or higher, and derivatives, no additional repository configuration is required.
+ </para>
+ <para>
+ Give the following command:
+ </para>
+ <para>
+ <screen># <userinput>yum install revisor</userinput></screen>
+ </para>
+ </section>
+
+ </section>
+
+ <section id="Revisor_Documentation-Installation-The_Latest_And_Greatest">
+ <title>The Latest and Greatest</title>
+ <para>
+ The latest and greatest is available from GIT, at <ulink url="git://git.fedorahosted.org/revisor" />. To clone this repository, use:
+ </para>
+ <para>
+ <screen>$ <userinput>git clone git://git.fedorahosted.org/revisor/</userinput></screen>
+ </para>
+ <para>
+ Using the GIT clone, you have the several options to start using the latest and greatest:
+ </para>
+ <formalpara>
+ <title>Running directly from the source</title>
+ <para>
+ You can run directly from within the source tree. See <xref linkend="Revisor_Documentation-Development-Running_Revisor_from_Source" /> for more information on how to do so.
+ </para>
+ </formalpara>
+ <formalpara>
+ <title>Building your own packages</title>
+ <para>
+ You can create your own packages, so that you have all the benefits of RPM. See <xref linkend="Revisor_Documentation-Development-Building_Revisor_Packages" /> for more information on how to do so.
+ </para>
+ </formalpara>
+ </section>
+
+ </chapter>
+
+ <chapter id="Revisor_Documentation-Configuration">
+ <title>Configuration</title>
+ <para>
+ Revisor configuration can be performed using <xref linkend="Revisor_Documentation-Configuration-Files" />, or through <xref linkend="Revisor_Documentation-Configuration-Command-line_Options" />.
+ </para>
+
+ <section id="Revisor_Documentation-Configuration-Files">
+ <title>Configuration Files</title>
+ <para>
+ para
+ </para>
+
+ <section id="Revisor_Documentation-Configuration-Files-_etc_revisor_revisor.conf">
+ <title><filename>/etc/revisor/revisor.conf</filename></title>
+ <para>
+ The default Revisor configuration file is <filename>/etc/revisor/revisor.conf</filename>. This configuration file contains two sections:
+ </para>
+ <para>
+ <orderedlist>
+ <listitem>
+ <formalpara>
+ <title><literal>[revisor]</literal></title>
+ <para>
+ The global section. Options specified in this section apply to all the models defined in this configuration file.
+ </para>
+ </formalpara>
+ <para>
+ See also: <xref linkend="Revisor_Documentation-Configuration-Global_and_Model_Configuration" />
+ </para>
+ </listitem>
+ <listitem>
+ <formalpara>
+ <title><literal>[<replaceable>model</replaceable>]</literal></title>
+ <para>
+ Model configuration. One section per model.
+ </para>
+ </formalpara>
+ <para>
+ See also: <xref linkend="Revisor_Documentation-Configuration-Global_and_Model_Configuration" />
+ </para>
+ </listitem>
+ </orderedlist>
+ </para>
+ <para>
+ Model sections basically define a single product. Amongst other things, the distribution, release version, architecture for the product to be composed and what YUM configuration file to use, are (often) defined on a per-model basis. There is a large number of settings available for models, and they are all related to how the product is going to look like. The product name, the location of the RPM payload for installation media, the ISO label, the YUM configuration file to use, are all model settings.
+ </para>
+ <para>
+ Using models, you can reproduce the outcome of the compose process, a <emphasis>product</emphasis>, simply by not touching the model configuration anymore. If you want something different, you can just add another model section, and name it different.
+ </para>
+ <para>
+ To see what models are available, use:
+ </para>
+ <para>
+ <screen>$ <userinput>revisor --list-models</userinput></screen>
+ </para>
+ </section>
+
+ <section id="Revisor_Documentation-Configuration-Files-_etc_revisor_conf.d_">
+ <title><filename>/etc/revisor/conf.d/</filename></title>
+ <para>
+ The default YUM configuration files used by Revisor. In a model configuration section, the <literal>main =</literal> setting points to one of the YUM configuration files in <filename>/etc/revisor/conf.d/</filename>
+ </para>
+ </section>
+
+ <section id="Revisor_Documentation-Configuration-Files-Updates">
+ <title>Updates to Configuration Files</title>
+ <para>
+ Something about .rpmnew and .rpmsave files
+ </para>
+ </section>
+
+ <section id="Revisor_Documentation-Configuration-Files-Changing_Configuration_Files">
+ <title>Changing Configuration Files</title>
+ <para>
+ Something about creating your own Configuration Files
+ </para>
+ </section>
+
+ </section>
+
+ <section id="Revisor_Documentation-Configuration-Global_and_Model_Configuration">
+ <title>Global and Model Configuration</title>
+ <para>
+ para
+ </para>
+ </section>
+
+ <section id="Revisor_Documentation-Configuration-Yum_Repositories">
+ <title>YUM Repository Configuration</title>
+ <para>
+ para
+ </para>
+
+ <section id="Revisor_Documentation-Configuration-Yum_Repositories-Using_a_Local_Mirror">
+ <title>Using a Local Mirror</title>
+ <para>
+ para
+ </para>
+ </section>
+
+ <section id="Revisor_Documentation-Configuration-Yum_Repositories-Using_Local_Files">
+ <title>Using Local Files</title>
+ <para>
+ para
+ </para>
+ </section>
+
+ <section id="Revisor_Documentation-Configuration-Yum_Repositories-Using_a_DVD">
+ <title>Using a DVD</title>
+ <para>
+ para
+ </para>
+ </section>
+
+ <section id="Revisor_Documentation-Configuration-Yum_Repositories-Adding_Third_Party_Repositories">
+ <title>Adding Third Party Repositories</title>
+ <para>
+ para
+ </para>
+ </section>
+
+ <section id="Revisor_Documentation-Configuration-Yum_Repositories-Creating_Your_Own_Repository">
+ <title>Creating Your Own Repository</title>
+ <para>
+ para, mention something about comps
+ </para>
+ </section>
+
+ <section id="Revisor_Documentation-Configuration-Yum_Repositories-Troubleshooting">
+ <title>Testing & Troubleshooting the YUM Configuration</title>
+ <para>
+ para
+ </para>
+ </section>
+
+ </section>
+
+ <section id="Revisor_Documentation-Configuration-Configuring_A_Proxy">
+ <title>Configuring A Proxy Server</title>
+ <para>
+ para
+ </para>
+ </section>
+
+ <section id="Revisor_Documentation-Configuration-Command-line_Options">
+ <title>Command-line Options</title>
+ <para>
+ para
+ </para>
+ </section>
+
+ </chapter>
+
+ <chapter id="Revisor_Documentation-Using_Kickstart">
+ <title>Using Kickstart</title>
+ <para>
+ Kickstart is a configuration file format for automating installation procedures. Or at least, it was, originally. Nowadays, kickstart files are used as input to the compose tools, including Revisor.
+ </para>
+ <para>
+ Revisor again is unique in that it does not require a kickstart file for input. The other tools only take kickstart configuration files. Revisor though allows most of what is in a kickstart file to be configured interactively in Graphical User Interface mode.
+ </para>
+
+ <section id="Revisor_Documentation-Using_Kickstart-How_Kickstart_Is_Used">
+ <title>How Kickstart Is Used</title>
+ <para>
+ There's two cases in which a kickstart file is used differently. One is during the compose of installation media, and the other of course is during the compose of live media, or virtualization media.
+ </para>
+
+ <section id="Revisor_Documentation-Using_Kickstart-How_Kickstart_Is_Used-Installation_Media">
+ <title>Installation Media</title>
+ <para>
+ In the case of installation media, the following settings are used:
+ </para>
+ <para>
+ <itemizedlist>
+ <listitem>
+ <formalpara>
+ <title><literal>repo</literal></title>
+ <para>
+ The <literal>repo</literal> command in kickstart is used when Revisor is configured to use the repositories configured in the kickstart file only. Use <literal>kickstart_repos = 1</literal> to enable this feature, or set the appropriate checkbox in the Revisor GUI.
+ </para>
+ </formalpara>
+ </listitem>
+ <listitem>
+ <formalpara>
+ <title><literal>%packages</literal></title>
+ <para>
+ The <literal>%packages</literal> section in kickstart is used to determine the RPM payload on the installation media. It can include groups and packages, and exclude packages. It accepts wildcards, both in includes and excludes of packages (but not groups).
+ </para>
+ </formalpara>
+ </listitem>
+ </itemizedlist>
+ </para>
+ <note>
+ <title>@core and @base</title>
+ <para>
+ By default, groups @core and @base are included in the package manifest. You can specify @base to not be included, by using <literal>%packages --nobase</literal>, but @core cannot be excluded using a kickstart package manifest.
+ </para>
+ </note>
+ <para>
+ Using <literal>kickstart_exact</literal>, you can exclude @core and @base so that you need to explicitly select them in the kickstart package manifest.
+ </para>
+ <para>
+ Using <literal>kickstart_exact_nevra</literal> ...
+ </para>
+ </section>
+ </section>
+
+ <section id="Revisor_Documentation-Using_Kickstart-The_Kickstart_Package_Manifest">
+ <title>The Kickstart Package Manifest</title>
+ <para>
+ para
+ </para>
+
+ <formalpara>
+ <title>Group @core</title>
+ <para>
+ para
+ </para>
+ </formalpara>
+
+ <formalpara>
+ <title>Group @base</title>
+ <para>
+ para
+ </para>
+ </formalpara>
+
+ <formalpara>
+ <title>Including groups of packages</title>
+ <para>
+ para
+ </para>
+ </formalpara>
+
+ <formalpara>
+ <title>Including a single package</title>
+ <para>
+ para
+ </para>
+ </formalpara>
+
+ <formalpara>
+ <title>Excluding a single package</title>
+ <para>
+ para
+ </para>
+ </formalpara>
+
+ <formalpara>
+ <title>Using wildcard matches</title>
+ <para>
+ para
+ </para>
+ </formalpara>
+
+ <section id="Revisor_Documentation-Using_Kickstart-Using_Kickstart_With_Package_NEVRA">
+ <title>Using Kickstart with Package NEVRA</title>
+ <para>
+ para
+ </para>
+ </section>
+
+ </section>
+
+ </chapter>
+
+ <chapter id="Revisor_Documentation-Compose_Process_Details">
+ <title>Compose Process Details</title>
+ <para>
+ para
+ </para>
+ <section id="Revisor_Documentation-Compose_Process_Details-Dependency_Resolving">
+ <title>Dependency Resolving</title>
+ <para>
+ Dependency resolving is the area where some of the efficiency Revisor can gain for you comes from. While of course there is specific reasons to do things one way, or the other, most people I speak to about Revisor, it is not very clear why, or what Revisor does in this area. First of all, there's two ways of resolving dependencies:
+ </para>
+ <para>
+ <orderedlist>
+ <listitem>
+ <formalpara>
+ <title>Inclusive Dependency Resolving</title>
+ <para>
+ Iterate all packages in the transaction and list their requirements, then for each of those requirements, find all packages that provide a matching capability, add those packages to the transaction, and don't forget to add the requirements those packages have themselves, back into the pile of (unmet) requirements.
+ </para>
+ </formalpara>
+ </listitem>
+ <listitem>
+ <formalpara>
+ <title>Exclusive Dependency Resolving</title>
+ <para>
+ Iterate all the packages and for each of the requirements found, find the best package that meets the requirement. This is also YUMs default behavior. Anaconda uses YUM during the installation, and this is the behaviour of YUM used during the installation.
+ </para>
+ </formalpara>
+ </listitem>
+ </orderedlist>
+ </para>
+
+ <section id="Revisor_Documentation-Compose_Process_Details-Dependency_Resolving-Inclusive">
+ <title>Inclusive Dependency Resolving</title>
+ <para>
+ Hypothetically, you could describe inclusive dependency as follows:
+ </para>
+ <para>
+ <screen>final_packages = []
+more_to_do = True
+while more_to_do:
+ more_to_do = False
+ for package in packages:
+ if package in final_packages:
+ continue
+
+ dependencies = find_package_dependencies()
+ for dependency in dependencies:
+ pulled_in_package = pull_in_dependency()
+ if pulled_in_package not in final_packages:
+ packages.append(pulled_in_package)
+ more_to_do = True</screen>
+ </para>
+ <para>
+ So, what does this mean? Basically, it means that if there is a requirement for a capability, all packages providing that capability are being pulled in. Now imagine package 'foo' requires capability 'web-client'. There's a number of packages providing that capability, right? So you get Firefox, lynx, elinks, konqueror, safari, Netscape, Internet Explorer, emacs, for free! All of those pull in their own dependencies also, of course.
+ </para>
+ <note>
+ <para>
+ If you catch this before it catches you, you can prevent the packages from being pulled in during dependency resolving by not making the package available in the <xref linkend="Revisor_Documentation-Appendix-Terminology-Package_Sack" /> in the first place, using the <literal>-firefox</literal> syntax in the kickstart package manifest, and setting <literal>kickstart_uses_pkgsack_excludes</literal> to 1.
+ </para>
+ </note>
+ <note>
+ <para>
+ You may have thought of it; pulling in packages this way may give you a package set (or <emphasis>RPM payload</emphasis>) that has conflicting packages. Imagine package <application>foo</application> requiring capability <application>bar</application>, which is provided by two packages that conflict with one another (either on explicit <literal>Conflicts:</literal> RPM header or file level). Both will be pulled in, hence disabling you to install everything (<literal>'*'</literal> or -previously- <literal>@Everything</literal> in the kickstart package manifest).
+ </para>
+ </note>
+
+ <section id="Revisor_Documentation-Compose_Process_Details-Dependency_Resolving-Inclusive-When_This_Makes_Sense">
+ <title>When This Makes Sense</title>
+ <para>
+ If you are composing a large distribution of which 3 million users in even so many different situations having so many different expectations and desires, you will want this behaviour, since you won't be able to determine which one of the packages for each capability someone in that group wants, and which one may not want. Or, in case of upgrades, what the system needs. Shipping them all on the same media is the best solution in these cases.
+ </para>
+ </section>
+
+ <section id="Revisor_Documentation-Compose_Process_Details-Dependency_Resolving-Inclusive-When_This_Does_Not_Make_Sense">
+ <title>When This Does Not Make Sense</title>
+ <para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ When creating installation media to be installed unattended, or to be used in conjunction with deployment strategies
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ When creating installation media to be upgrading PCs you have controlled from the beginning, such as in a company
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Installation for a small group of users or systems
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ When creating minimal installation media, or media with a minimal RPM payload.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ When creating installation media that is to be used with installing "Everything" in the RPM payload.
+ </para>
+ </listitem>
+ </itemizedlist>
+ </para>
+ </section>
+ </section>
+
+ <section id="Revisor_Documentation-Compose_Process_Details-Dependency_Resolving-Exclusive">
+ <title>Exclusive Dependency Resolving</title>
+ <para>
+ Exclusive dependency resolving is what YUM does when you execute a <application>yum install</application>. Unless you've specified one of the packages satisfying any of the dependencies in the transaction, YUM is going to look up the best match for you. This results in the installation of only one package satisfying the dependency of other packages, rather then all packages satisfying said dependency being installed.
+ </para>
+ <para>
+ During the installation procedure, one of the major features of installation media, anaconda is going to use YUM dependency resolving to satisfy all the dependencies.
+ </para>
+ <note>
+ <title>Installation Procedure !== Upgrade Procedure</title>
+ <para>
+ Note that an installation procedure is not the same as an upgrade procedure.
+ </para>
+ </note>
+ </section>
+
+ </section>
+
+ </chapter>
+
+ <chapter id="Revisor_Documentation-Plugins">
+ <title>Plugins</title>
+ <para>
+ para
+ </para>
+
+ <section id="Revisor_Documentation-Plugins-Upstream">
+ <title>Upstream Plugins</title>
+ <para>
+ Plugins available from upstream, maintained by upstream
+ </para>
+
+ <section id="Revisor_Documentation-Plugins-Upstream-Cobbler_Module">
+ <title>Cobbler Module</title>
+ <para>
+ para
+ </para>
+ </section>
+
+ <section id="Revisor_Documentation-Plugins-Upstream-Composer_Module">
+ <title>Composer Module</title>
+ <para>
+ para
+ </para>
+ </section>
+
+ <section id="Revisor_Documentation-Plugins-Upstream-Delta_Module">
+ <title>Delta Module</title>
+ <para>
+ para
+ </para>
+ </section>
+
+ <section id="Revisor_Documentation-Plugins-Upstream-GUI_Module">
+ <title>GUI (Graphical User Interface) Module</title>
+ <para>
+ para
+ </para>
+ </section>
+
+ <section id="Revisor_Documentation-Plugins-Upstream-HUB_Module">
+ <title>HUB Module</title>
+ <para>
+ para
+ </para>
+ </section>
+
+ <section id="Revisor_Documentation-Plugins-Upstream-Isolinux_Module">
+ <title>Isolinux Module</title>
+ <para>
+ para
+ </para>
+ </section>
+
+ <section id="Revisor_Documentation-Plugins-Upstream-Jigdo_Module">
+ <title>Jigdo Module</title>
+ <para>
+ para
+ </para>
+ </section>
+
+ <section id="Revisor_Documentation-Plugins-Upstream-Mock_Module">
+ <title>Mock Module</title>
+ <para>
+ para
+ </para>
+ </section>
+
+ <section id="Revisor_Documentation-Plugins-Upstream-Rebrand_Module">
+ <title>Rebrand Module</title>
+ <para>
+ para
+ </para>
+ </section>
+
+ <section id="Revisor_Documentation-Plugins-Upstream-Reuse_Installer_Images_Module">
+ <title>Reuse Installer Images Module</title>
+ <para>
+ para
+ </para>
+ </section>
+
+ <section id="Revisor_Documentation-Plugins-Upstream-Server_Module">
+ <title>Server Module</title>
+ <para>
+ para
+ </para>
+ </section>
+
+ <section id="Revisor_Documentation-Plugins-Upstream-Virtualization_Module">
+ <title>Virtualization Module</title>
+ <para>
+ para
+ </para>
+ </section>
+
+ <section id="Revisor_Documentation-Plugins-Upstream-WUI_Module">
+ <title>WUI (Web-based User Interface) Module</title>
+ <para>
+ para
+ </para>
+ </section>
+
+ </section>
+
+ <section id="Revisor_Documentation-Plugins-Writing_Your_Own">
+ <title>Writing Your Own Plugins</title>
+ <para>
+ para
+ </para>
+ </section>
+
+ </chapter>
+
+ <chapter id="Revisor_Documentation-Tweaking_The_Build_Process">
+ <title>Tweaking the build process</title>
+ <para>
+ para
+ </para>
+
+ <section id="Revisor_Documentation-Tweaking_The_Build_Process-Reusing_Existing_Installer_Images">
+ <title>Reusing Existing Installer Images</title>
+ <para>
+ para
+ </para>
+ </section>
+
+ <section id="Revisor_Documentation-Tweaking_The_Build_Process-Building_The_Installer_Images_In_Mock">
+ <title>Building The Installer Images in Mock</title>
+ <para>
+ para
+ </para>
+ </section>
+
+ <section id="Revisor_Documentation-Tweaking_The_Build_Process-Omitting-isomd5sum">
+ <title>Omitting isomd5sums</title>
+ <para>
+ para
+ </para>
+ </section>
+
+ <section id="Revisor_Documentation-Tweaking_The_Build_Process-Omitting-sha1sums">
+ <title>Omitting SHA1SUMS</title>
+ <para>
+ para
+ </para>
+ </section>
+
+ </chapter>
+
+ <chapter id="Revisor_Documentation-Tips_and_Tricks">
+ <title>Tips and Tricks</title>
+ <para>
+ para
+ </para>
+
+ <section id="Revisor_Documentation-Tips_and_Tricks-The_spin-kickstarts_Package">
+ <title>The spin-kickstarts Package</title>
+ <para>
+ para
+ </para>
+ </section>
+
+ <section id="Revisor_Documentation-Tips_and_Tricks-Even_More_Debugging">
+ <title>Even More Debugging</title>
+ <para>
+ something about using -x to buildinstall scripts
+ </para>
+ </section>
+
+ <section id="Revisor_Documentation-Tips_and_Tricks-ksvalidator">
+ <title>Kickstart Validator</title>
+ <para>
+ something about using -x to buildinstall scripts
+ </para>
+ </section>
+
+ <section id="Revisor_Documentation-Tips_and_Tricks-Using_Mirrormanager_For_Mirror_Redirection">
+ <title>Using Mirrormanager for Mirror Redirection</title>
+ <para>
+ Something about using Mirrormanager to redirect you to the local mirror (so you do not have to edit YUM configuration files).
+ </para>
+ </section>
+
+ <section id="Revisor_Documentation-Tips_and_Tricks-The_localrepo_DNS_Alias">
+ <title>Using The localrepo DNS Alias</title>
+ <para>
+ Something about using the localrepo DNS alias to point to your local mirror (either through real DNS or through /etc/hosts), so you do not have to edit the YUM configuration files.
+ </para>
+ </section>
+
+ </chapter>
+
+ <chapter id="Revisor_Documentation-Frequently_Asked_Questions">
+ <title>Frequently Asked Questions</title>
+ <para>
+ para
+ </para>
+
+ <formalpara id="Revisor_Documentation-Frequently_Asked_Questions-What_Are_Installer_Images">
+ <title>What Are Installer Images?</title>
+ <para>
+ para
+ </para>
+ </formalpara>
+
+ <formalpara id="Revisor_Documentation-Frequently_Asked_Questions-Why_Rebuild_Installer_Images">
+ <title>Why Rebuild Installer Images?</title>
+ <para>
+ para
+ </para>
+ </formalpara>
+
+ </chapter>
+
+ <chapter id="Revisor_Documentation-Testing">
+ <title>Testing</title>
+ <para>
+ para
+ </para>
+
+ <section id="Revisor_Documentation-Testing-Simple_Test_Cases">
+ <title>Simple Test Cases</title>
+ <para>
+ para
+ </para>
+ </section>
+
+ <section id="Revisor_Documentation-Testing-Complex_Test_Cases">
+ <title>Complex Test Cases</title>
+ <para>
+ para
+ </para>
+ </section>
+
+ <section id="Revisor_Documentation-Testing-Specific_Test_Cases">
+ <title>Specific Test Cases</title>
+ <para>
+ para
+ </para>
+ </section>
+
+ </chapter>
+
+ <chapter id="Revisor_Documentation-Development">
+ <title>Development</title>
+ <para>
+ This chapter sheds some light on development of Revisor, such as different branches and maintenance policies, versioning schemas, etcetera.
+ </para>
+ <para>
+ This part of the documentation relies on whether you have <application>sudo</application> set up properly. If you have not, you're on your own.
+ </para>
+
+ <section id="Revisor_Documentation-Development-Running_Revisor_from_Source">
+ <title>Running Revisor from Source</title>
+ <para>
+ The latest code in GIT can be built into a RPM you can install but one of the advantages of having the complete source tree is that you can run it directly from that source tree so that when you pull in the next updates you do not have to rebuild the RPM. Note that we do not bump the version number for every little change we make, and as such the RPM built does not allow you to use <literal>rpm -Uvh</literal> or <literal>rpm -Uvh --oldpackage</literal>. Of course, Revisor's Makefiles also allow <application>make install</application>, but that leaves a number of unmanaged files on your computer you would have to track down manually in order to remove Revisor completely.
+ </para>
+ <warning>
+ <title>Cannot have Revisor RPMs installed</title>
+ <para>
+ When running revisor from within the source tree, you cannot have any of the Revisor packages installed. Having Revisor RPM packages installed regardless will mess up the GIT repository or source tree.
+ </para>
+ </warning>
+ <para>
+ To run Revisor from within the source tree, checkout the master branch, and run the <filename>./switchhere</filename> script:
+ </para>
+ <para>
+ <screen>$ <userinput>./switchhere</userinput></screen>
+ </para>
+ <para>
+ The <filename>./switchhere</filename> script does the following:
+ </para>
+ <para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ Symlink <filename>/etc/revisor/</filename> to <filename><replaceable>$PWD</replaceable>/conf/</filename> so that <filename>/etc/revisor/revisor.conf</filename>, the primary configuration file, and <filename>/etc/revisor/conf.d/</filename>, the configuration directory, are valid (the symlink causes the actual file and directory to be found in <filename><replaceable>$PWD</replaceable>/conf/</filename>)
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Create the <filename>/usr/share/revisor/</filename> directory so that a couple of symlinks can be created from within that directory:
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ In Revisor 2.1.0 (development version in branch master), this includes:
+ </para>
+ <para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <filename>/usr/share/revisor/ui => <replaceable>$PWD</replaceable>/revisor/modgui/glade/</filename>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <filename>/usr/share/revisor/pixmaps => <replaceable>$PWD</replaceable>/revisor/modgui/glade/pixmaps/</filename>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <filename>/usr/share/revisor/comps => <replaceable>$PWD</replaceable>/conf/</filename>
+ </para>
+ </listitem>
+ </itemizedlist>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ In Revisor 2.0.5 (branch F-7, F-8 or EL-5), this includes:
+ </para>
+ <para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <filename>/usr/share/revisor/ui => <replaceable>$PWD</replaceable>/glade/</filename>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <filename>/usr/share/revisor/pixmaps => <replaceable>$PWD</replaceable>/glade/pixmaps/</filename>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <filename>/usr/share/revisor/comps => <replaceable>$PWD</replaceable>/conf/</filename>
+ </para>
+ </listitem>
+ </itemizedlist>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ In Revisor 2.1.0, also create symlinks from within the appropriate <filename>/usr/share/man/man<replaceable>$x</replaceable>/</filename> directories to the source for these man pages in <filename><replaceable>$PWD</replaceable>/doc/</filename>.
+ </para>
+ </listitem>
+ </itemizedlist>
+ </para>
+ <para>
+ From this moment on, you should be able to run:
+ </para>
+ <para>
+ <screen>$ <userinput>./revisor.py</userinput></screen>
+ </para>
+ <note>
+ <title>Root privileges required</title>
+ <para>
+ Note that revisor needs root privileges to run, and that you'll need to sudo or su-c to gain those. Use here whatever you find the most convenient; Revisor though should have a nice error message when run without those privileges.
+ </para>
+ </note>
+
+ <section id="Revisor_Documentation-Development-Running_Revisor_from_Source-Required_Packages">
+ <title>Installing the Required Packages</title>
+ <para>
+ To be able to run Revisor from within the source tree, you'll need to install the required packages for each component, of course.
+ </para>
+ <para>
+ To get a current list of those packages, use:
+ </para>
+ <para>
+ <screen>$ <userinput>rpmquery --specfile --qf="%{REQUIRES}\n" revisor.spec | sort | uniq | xargs -n 1 repoquery --requires --alldeps --resolve</userinput></screen>
+ </para>
+ </section>
+
+ </section>
+
+ <section id="Revisor_Documentation-Development-Building_Revisor_Packages">
+ <title>Building Revisor Packages</title>
+ <para>
+ para
+ </para>
+ </section>
+
+ <section id="Revisor_Documentation-Development-Tickets">
+ <title>Tickets</title>
+ <para>
+ bugzilla, trac
+ </para>
+ </section>
+
+ <section id="Revisor_Documentation-Development-Versioning_Schema">
+ <title>Versioning Schema</title>
+ <para>
+ para
+ </para>
+ </section>
+
+ <section id="Revisor_Documentation-Development-Release_Procedure">
+ <title>Release Procedure</title>
+ <para>
+ para
+ </para>
+ </section>
+
+ </chapter>
+
+ <xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <index />
+ <xi:include href="Appendix.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+</book>
+
diff --git a/doc/Revisor_Documentation/en-US/images/icon.svg b/doc/Revisor_Documentation/en-US/images/icon.svg
new file mode 100644
index 0000000..c471a60
--- /dev/null
+++ b/doc/Revisor_Documentation/en-US/images/icon.svg
@@ -0,0 +1,3936 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:ns="http://ns.adobe.com/AdobeSVGViewerExtensions/3/"
+ xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ version="1.0"
+ width="32"
+ height="32"
+ id="svg3017"
+ sodipodi:version="0.32"
+ inkscape:version="0.44+devel"
+ sodipodi:docname="book.svg"
+ sodipodi:docbase="/home/andy/Desktop">
+ <metadata
+ id="metadata489">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <sodipodi:namedview
+ inkscape:window-height="480"
+ inkscape:window-width="858"
+ inkscape:pageshadow="0"
+ inkscape:pageopacity="0.0"
+ guidetolerance="10.0"
+ gridtolerance="10.0"
+ objecttolerance="10.0"
+ borderopacity="1.0"
+ bordercolor="#666666"
+ pagecolor="#ffffff"
+ id="base"
+ inkscape:zoom="1"
+ inkscape:cx="16"
+ inkscape:cy="15.944056"
+ inkscape:window-x="0"
+ inkscape:window-y="33"
+ inkscape:current-layer="svg3017" />
+ <defs
+ id="defs3019">
+ <linearGradient
+ id="linearGradient2381">
+ <stop
+ style="stop-color:white;stop-opacity:1"
+ offset="0"
+ id="stop2383" />
+ <stop
+ style="stop-color:white;stop-opacity:0"
+ offset="1"
+ id="stop2385" />
+ </linearGradient>
+ <linearGradient
+ x1="415.73831"
+ y1="11.854"
+ x2="418.13361"
+ y2="18.8104"
+ id="XMLID_1758_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.8362,0.5206,-1.1904,0.992,147.62,-30.9374)">
+ <stop
+ style="stop-color:#ccc;stop-opacity:1"
+ offset="0"
+ id="stop3903" />
+ <stop
+ style="stop-color:#f2f2f2;stop-opacity:1"
+ offset="1"
+ id="stop3905" />
+ <a:midPointStop
+ style="stop-color:#CCCCCC"
+ offset="0" />
+ <a:midPointStop
+ style="stop-color:#CCCCCC"
+ offset="0.5" />
+ <a:midPointStop
+ style="stop-color:#F2F2F2"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="500.70749"
+ y1="-13.2441"
+ x2="513.46442"
+ y2="-2.1547"
+ id="XMLID_1757_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)">
+ <stop
+ style="stop-color:#5387ba;stop-opacity:1"
+ offset="0"
+ id="stop3890" />
+ <stop
+ style="stop-color:#96bad6;stop-opacity:1"
+ offset="1"
+ id="stop3892" />
+ <a:midPointStop
+ style="stop-color:#5387BA"
+ offset="0" />
+ <a:midPointStop
+ style="stop-color:#5387BA"
+ offset="0.5" />
+ <a:midPointStop
+ style="stop-color:#96BAD6"
+ offset="1" />
+ </linearGradient>
+ <clipPath
+ id="XMLID_1755_">
+ <use
+ id="use3874"
+ x="0"
+ y="0"
+ width="744.09448"
+ height="600"
+ xlink:href="#XMLID_343_" />
+ </clipPath>
+ <linearGradient
+ x1="505.62939"
+ y1="-14.9526"
+ x2="527.49402"
+ y2="-0.7536"
+ id="XMLID_1756_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)">
+ <stop
+ style="stop-color:#b4daea;stop-opacity:1"
+ offset="0"
+ id="stop3877" />
+ <stop
+ style="stop-color:#b4daea;stop-opacity:1"
+ offset="0.51120001"
+ id="stop3879" />
+ <stop
+ style="stop-color:#5387ba;stop-opacity:1"
+ offset="0.64609998"
+ id="stop3881" />
+ <stop
+ style="stop-color:#16336e;stop-opacity:1"
+ offset="1"
+ id="stop3883" />
+ <a:midPointStop
+ style="stop-color:#B4DAEA"
+ offset="0" />
+ <a:midPointStop
+ style="stop-color:#B4DAEA"
+ offset="0.5" />
+ <a:midPointStop
+ style="stop-color:#B4DAEA"
+ offset="0.5112" />
+ <a:midPointStop
+ style="stop-color:#B4DAEA"
+ offset="0.5" />
+ <a:midPointStop
+ style="stop-color:#5387BA"
+ offset="0.6461" />
+ <a:midPointStop
+ style="stop-color:#5387BA"
+ offset="0.5" />
+ <a:midPointStop
+ style="stop-color:#16336E"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="471.0806"
+ y1="201.07761"
+ x2="481.91711"
+ y2="210.4977"
+ id="XMLID_1754_"
+ gradientUnits="userSpaceOnUse">
+ <stop
+ style="stop-color:#6498c1;stop-opacity:1"
+ offset="0.005618"
+ id="stop3863" />
+ <stop
+ style="stop-color:#79a9cc;stop-opacity:1"
+ offset="0.2332"
+ id="stop3865" />
+ <stop
+ style="stop-color:#a4cde2;stop-opacity:1"
+ offset="0.74049997"
+ id="stop3867" />
+ <stop
+ style="stop-color:#b4daea;stop-opacity:1"
+ offset="1"
+ id="stop3869" />
+ <a:midPointStop
+ style="stop-color:#6498C1"
+ offset="5.618000e-003" />
+ <a:midPointStop
+ style="stop-color:#6498C1"
+ offset="0.4438" />
+ <a:midPointStop
+ style="stop-color:#B4DAEA"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="516.57672"
+ y1="-15.769"
+ x2="516.57672"
+ y2="0.84280002"
+ id="XMLID_1753_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)">
+ <stop
+ style="stop-color:#b2b2b2;stop-opacity:1"
+ offset="0"
+ id="stop3851" />
+ <stop
+ style="stop-color:#f2f2f2;stop-opacity:1"
+ offset="1"
+ id="stop3853" />
+ <a:midPointStop
+ style="stop-color:#B2B2B2"
+ offset="0" />
+ <a:midPointStop
+ style="stop-color:#B2B2B2"
+ offset="0.5" />
+ <a:midPointStop
+ style="stop-color:#F2F2F2"
+ offset="1" />
+ </linearGradient>
+ <clipPath
+ id="XMLID_1751_">
+ <use
+ id="use3837"
+ x="0"
+ y="0"
+ width="744.09448"
+ height="600"
+ xlink:href="#XMLID_338_" />
+ </clipPath>
+ <linearGradient
+ x1="506.09909"
+ y1="-11.5137"
+ x2="527.99609"
+ y2="2.7063999"
+ id="XMLID_1752_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)">
+ <stop
+ style="stop-color:#b4daea;stop-opacity:1"
+ offset="0"
+ id="stop3840" />
+ <stop
+ style="stop-color:#b4daea;stop-opacity:1"
+ offset="0.51120001"
+ id="stop3842" />
+ <stop
+ style="stop-color:#5387ba;stop-opacity:1"
+ offset="0.64609998"
+ id="stop3844" />
+ <stop
+ style="stop-color:#16336e;stop-opacity:1"
+ offset="1"
+ id="stop3846" />
+ <a:midPointStop
+ style="stop-color:#B4DAEA"
+ offset="0" />
+ <a:midPointStop
+ style="stop-color:#B4DAEA"
+ offset="0.5" />
+ <a:midPointStop
+ style="stop-color:#B4DAEA"
+ offset="0.5112" />
+ <a:midPointStop
+ style="stop-color:#B4DAEA"
+ offset="0.5" />
+ <a:midPointStop
+ style="stop-color:#5387BA"
+ offset="0.6461" />
+ <a:midPointStop
+ style="stop-color:#5387BA"
+ offset="0.5" />
+ <a:midPointStop
+ style="stop-color:#16336E"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="468.2915"
+ y1="204.7612"
+ x2="479.39871"
+ y2="214.4166"
+ id="XMLID_1750_"
+ gradientUnits="userSpaceOnUse">
+ <stop
+ style="stop-color:#5387ba;stop-opacity:1"
+ offset="0"
+ id="stop3830" />
+ <stop
+ style="stop-color:#96bad6;stop-opacity:1"
+ offset="1"
+ id="stop3832" />
+ <a:midPointStop
+ style="stop-color:#5387BA"
+ offset="0" />
+ <a:midPointStop
+ style="stop-color:#5387BA"
+ offset="0.5" />
+ <a:midPointStop
+ style="stop-color:#96BAD6"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="502.70749"
+ y1="115.3013"
+ x2="516.39001"
+ y2="127.1953"
+ id="XMLID_1749_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.9703,0.2419,-0.2419,0.9703,11.0227,-35.6159)">
+ <stop
+ style="stop-color:#5387ba;stop-opacity:1"
+ offset="0"
+ id="stop3818" />
+ <stop
+ style="stop-color:#96bad6;stop-opacity:1"
+ offset="1"
+ id="stop3820" />
+ <a:midPointStop
+ style="stop-color:#5387BA"
+ offset="0" />
+ <a:midPointStop
+ style="stop-color:#5387BA"
+ offset="0.5" />
+ <a:midPointStop
+ style="stop-color:#96BAD6"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="501.0903"
+ y1="-19.2544"
+ x2="531.85413"
+ y2="0.72390002"
+ id="XMLID_1748_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)">
+ <stop
+ style="stop-color:#b4daea;stop-opacity:1"
+ offset="0"
+ id="stop3803" />
+ <stop
+ style="stop-color:#b4daea;stop-opacity:1"
+ offset="0.51120001"
+ id="stop3805" />
+ <stop
+ style="stop-color:#5387ba;stop-opacity:1"
+ offset="0.64609998"
+ id="stop3807" />
+ <stop
+ style="stop-color:#16336e;stop-opacity:1"
+ offset="1"
+ id="stop3809" />
+ <a:midPointStop
+ style="stop-color:#B4DAEA"
+ offset="0" />
+ <a:midPointStop
+ style="stop-color:#B4DAEA"
+ offset="0.5" />
+ <a:midPointStop
+ style="stop-color:#B4DAEA"
+ offset="0.5112" />
+ <a:midPointStop
+ style="stop-color:#B4DAEA"
+ offset="0.5" />
+ <a:midPointStop
+ style="stop-color:#5387BA"
+ offset="0.6461" />
+ <a:midPointStop
+ style="stop-color:#5387BA"
+ offset="0.5" />
+ <a:midPointStop
+ style="stop-color:#16336E"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="481.23969"
+ y1="212.5742"
+ x2="472.92981"
+ y2="207.4967"
+ id="XMLID_2275_"
+ gradientUnits="userSpaceOnUse">
+ <stop
+ style="stop-color:#f3403f;stop-opacity:1"
+ offset="0"
+ id="stop9947" />
+ <stop
+ style="stop-color:#d02a28;stop-opacity:1"
+ offset="0.37889999"
+ id="stop9949" />
+ <stop
+ style="stop-color:#b21714;stop-opacity:1"
+ offset="0.77649999"
+ id="stop9951" />
+ <stop
+ style="stop-color:#a6100c;stop-opacity:1"
+ offset="1"
+ id="stop9953" />
+ <a:midPointStop
+ style="stop-color:#F3403F"
+ offset="0" />
+ <a:midPointStop
+ style="stop-color:#F3403F"
+ offset="0.4213" />
+ <a:midPointStop
+ style="stop-color:#A6100C"
+ offset="1" />
+ </linearGradient>
+ <clipPath
+ id="XMLID_2273_">
+ <use
+ id="use9933"
+ x="0"
+ y="0"
+ width="744.09448"
+ height="600"
+ xlink:href="#XMLID_960_" />
+ </clipPath>
+ <linearGradient
+ x1="473.7681"
+ y1="209.17529"
+ x2="486.98099"
+ y2="213.2001"
+ id="XMLID_2274_"
+ gradientUnits="userSpaceOnUse">
+ <stop
+ style="stop-color:#f3403f;stop-opacity:1"
+ offset="0"
+ id="stop9936" />
+ <stop
+ style="stop-color:#d02a28;stop-opacity:1"
+ offset="0.37889999"
+ id="stop9938" />
+ <stop
+ style="stop-color:#b21714;stop-opacity:1"
+ offset="0.77649999"
+ id="stop9940" />
+ <stop
+ style="stop-color:#a6100c;stop-opacity:1"
+ offset="1"
+ id="stop9942" />
+ <a:midPointStop
+ style="stop-color:#F3403F"
+ offset="0" />
+ <a:midPointStop
+ style="stop-color:#F3403F"
+ offset="0.4213" />
+ <a:midPointStop
+ style="stop-color:#A6100C"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="478.21341"
+ y1="-131.9297"
+ x2="469.85818"
+ y2="-140.28481"
+ id="XMLID_2272_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.5592,0.829,-0.829,0.5592,101.3357,-104.791)">
+ <stop
+ style="stop-color:#f3403f;stop-opacity:1"
+ offset="0"
+ id="stop9917" />
+ <stop
+ style="stop-color:#d02a28;stop-opacity:1"
+ offset="0.37889999"
+ id="stop9919" />
+ <stop
+ style="stop-color:#b21714;stop-opacity:1"
+ offset="0.77649999"
+ id="stop9921" />
+ <stop
+ style="stop-color:#a6100c;stop-opacity:1"
+ offset="1"
+ id="stop9923" />
+ <a:midPointStop
+ style="stop-color:#F3403F"
+ offset="0" />
+ <a:midPointStop
+ style="stop-color:#F3403F"
+ offset="0.4213" />
+ <a:midPointStop
+ style="stop-color:#A6100C"
+ offset="1" />
+ </linearGradient>
+ <marker
+ refX="0"
+ refY="0"
+ orient="auto"
+ style="overflow:visible"
+ id="TriangleInM">
+ <path
+ d="M 5.77,0 L -2.88,5 L -2.88,-5 L 5.77,0 z "
+ transform="scale(-0.4,-0.4)"
+ style="fill:#5c5c4f"
+ id="path3197" />
+ </marker>
+ <linearGradient
+ x1="200.7363"
+ y1="100.4028"
+ x2="211.99519"
+ y2="89.143997"
+ id="XMLID_3298_"
+ gradientUnits="userSpaceOnUse">
+ <stop
+ style="stop-color:#bfbfbf;stop-opacity:1"
+ offset="0"
+ id="stop20103" />
+ <stop
+ style="stop-color:#f2f2f2;stop-opacity:1"
+ offset="1"
+ id="stop20105" />
+ <a:midPointStop
+ offset="0"
+ style="stop-color:#BFBFBF" />
+ <a:midPointStop
+ offset="0.5"
+ style="stop-color:#BFBFBF" />
+ <a:midPointStop
+ offset="1"
+ style="stop-color:#F2F2F2" />
+ </linearGradient>
+ <linearGradient
+ x1="200.7363"
+ y1="100.4028"
+ x2="211.99519"
+ y2="89.143997"
+ id="linearGradient36592"
+ xlink:href="#XMLID_3298_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.029078,0,0,1,-183.2624,-79.44655)" />
+ <linearGradient
+ x1="181.2925"
+ y1="110.8481"
+ x2="192.6369"
+ y2="99.5037"
+ id="XMLID_3297_"
+ gradientUnits="userSpaceOnUse">
+ <stop
+ style="stop-color:#e5e5e5;stop-opacity:1"
+ offset="0"
+ id="stop20096" />
+ <stop
+ style="stop-color:#ccc;stop-opacity:1"
+ offset="1"
+ id="stop20098" />
+ <a:midPointStop
+ offset="0"
+ style="stop-color:#E5E5E5" />
+ <a:midPointStop
+ offset="0.5"
+ style="stop-color:#E5E5E5" />
+ <a:midPointStop
+ offset="1"
+ style="stop-color:#CCCCCC" />
+ </linearGradient>
+ <linearGradient
+ x1="181.2925"
+ y1="110.8481"
+ x2="192.6369"
+ y2="99.5037"
+ id="linearGradient36595"
+ xlink:href="#XMLID_3297_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.029078,0,0,1,-183.2624,-79.44655)" />
+ <linearGradient
+ x1="211.77589"
+ y1="105.7749"
+ x2="212.6619"
+ y2="108.2092"
+ id="XMLID_3296_"
+ gradientUnits="userSpaceOnUse">
+ <stop
+ style="stop-color:#0f6124;stop-opacity:1"
+ offset="0"
+ id="stop20087" />
+ <stop
+ style="stop-color:#219630;stop-opacity:1"
+ offset="1"
+ id="stop20089" />
+ <a:midPointStop
+ offset="0"
+ style="stop-color:#0F6124" />
+ <a:midPointStop
+ offset="0.5"
+ style="stop-color:#0F6124" />
+ <a:midPointStop
+ offset="1"
+ style="stop-color:#219630" />
+ </linearGradient>
+ <linearGradient
+ x1="211.77589"
+ y1="105.7749"
+ x2="212.6619"
+ y2="108.2092"
+ id="linearGradient36677"
+ xlink:href="#XMLID_3296_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.029078,0,0,1,-183.2624,-79.44655)" />
+ <linearGradient
+ x1="208.9834"
+ y1="116.8296"
+ x2="200.0811"
+ y2="96.834602"
+ id="XMLID_3295_"
+ gradientUnits="userSpaceOnUse">
+ <stop
+ style="stop-color:#b2b2b2;stop-opacity:1"
+ offset="0"
+ id="stop20076" />
+ <stop
+ style="stop-color:#e5e5e5;stop-opacity:1"
+ offset="0.5"
+ id="stop20078" />
+ <stop
+ style="stop-color:white;stop-opacity:1"
+ offset="1"
+ id="stop20080" />
+ <a:midPointStop
+ offset="0"
+ style="stop-color:#B2B2B2" />
+ <a:midPointStop
+ offset="0.5"
+ style="stop-color:#B2B2B2" />
+ <a:midPointStop
+ offset="0.5"
+ style="stop-color:#E5E5E5" />
+ <a:midPointStop
+ offset="0.5"
+ style="stop-color:#E5E5E5" />
+ <a:midPointStop
+ offset="1"
+ style="stop-color:#FFFFFF" />
+ </linearGradient>
+ <linearGradient
+ x1="208.9834"
+ y1="116.8296"
+ x2="200.0811"
+ y2="96.834602"
+ id="linearGradient36604"
+ xlink:href="#XMLID_3295_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.029078,0,0,1,-183.2624,-79.44655)" />
+ <linearGradient
+ x1="195.5264"
+ y1="97.911102"
+ x2="213.5213"
+ y2="115.9061"
+ id="XMLID_3294_"
+ gradientUnits="userSpaceOnUse">
+ <stop
+ style="stop-color:#ccc;stop-opacity:1"
+ offset="0"
+ id="stop20069" />
+ <stop
+ style="stop-color:white;stop-opacity:1"
+ offset="1"
+ id="stop20071" />
+ <a:midPointStop
+ offset="0"
+ style="stop-color:#CCCCCC" />
+ <a:midPointStop
+ offset="0.5"
+ style="stop-color:#CCCCCC" />
+ <a:midPointStop
+ offset="1"
+ style="stop-color:#FFFFFF" />
+ </linearGradient>
+ <linearGradient
+ x1="195.5264"
+ y1="97.911102"
+ x2="213.5213"
+ y2="115.9061"
+ id="linearGradient36607"
+ xlink:href="#XMLID_3294_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.029078,0,0,1,-183.2624,-79.44655)" />
+ <linearGradient
+ x1="186.1938"
+ y1="109.1343"
+ x2="206.6881"
+ y2="88.639999"
+ id="XMLID_3293_"
+ gradientUnits="userSpaceOnUse">
+ <stop
+ style="stop-color:#b2b2b2;stop-opacity:1"
+ offset="0"
+ id="stop20056" />
+ <stop
+ style="stop-color:#e5e5e5;stop-opacity:1"
+ offset="0.16850001"
+ id="stop20058" />
+ <stop
+ style="stop-color:white;stop-opacity:1"
+ offset="0.23029999"
+ id="stop20060" />
+ <stop
+ style="stop-color:#e5e5e5;stop-opacity:1"
+ offset="0.2809"
+ id="stop20062" />
+ <stop
+ style="stop-color:#c2c2c2;stop-opacity:1"
+ offset="0.5"
+ id="stop20064" />
+ <a:midPointStop
+ offset="0"
+ style="stop-color:#B2B2B2" />
+ <a:midPointStop
+ offset="0.5"
+ style="stop-color:#B2B2B2" />
+ <a:midPointStop
+ offset="0.1685"
+ style="stop-color:#E5E5E5" />
+ <a:midPointStop
+ offset="0.5"
+ style="stop-color:#E5E5E5" />
+ <a:midPointStop
+ offset="0.2303"
+ style="stop-color:#FFFFFF" />
+ <a:midPointStop
+ offset="0.5"
+ style="stop-color:#FFFFFF" />
+ <a:midPointStop
+ offset="0.2809"
+ style="stop-color:#E5E5E5" />
+ <a:midPointStop
+ offset="0.5"
+ style="stop-color:#E5E5E5" />
+ <a:midPointStop
+ offset="0.5"
+ style="stop-color:#C2C2C2" />
+ </linearGradient>
+ <linearGradient
+ x1="186.1938"
+ y1="109.1343"
+ x2="206.6881"
+ y2="88.639999"
+ id="linearGradient36610"
+ xlink:href="#XMLID_3293_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.029078,0,0,1,-183.2624,-79.44655)" />
+ <linearGradient
+ x1="184.8569"
+ y1="112.2676"
+ x2="211.94099"
+ y2="89.541397"
+ id="XMLID_3292_"
+ gradientUnits="userSpaceOnUse">
+ <stop
+ style="stop-color:#b2b2b2;stop-opacity:1"
+ offset="0"
+ id="stop20043" />
+ <stop
+ style="stop-color:#e5e5e5;stop-opacity:1"
+ offset="0.16850001"
+ id="stop20045" />
+ <stop
+ style="stop-color:white;stop-opacity:1"
+ offset="0.23029999"
+ id="stop20047" />
+ <stop
+ style="stop-color:#e5e5e5;stop-opacity:1"
+ offset="0.2809"
+ id="stop20049" />
+ <stop
+ style="stop-color:#ccc;stop-opacity:1"
+ offset="1"
+ id="stop20051" />
+ <a:midPointStop
+ offset="0"
+ style="stop-color:#B2B2B2" />
+ <a:midPointStop
+ offset="0.5"
+ style="stop-color:#B2B2B2" />
+ <a:midPointStop
+ offset="0.1685"
+ style="stop-color:#E5E5E5" />
+ <a:midPointStop
+ offset="0.5"
+ style="stop-color:#E5E5E5" />
+ <a:midPointStop
+ offset="0.2303"
+ style="stop-color:#FFFFFF" />
+ <a:midPointStop
+ offset="0.5"
+ style="stop-color:#FFFFFF" />
+ <a:midPointStop
+ offset="0.2809"
+ style="stop-color:#E5E5E5" />
+ <a:midPointStop
+ offset="0.5"
+ style="stop-color:#E5E5E5" />
+ <a:midPointStop
+ offset="1"
+ style="stop-color:#CCCCCC" />
+ </linearGradient>
+ <linearGradient
+ x1="184.8569"
+ y1="112.2676"
+ x2="211.94099"
+ y2="89.541397"
+ id="linearGradient36613"
+ xlink:href="#XMLID_3292_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.029078,0,0,1,-183.2624,-79.44655)" />
+ <marker
+ refX="0"
+ refY="0"
+ orient="auto"
+ style="overflow:visible"
+ id="TriangleOutM">
+ <path
+ d="M 5.77,0 L -2.88,5 L -2.88,-5 L 5.77,0 z "
+ transform="scale(0.4,0.4)"
+ style="fill:#5c5c4f;fill-rule:evenodd;stroke-width:1pt;marker-start:none"
+ id="path3238" />
+ </marker>
+ <linearGradient
+ x1="165.3"
+ y1="99.5"
+ x2="165.3"
+ y2="115.9"
+ id="XMLID_3457_"
+ gradientUnits="userSpaceOnUse">
+ <stop
+ style="stop-color:#999;stop-opacity:1"
+ offset="0"
+ id="stop8309" />
+ <stop
+ style="stop-color:#b2b2b2;stop-opacity:1"
+ offset="0.30000001"
+ id="stop8311" />
+ <stop
+ style="stop-color:#b2b2b2;stop-opacity:1"
+ offset="1"
+ id="stop8313" />
+ <a:midPointstop
+ offset="0"
+ style="stop-color:#999999" />
+ <a:midPointstop
+ offset="0.5"
+ style="stop-color:#999999" />
+ <a:midPointstop
+ offset="0.3"
+ style="stop-color:#B2B2B2" />
+ <a:midPointstop
+ offset="0.5"
+ style="stop-color:#B2B2B2" />
+ <a:midPointstop
+ offset="1"
+ style="stop-color:#B2B2B2" />
+ </linearGradient>
+ <linearGradient
+ x1="165.3"
+ y1="99.5"
+ x2="165.3"
+ y2="115.9"
+ id="lg1997"
+ xlink:href="#XMLID_3457_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.2,0,0,1.2,-175.9,-114.6)" />
+ <linearGradient
+ x1="175"
+ y1="99.800003"
+ x2="175"
+ y2="112.5"
+ id="XMLID_3456_"
+ gradientUnits="userSpaceOnUse">
+ <stop
+ style="stop-color:#737373;stop-opacity:1"
+ offset="0"
+ id="stop8300" />
+ <stop
+ style="stop-color:#191919;stop-opacity:1"
+ offset="0.60000002"
+ id="stop8302" />
+ <stop
+ style="stop-color:#191919;stop-opacity:1"
+ offset="1"
+ id="stop8304" />
+ <a:midPointstop
+ offset="0"
+ style="stop-color:#737373" />
+ <a:midPointstop
+ offset="0.5"
+ style="stop-color:#737373" />
+ <a:midPointstop
+ offset="0.6"
+ style="stop-color:#191919" />
+ <a:midPointstop
+ offset="0.5"
+ style="stop-color:#191919" />
+ <a:midPointstop
+ offset="1"
+ style="stop-color:#191919" />
+ </linearGradient>
+ <linearGradient
+ x1="175"
+ y1="99.800003"
+ x2="175"
+ y2="112.5"
+ id="lg2000"
+ xlink:href="#XMLID_3456_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.2,0,0,1.2,-175.9,-114.6)" />
+ <linearGradient
+ x1="168.8"
+ y1="107.1"
+ x2="164.5"
+ y2="110"
+ id="XMLID_3455_"
+ gradientUnits="userSpaceOnUse">
+ <stop
+ style="stop-color:#666;stop-opacity:1"
+ offset="0"
+ id="stop8291" />
+ <stop
+ style="stop-color:#191919;stop-opacity:1"
+ offset="0.69999999"
+ id="stop8293" />
+ <stop
+ style="stop-color:#191919;stop-opacity:1"
+ offset="1"
+ id="stop8295" />
+ <a:midPointstop
+ offset="0"
+ style="stop-color:#666666" />
+ <a:midPointstop
+ offset="0.5"
+ style="stop-color:#666666" />
+ <a:midPointstop
+ offset="0.7"
+ style="stop-color:#191919" />
+ <a:midPointstop
+ offset="0.5"
+ style="stop-color:#191919" />
+ <a:midPointstop
+ offset="1"
+ style="stop-color:#191919" />
+ </linearGradient>
+ <linearGradient
+ x1="168.8"
+ y1="107.1"
+ x2="164.5"
+ y2="110"
+ id="lg2003"
+ xlink:href="#XMLID_3455_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.2,0,0,1.2,-175.9,-114.6)" />
+ <linearGradient
+ id="lg63694">
+ <stop
+ style="stop-color:white;stop-opacity:1"
+ offset="0"
+ id="stop63696" />
+ <stop
+ style="stop-color:white;stop-opacity:0"
+ offset="1"
+ id="stop63698" />
+ </linearGradient>
+ <linearGradient
+ x1="458"
+ y1="483"
+ x2="465.20001"
+ y2="271.39999"
+ id="lg2006"
+ xlink:href="#lg63694"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(6.3e-2,0,0,6.3e-2,-1.3,-9.8)" />
+ <linearGradient
+ x1="176.3"
+ y1="110.1"
+ x2="158.7"
+ y2="105"
+ id="XMLID_3453_"
+ gradientUnits="userSpaceOnUse">
+ <stop
+ style="stop-color:#666;stop-opacity:1"
+ offset="0"
+ id="stop8271" />
+ <stop
+ style="stop-color:#737373;stop-opacity:1"
+ offset="0.2"
+ id="stop8273" />
+ <stop
+ style="stop-color:white;stop-opacity:1"
+ offset="1"
+ id="stop8275" />
+ <a:midPointstop
+ offset="0"
+ style="stop-color:#666666" />
+ <a:midPointstop
+ offset="0.5"
+ style="stop-color:#666666" />
+ <a:midPointstop
+ offset="0.2"
+ style="stop-color:#737373" />
+ <a:midPointstop
+ offset="0.5"
+ style="stop-color:#737373" />
+ <a:midPointstop
+ offset="1"
+ style="stop-color:#FFFFFF" />
+ </linearGradient>
+ <linearGradient
+ x1="176.3"
+ y1="110.1"
+ x2="158.7"
+ y2="105"
+ id="lg2009"
+ xlink:href="#XMLID_3453_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.2,0,0,1.2,-175.9,-114.6)" />
+ <linearGradient
+ x1="173.60001"
+ y1="118.9"
+ x2="172.8"
+ y2="128.2"
+ id="XMLID_3449_"
+ gradientUnits="userSpaceOnUse">
+ <stop
+ style="stop-color:#ecb300;stop-opacity:1"
+ offset="0"
+ id="stop8232" />
+ <stop
+ style="stop-color:#fff95e;stop-opacity:1"
+ offset="0.60000002"
+ id="stop8234" />
+ <stop
+ style="stop-color:#ecd600;stop-opacity:1"
+ offset="1"
+ id="stop8236" />
+ <a:midPointstop
+ offset="0"
+ style="stop-color:#ECB300" />
+ <a:midPointstop
+ offset="0.5"
+ style="stop-color:#ECB300" />
+ <a:midPointstop
+ offset="0.6"
+ style="stop-color:#FFF95E" />
+ <a:midPointstop
+ offset="0.5"
+ style="stop-color:#FFF95E" />
+ <a:midPointstop
+ offset="1"
+ style="stop-color:#ECD600" />
+ </linearGradient>
+ <linearGradient
+ x1="173.60001"
+ y1="118.9"
+ x2="172.8"
+ y2="128.2"
+ id="lg2016"
+ xlink:href="#XMLID_3449_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.2,0,0,1.2,-175.9,-114.6)" />
+ <radialGradient
+ cx="284.60001"
+ cy="172.60001"
+ r="6.5"
+ fx="284.60001"
+ fy="172.60001"
+ id="XMLID_3448_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.4,0,0,1.4,-237.3,-126.8)">
+ <stop
+ style="stop-color:#ecb300;stop-opacity:1"
+ offset="0"
+ id="stop8219" />
+ <stop
+ style="stop-color:#ecb300;stop-opacity:1"
+ offset="0.30000001"
+ id="stop8221" />
+ <stop
+ style="stop-color:#c96b00;stop-opacity:1"
+ offset="0.89999998"
+ id="stop8223" />
+ <stop
+ style="stop-color:#9a5500;stop-opacity:1"
+ offset="1"
+ id="stop8225" />
+ <a:midPointstop
+ offset="0"
+ style="stop-color:#ECB300" />
+ <a:midPointstop
+ offset="0.5"
+ style="stop-color:#ECB300" />
+ <a:midPointstop
+ offset="0.3"
+ style="stop-color:#ECB300" />
+ <a:midPointstop
+ offset="0.5"
+ style="stop-color:#ECB300" />
+ <a:midPointstop
+ offset="0.9"
+ style="stop-color:#C96B00" />
+ <a:midPointstop
+ offset="0.5"
+ style="stop-color:#C96B00" />
+ <a:midPointstop
+ offset="1"
+ style="stop-color:#9A5500" />
+ </radialGradient>
+ <radialGradient
+ cx="284.60001"
+ cy="172.60001"
+ r="6.5"
+ fx="284.60001"
+ fy="172.60001"
+ id="rg2020"
+ xlink:href="#XMLID_3448_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(2.513992,0,0,2.347576,-689.1621,-378.5717)" />
+ <linearGradient
+ x1="158.10001"
+ y1="123"
+ x2="164.2"
+ y2="126.6"
+ id="XMLID_3447_"
+ gradientUnits="userSpaceOnUse">
+ <stop
+ style="stop-color:#ecd600;stop-opacity:1"
+ offset="0"
+ id="stop8204" />
+ <stop
+ style="stop-color:#ffffb3;stop-opacity:1"
+ offset="0.30000001"
+ id="stop8206" />
+ <stop
+ style="stop-color:white;stop-opacity:1"
+ offset="1"
+ id="stop8208" />
+ <a:midPointstop
+ offset="0"
+ style="stop-color:#ECD600" />
+ <a:midPointstop
+ offset="0.5"
+ style="stop-color:#ECD600" />
+ <a:midPointstop
+ offset="0.3"
+ style="stop-color:#FFFFB3" />
+ <a:midPointstop
+ offset="0.5"
+ style="stop-color:#FFFFB3" />
+ <a:midPointstop
+ offset="1"
+ style="stop-color:#FFFFFF" />
+ </linearGradient>
+ <linearGradient
+ x1="158.10001"
+ y1="123"
+ x2="164.2"
+ y2="126.6"
+ id="lg2026"
+ xlink:href="#XMLID_3447_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.2,0,0,1.2,-175.9,-114.6)" />
+ <radialGradient
+ cx="280.89999"
+ cy="163.7"
+ r="10.1"
+ fx="280.89999"
+ fy="163.7"
+ id="XMLID_3446_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.4,0,0,1.4,-237.3,-126.8)">
+ <stop
+ style="stop-color:white;stop-opacity:1"
+ offset="0"
+ id="stop8197" />
+ <stop
+ style="stop-color:#fff95e;stop-opacity:1"
+ offset="1"
+ id="stop8199" />
+ <a:midPointstop
+ offset="0"
+ style="stop-color:#FFFFFF" />
+ <a:midPointstop
+ offset="0.5"
+ style="stop-color:#FFFFFF" />
+ <a:midPointstop
+ offset="1"
+ style="stop-color:#FFF95E" />
+ </radialGradient>
+ <radialGradient
+ cx="280.89999"
+ cy="163.7"
+ r="10.1"
+ fx="280.89999"
+ fy="163.7"
+ id="rg2029"
+ xlink:href="#XMLID_3446_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.7,0,0,1.7,-457.5,-266.8)" />
+ <linearGradient
+ x1="156.5"
+ y1="122.7"
+ x2="180.10001"
+ y2="122.7"
+ id="XMLID_3445_"
+ gradientUnits="userSpaceOnUse">
+ <stop
+ style="stop-color:#ecb300;stop-opacity:1"
+ offset="0"
+ id="stop8184" />
+ <stop
+ style="stop-color:#ffe900;stop-opacity:1"
+ offset="0.2"
+ id="stop8186" />
+ <stop
+ style="stop-color:#ffffb3;stop-opacity:1"
+ offset="0.30000001"
+ id="stop8188" />
+ <stop
+ style="stop-color:#ffe900;stop-opacity:1"
+ offset="0.40000001"
+ id="stop8190" />
+ <stop
+ style="stop-color:#d68100;stop-opacity:1"
+ offset="1"
+ id="stop8192" />
+ <a:midPointstop
+ offset="0"
+ style="stop-color:#ECB300" />
+ <a:midPointstop
+ offset="0.5"
+ style="stop-color:#ECB300" />
+ <a:midPointstop
+ offset="0.2"
+ style="stop-color:#FFE900" />
+ <a:midPointstop
+ offset="0.5"
+ style="stop-color:#FFE900" />
+ <a:midPointstop
+ offset="0.3"
+ style="stop-color:#FFFFB3" />
+ <a:midPointstop
+ offset="0.5"
+ style="stop-color:#FFFFB3" />
+ <a:midPointstop
+ offset="0.4"
+ style="stop-color:#FFE900" />
+ <a:midPointstop
+ offset="0.5"
+ style="stop-color:#FFE900" />
+ <a:midPointstop
+ offset="1"
+ style="stop-color:#D68100" />
+ </linearGradient>
+ <linearGradient
+ x1="156.5"
+ y1="122.7"
+ x2="180.10001"
+ y2="122.7"
+ id="lg2032"
+ xlink:href="#XMLID_3445_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.2,0,0,1.2,-175.9,-114.6)" />
+ <linearGradient
+ x1="156.39999"
+ y1="115.4"
+ x2="180.10001"
+ y2="115.4"
+ id="XMLID_3444_"
+ gradientUnits="userSpaceOnUse">
+ <stop
+ style="stop-color:#ecb300;stop-opacity:1"
+ offset="0"
+ id="stop8171" />
+ <stop
+ style="stop-color:#ffe900;stop-opacity:1"
+ offset="0.2"
+ id="stop8173" />
+ <stop
+ style="stop-color:#ffffb3;stop-opacity:1"
+ offset="0.30000001"
+ id="stop8175" />
+ <stop
+ style="stop-color:#ffe900;stop-opacity:1"
+ offset="0.40000001"
+ id="stop8177" />
+ <stop
+ style="stop-color:#d68100;stop-opacity:1"
+ offset="1"
+ id="stop8179" />
+ <a:midPointstop
+ offset="0"
+ style="stop-color:#ECB300" />
+ <a:midPointstop
+ offset="0.5"
+ style="stop-color:#ECB300" />
+ <a:midPointstop
+ offset="0.2"
+ style="stop-color:#FFE900" />
+ <a:midPointstop
+ offset="0.5"
+ style="stop-color:#FFE900" />
+ <a:midPointstop
+ offset="0.3"
+ style="stop-color:#FFFFB3" />
+ <a:midPointstop
+ offset="0.5"
+ style="stop-color:#FFFFB3" />
+ <a:midPointstop
+ offset="0.4"
+ style="stop-color:#FFE900" />
+ <a:midPointstop
+ offset="0.5"
+ style="stop-color:#FFE900" />
+ <a:midPointstop
+ offset="1"
+ style="stop-color:#D68100" />
+ </linearGradient>
+ <linearGradient
+ x1="156.39999"
+ y1="115.4"
+ x2="180.10001"
+ y2="115.4"
+ id="lg2035"
+ xlink:href="#XMLID_3444_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.2,0,0,1.2,-175.9,-114.6)" />
+ <linearGradient
+ x1="379.70001"
+ y1="167.89999"
+ x2="383.89999"
+ y2="172.89999"
+ id="lg4286_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.8,0.2,-0.2,0.8,78.8,38.1)">
+ <stop
+ style="stop-color:white;stop-opacity:1"
+ offset="0"
+ id="s16159" />
+ <stop
+ style="stop-color:white;stop-opacity:1"
+ offset="0.1"
+ id="s16161" />
+ <stop
+ style="stop-color:#737373;stop-opacity:1"
+ offset="1"
+ id="s16163" />
+ <ns:midPointStop
+ style="stop-color:#FFFFFF"
+ offset="0" />
+ <ns:midPointStop
+ style="stop-color:#FFFFFF"
+ offset="0.5" />
+ <ns:midPointStop
+ style="stop-color:#FFFFFF"
+ offset="0.1" />
+ <ns:midPointStop
+ style="stop-color:#FFFFFF"
+ offset="0.5" />
+ <ns:midPointStop
+ style="stop-color:#737373"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="379.60001"
+ y1="167.8"
+ x2="383.79999"
+ y2="172"
+ id="lg6416"
+ xlink:href="#lg4286_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(2.622156,0.623859,-0.623859,2.62182,-882.9706,-673.7921)" />
+ <linearGradient
+ x1="384.20001"
+ y1="169.8"
+ x2="384.79999"
+ y2="170.39999"
+ id="lg4285_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.8,0.2,-0.2,0.8,78.8,38.1)">
+ <stop
+ style="stop-color:#737373;stop-opacity:1"
+ offset="0"
+ id="s16152" />
+ <stop
+ style="stop-color:#d9d9d9;stop-opacity:1"
+ offset="1"
+ id="s16154" />
+ <ns:midPointStop
+ style="stop-color:#737373"
+ offset="0" />
+ <ns:midPointStop
+ style="stop-color:#737373"
+ offset="0.5" />
+ <ns:midPointStop
+ style="stop-color:#D9D9D9"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="384.20001"
+ y1="169.8"
+ x2="384.79999"
+ y2="170.39999"
+ id="lg6453"
+ xlink:href="#lg4285_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(2.6,0.6,-0.6,2.6,-883,-673.8)" />
+ <linearGradient
+ x1="380.5"
+ y1="172.60001"
+ x2="382.79999"
+ y2="173.7"
+ id="lg4284_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.8,0.2,-0.2,0.8,78.8,38.1)">
+ <stop
+ style="stop-color:gray;stop-opacity:1"
+ offset="0"
+ id="s16145" />
+ <stop
+ style="stop-color:#e5e5e5;stop-opacity:1"
+ offset="1"
+ id="s16147" />
+ <ns:midPointStop
+ style="stop-color:#808080"
+ offset="0" />
+ <ns:midPointStop
+ style="stop-color:#808080"
+ offset="0.5" />
+ <ns:midPointStop
+ style="stop-color:#E5E5E5"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="380.5"
+ y1="172.60001"
+ x2="382.79999"
+ y2="173.7"
+ id="lg6456"
+ xlink:href="#lg4284_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(2.6,0.6,-0.6,2.6,-883,-673.8)" />
+ <radialGradient
+ cx="347.29999"
+ cy="244.5"
+ r="5.1999998"
+ fx="347.29999"
+ fy="244.5"
+ id="lg4282_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(3.4,0,0,3.4,-1148,-802)">
+ <stop
+ style="stop-color:#333;stop-opacity:1"
+ offset="0"
+ id="s16135" />
+ <stop
+ style="stop-color:#999;stop-opacity:1"
+ offset="1"
+ id="s16137" />
+ <ns:midPointStop
+ style="stop-color:#333333"
+ offset="0" />
+ <ns:midPointStop
+ style="stop-color:#333333"
+ offset="0.5" />
+ <ns:midPointStop
+ style="stop-color:#999999"
+ offset="1" />
+ </radialGradient>
+ <linearGradient
+ x1="310.39999"
+ y1="397.70001"
+ x2="310.89999"
+ y2="399.5"
+ id="lg4280_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.7,-0.7,0.7,0.7,-153.4,180.6)">
+ <stop
+ style="stop-color:#ffcd00;stop-opacity:1"
+ offset="0"
+ id="s16111" />
+ <stop
+ style="stop-color:#ffffb3;stop-opacity:1"
+ offset="0.60000002"
+ id="s16113" />
+ <stop
+ style="stop-color:#ffffb3;stop-opacity:1"
+ offset="1"
+ id="s16115" />
+ <ns:midPointStop
+ style="stop-color:#FFCD00"
+ offset="0" />
+ <ns:midPointStop
+ style="stop-color:#FFCD00"
+ offset="0.5" />
+ <ns:midPointStop
+ style="stop-color:#FFFFB3"
+ offset="0.6" />
+ <ns:midPointStop
+ style="stop-color:#FFFFB3"
+ offset="0.5" />
+ <ns:midPointStop
+ style="stop-color:#FFFFB3"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="310.39999"
+ y1="397.70001"
+ x2="310.89999"
+ y2="399.5"
+ id="lg6467"
+ xlink:href="#lg4280_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(2.4,-2.4,2.4,2.4,-1663.6,-195)" />
+ <linearGradient
+ x1="310.89999"
+ y1="395.79999"
+ x2="313.29999"
+ y2="403.10001"
+ id="lg4279_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.7,-0.7,0.7,0.7,-153.4,180.6)">
+ <stop
+ style="stop-color:#ffffb3;stop-opacity:1"
+ offset="0"
+ id="s16100" />
+ <stop
+ style="stop-color:#ffffb3;stop-opacity:1"
+ offset="0.40000001"
+ id="s16102" />
+ <stop
+ style="stop-color:#ffcd00;stop-opacity:1"
+ offset="0.89999998"
+ id="s16104" />
+ <stop
+ style="stop-color:#ffcd00;stop-opacity:1"
+ offset="1"
+ id="s16106" />
+ <ns:midPointStop
+ style="stop-color:#FFFFB3"
+ offset="0" />
+ <ns:midPointStop
+ style="stop-color:#FFFFB3"
+ offset="0.5" />
+ <ns:midPointStop
+ style="stop-color:#FFFFB3"
+ offset="0.4" />
+ <ns:midPointStop
+ style="stop-color:#FFFFB3"
+ offset="0.5" />
+ <ns:midPointStop
+ style="stop-color:#FFCD00"
+ offset="0.9" />
+ <ns:midPointStop
+ style="stop-color:#FFCD00"
+ offset="0.5" />
+ <ns:midPointStop
+ style="stop-color:#FFCD00"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="310.89999"
+ y1="395.79999"
+ x2="313.29999"
+ y2="403.10001"
+ id="lg6465"
+ xlink:href="#lg4279_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(2.4,-2.4,2.4,2.4,-1663.6,-195)" />
+ <linearGradient
+ x1="307.79999"
+ y1="395.20001"
+ x2="313.79999"
+ y2="413.60001"
+ id="lg4278_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.7,-0.7,0.7,0.7,-153.4,180.6)">
+ <stop
+ style="stop-color:#ffffb3;stop-opacity:1"
+ offset="0"
+ id="s16091" />
+ <stop
+ style="stop-color:#fcd72f;stop-opacity:1"
+ offset="0.40000001"
+ id="s16093" />
+ <stop
+ style="stop-color:#ffcd00;stop-opacity:1"
+ offset="1"
+ id="s16095" />
+ <ns:midPointStop
+ style="stop-color:#FFFFB3"
+ offset="0" />
+ <ns:midPointStop
+ style="stop-color:#FFFFB3"
+ offset="0.5" />
+ <ns:midPointStop
+ style="stop-color:#FCD72F"
+ offset="0.4" />
+ <ns:midPointStop
+ style="stop-color:#FCD72F"
+ offset="0.5" />
+ <ns:midPointStop
+ style="stop-color:#FFCD00"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="306.5"
+ y1="393"
+ x2="309"
+ y2="404"
+ id="lg6400"
+ xlink:href="#lg4278_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(2.4,-2.4,2.4,2.4,-1663.6,-195)" />
+ <linearGradient
+ x1="352.10001"
+ y1="253.60001"
+ x2="348.5"
+ y2="237.8"
+ id="lg4276_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(3.4,0,0,3.4,-1148,-802)">
+ <stop
+ style="stop-color:#ffff87;stop-opacity:1"
+ offset="0"
+ id="s16077" />
+ <stop
+ style="stop-color:#ffad00;stop-opacity:1"
+ offset="1"
+ id="s16079" />
+ <ns:midPointStop
+ style="stop-color:#FFFF87"
+ offset="0" />
+ <ns:midPointStop
+ style="stop-color:#FFFF87"
+ offset="0.5" />
+ <ns:midPointStop
+ style="stop-color:#FFAD00"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="335.60001"
+ y1="354.79999"
+ x2="337.89999"
+ y2="354.79999"
+ id="lg4275_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.9,-0.5,0.5,0.9,-121.7,105.1)">
+ <stop
+ style="stop-color:#d9d9d9;stop-opacity:1"
+ offset="0"
+ id="s16057" />
+ <stop
+ style="stop-color:white;stop-opacity:1"
+ offset="0.80000001"
+ id="s16059" />
+ <stop
+ style="stop-color:white;stop-opacity:1"
+ offset="1"
+ id="s16061" />
+ <ns:midPointStop
+ style="stop-color:#D9D9D9"
+ offset="0" />
+ <ns:midPointStop
+ style="stop-color:#D9D9D9"
+ offset="0.5" />
+ <ns:midPointStop
+ style="stop-color:#FFFFFF"
+ offset="0.8" />
+ <ns:midPointStop
+ style="stop-color:#FFFFFF"
+ offset="0.5" />
+ <ns:midPointStop
+ style="stop-color:#FFFFFF"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="335.60001"
+ y1="354.79999"
+ x2="337.89999"
+ y2="354.79999"
+ id="lg6463"
+ xlink:href="#lg4275_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(2.9,-1.7,1.7,2.9,-1557,-448.7)" />
+ <linearGradient
+ x1="337.39999"
+ y1="353.10001"
+ x2="339.39999"
+ y2="357.10001"
+ id="lg4274_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.9,-0.5,0.5,0.9,-121.7,105.1)">
+ <stop
+ style="stop-color:white;stop-opacity:1"
+ offset="0"
+ id="s16048" />
+ <stop
+ style="stop-color:white;stop-opacity:1"
+ offset="0.1"
+ id="s16050" />
+ <stop
+ style="stop-color:#ccc;stop-opacity:1"
+ offset="1"
+ id="s16052" />
+ <ns:midPointStop
+ style="stop-color:#FFFFFF"
+ offset="0" />
+ <ns:midPointStop
+ style="stop-color:#FFFFFF"
+ offset="0.5" />
+ <ns:midPointStop
+ style="stop-color:#FFFFFF"
+ offset="0.1" />
+ <ns:midPointStop
+ style="stop-color:#FFFFFF"
+ offset="0.5" />
+ <ns:midPointStop
+ style="stop-color:#CCCCCC"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="337.39999"
+ y1="353.10001"
+ x2="339.39999"
+ y2="357.10001"
+ id="lg6461"
+ xlink:href="#lg4274_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(2.9,-1.7,1.7,2.9,-1557,-448.7)" />
+ <linearGradient
+ x1="334.39999"
+ y1="355.5"
+ x2="335.5"
+ y2="356.79999"
+ id="lg4273_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.9,-0.5,0.5,0.9,-121.7,105.1)">
+ <stop
+ style="stop-color:white;stop-opacity:1"
+ offset="0"
+ id="s16041" />
+ <stop
+ style="stop-color:#ccc;stop-opacity:1"
+ offset="1"
+ id="s16043" />
+ <ns:midPointStop
+ style="stop-color:#FFFFFF"
+ offset="5.6e-003" />
+ <ns:midPointStop
+ style="stop-color:#FFFFFF"
+ offset="0.5" />
+ <ns:midPointStop
+ style="stop-color:#CCCCCC"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="334.39999"
+ y1="355.5"
+ x2="335.5"
+ y2="356.79999"
+ id="lg6381"
+ xlink:href="#lg4273_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(2.9,-1.7,1.7,2.9,-1557,-448.7)" />
+ <linearGradient
+ x1="348.39999"
+ y1="247.39999"
+ x2="354.10001"
+ y2="242"
+ id="lg4271_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(3.4,0,0,3.4,-1148,-802)">
+ <stop
+ style="stop-color:#f2f2f2;stop-opacity:1"
+ offset="0"
+ id="s16025" />
+ <stop
+ style="stop-color:#9e9e9e;stop-opacity:1"
+ offset="0.40000001"
+ id="s16027" />
+ <stop
+ style="stop-color:black;stop-opacity:1"
+ offset="1"
+ id="s16029" />
+ <ns:midPointStop
+ style="stop-color:#F2F2F2"
+ offset="0" />
+ <ns:midPointStop
+ style="stop-color:#F2F2F2"
+ offset="0.5" />
+ <ns:midPointStop
+ style="stop-color:#000000"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="351.29999"
+ y1="257.29999"
+ x2="346.29999"
+ y2="235.5"
+ id="lg4270_"
+ gradientUnits="userSpaceOnUse">
+ <stop
+ style="stop-color:#ffff87;stop-opacity:1"
+ offset="0"
+ id="s16007" />
+ <stop
+ style="stop-color:#ffad00;stop-opacity:1"
+ offset="1"
+ id="s16009" />
+ <ns:midPointStop
+ style="stop-color:#FFFF87"
+ offset="0" />
+ <ns:midPointStop
+ style="stop-color:#FFFF87"
+ offset="0.5" />
+ <ns:midPointStop
+ style="stop-color:#FFAD00"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="351.29999"
+ y1="257.29999"
+ x2="346.29999"
+ y2="235.5"
+ id="lg6459"
+ xlink:href="#lg4270_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(3.4,0,0,3.4,-1148,-802)" />
+ <linearGradient
+ x1="43.799999"
+ y1="32.5"
+ x2="63.299999"
+ y2="66.400002"
+ id="XMLID_2708_"
+ gradientUnits="userSpaceOnUse">
+ <stop
+ style="stop-color:white;stop-opacity:1"
+ offset="0"
+ id="stop75318" />
+ <stop
+ style="stop-color:#fffcea;stop-opacity:1"
+ offset="1"
+ id="stop75320" />
+ <a:midPointStop
+ style="stop-color:#FFFFFF"
+ offset="0" />
+ <a:midPointStop
+ style="stop-color:#FFFFFF"
+ offset="0.5" />
+ <a:midPointStop
+ style="stop-color:#FFFCEA"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="43.799999"
+ y1="32.5"
+ x2="63.299999"
+ y2="66.400002"
+ id="lg1907"
+ xlink:href="#XMLID_2708_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(-29,-22.6)" />
+ <linearGradient
+ x1="52.5"
+ y1="40.400002"
+ x2="58.200001"
+ y2="64"
+ id="XMLID_2707_"
+ gradientUnits="userSpaceOnUse">
+ <stop
+ style="stop-color:#ffdea0;stop-opacity:1"
+ offset="0"
+ id="stop75305" />
+ <stop
+ style="stop-color:#ffd89e;stop-opacity:1"
+ offset="0.30000001"
+ id="stop75307" />
+ <stop
+ style="stop-color:#ffd79e;stop-opacity:1"
+ offset="0.30000001"
+ id="stop75309" />
+ <stop
+ style="stop-color:#dbaf6d;stop-opacity:1"
+ offset="0.69999999"
+ id="stop75311" />
+ <stop
+ style="stop-color:#6f4c24;stop-opacity:1"
+ offset="1"
+ id="stop75313" />
+ <a:midPointStop
+ style="stop-color:#FFDEA0"
+ offset="0" />
+ <a:midPointStop
+ style="stop-color:#FFDEA0"
+ offset="0.6" />
+ <a:midPointStop
+ style="stop-color:#FFD79E"
+ offset="0.3" />
+ <a:midPointStop
+ style="stop-color:#FFD79E"
+ offset="0.5" />
+ <a:midPointStop
+ style="stop-color:#DBAF6D"
+ offset="0.7" />
+ <a:midPointStop
+ style="stop-color:#DBAF6D"
+ offset="0.5" />
+ <a:midPointStop
+ style="stop-color:#6F4C24"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="52.5"
+ y1="40.400002"
+ x2="58.200001"
+ y2="64"
+ id="lg1910"
+ xlink:href="#XMLID_2707_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(-29,-22.6)" />
+ <linearGradient
+ x1="58"
+ y1="73.199997"
+ x2="44.5"
+ y2="19"
+ id="XMLID_2704_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(-29,-22.6)">
+ <stop
+ style="stop-color:#d4a96c;stop-opacity:1"
+ offset="0.5"
+ id="stop75284" />
+ <stop
+ style="stop-color:#dcb273;stop-opacity:1"
+ offset="0.60000002"
+ id="stop75286" />
+ <stop
+ style="stop-color:#f0ca87;stop-opacity:1"
+ offset="0.80000001"
+ id="stop75288" />
+ <stop
+ style="stop-color:#ffdc96;stop-opacity:1"
+ offset="0.69999999"
+ id="stop75290" />
+ <stop
+ style="stop-color:#c18a42;stop-opacity:1"
+ offset="1"
+ id="stop75292" />
+ <a:midPointStop
+ style="stop-color:#D4A96C"
+ offset="0.5" />
+ <a:midPointStop
+ style="stop-color:#D4A96C"
+ offset="0.6" />
+ <a:midPointStop
+ style="stop-color:#FFDC96"
+ offset="0.7" />
+ <a:midPointStop
+ style="stop-color:#FFDC96"
+ offset="0.5" />
+ <a:midPointStop
+ style="stop-color:#C18A42"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="53.700001"
+ y1="32"
+ x2="53.700001"
+ y2="64.599998"
+ id="XMLID_2703_"
+ gradientUnits="userSpaceOnUse">
+ <stop
+ style="stop-color:#e5c9b0;stop-opacity:1"
+ offset="0"
+ id="stop75268" />
+ <stop
+ style="stop-color:#e5c9b0;stop-opacity:1"
+ offset="0.40000001"
+ id="stop75270" />
+ <stop
+ style="stop-color:#c0aa94;stop-opacity:1"
+ offset="1"
+ id="stop75272" />
+ <a:midPointStop
+ style="stop-color:#E5C9B0"
+ offset="0" />
+ <a:midPointStop
+ style="stop-color:#E5C9B0"
+ offset="0.5" />
+ <a:midPointStop
+ style="stop-color:#E5C9B0"
+ offset="0.4" />
+ <a:midPointStop
+ style="stop-color:#E5C9B0"
+ offset="0.5" />
+ <a:midPointStop
+ style="stop-color:#C0AA94"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="53.700001"
+ y1="32"
+ x2="53.700001"
+ y2="64.599998"
+ id="lg1916"
+ xlink:href="#XMLID_2703_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(-29,-22.6)" />
+ <linearGradient
+ x1="224.31"
+ y1="19.450001"
+ x2="214.33"
+ y2="11.46"
+ id="XMLID_419_"
+ gradientUnits="userSpaceOnUse">
+ <stop
+ style="stop-color:#404040;stop-opacity:1"
+ offset="0"
+ id="s1903" />
+ <stop
+ style="stop-color:#6d6d6d;stop-opacity:1"
+ offset="0.33000001"
+ id="s1905" />
+ <stop
+ style="stop-color:#e9e9e9;stop-opacity:1"
+ offset="1"
+ id="s1907" />
+ <a:midPointStop
+ offset="0"
+ style="stop-color:#404040" />
+ <a:midPointStop
+ offset="0.5"
+ style="stop-color:#404040" />
+ <a:midPointStop
+ offset="0.33"
+ style="stop-color:#6D6D6D" />
+ <a:midPointStop
+ offset="0.5"
+ style="stop-color:#6D6D6D" />
+ <a:midPointStop
+ offset="1"
+ style="stop-color:#E9E9E9" />
+ </linearGradient>
+ <linearGradient
+ x1="221.84"
+ y1="32.779999"
+ x2="212.2"
+ y2="20.27"
+ id="lg1988"
+ xlink:href="#XMLID_419_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.33,0,0,1.31,-274.2,-5.2)" />
+ <linearGradient
+ x1="228.35001"
+ y1="33.279999"
+ x2="215.42999"
+ y2="33.279999"
+ id="lg1900"
+ gradientUnits="userSpaceOnUse">
+ <stop
+ style="stop-color:white;stop-opacity:1"
+ offset="0"
+ id="s1902" />
+ <stop
+ style="stop-color:white;stop-opacity:0"
+ offset="1"
+ id="s1906" />
+ <a:midPointStop
+ style="stop-color:#575757"
+ offset="0" />
+ <a:midPointStop
+ style="stop-color:#575757"
+ offset="0.5" />
+ <a:midPointStop
+ style="stop-color:#6D6D6D"
+ offset="0.33" />
+ <a:midPointStop
+ style="stop-color:#6D6D6D"
+ offset="0.5" />
+ <a:midPointStop
+ style="stop-color:#D3D3D3"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="234.81"
+ y1="33.279999"
+ x2="228.27"
+ y2="33.279999"
+ id="lg1908"
+ xlink:href="#lg1900"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.33,0,0,1.31,-274.2,-5.2)" />
+ <linearGradient
+ x1="228.35001"
+ y1="33.279999"
+ x2="215.42999"
+ y2="33.279999"
+ id="XMLID_416_"
+ gradientUnits="userSpaceOnUse">
+ <stop
+ style="stop-color:#575757;stop-opacity:1"
+ offset="0"
+ id="s1874" />
+ <stop
+ style="stop-color:#6d6d6d;stop-opacity:1"
+ offset="0.33000001"
+ id="s1876" />
+ <stop
+ style="stop-color:#d3d3d3;stop-opacity:1"
+ offset="1"
+ id="s1878" />
+ <a:midPointStop
+ offset="0"
+ style="stop-color:#575757" />
+ <a:midPointStop
+ offset="0.5"
+ style="stop-color:#575757" />
+ <a:midPointStop
+ offset="0.33"
+ style="stop-color:#6D6D6D" />
+ <a:midPointStop
+ offset="0.5"
+ style="stop-color:#6D6D6D" />
+ <a:midPointStop
+ offset="1"
+ style="stop-color:#D3D3D3" />
+ </linearGradient>
+ <linearGradient
+ x1="228.35001"
+ y1="33.279999"
+ x2="215.42999"
+ y2="33.279999"
+ id="lg1991"
+ xlink:href="#XMLID_416_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.33,0,0,1.31,-274.2,-5.2)" />
+ <radialGradient
+ cx="603.19"
+ cy="230.77"
+ r="1.67"
+ fx="603.19"
+ fy="230.77"
+ id="x5010_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.1,0,0,1.1,-54.33,-75.4)">
+ <stop
+ style="stop-color:#c9ffc9;stop-opacity:1"
+ offset="0"
+ id="stop29201" />
+ <stop
+ style="stop-color:#23a11f;stop-opacity:1"
+ offset="1"
+ id="stop29203" />
+ <a:midPointStop
+ offset="0"
+ style="stop-color:#C9FFC9" />
+ <a:midPointStop
+ offset="0.5"
+ style="stop-color:#C9FFC9" />
+ <a:midPointStop
+ offset="1"
+ style="stop-color:#23A11F" />
+ </radialGradient>
+ <radialGradient
+ cx="603.19"
+ cy="230.77"
+ r="1.67"
+ fx="603.19"
+ fy="230.77"
+ id="radialGradient5711"
+ xlink:href="#x5010_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.23,0,0,1.23,-709.93,-245.02)" />
+ <linearGradient
+ x1="592.31"
+ y1="162.60001"
+ x2="609.32001"
+ y2="145.59"
+ id="lg5722"
+ xlink:href="#x5003_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.12,0,0,1.12,-649.08,-160.62)" />
+ <linearGradient
+ x1="601.48999"
+ y1="170.16"
+ x2="613.84003"
+ y2="170.16"
+ id="x5002_"
+ gradientUnits="userSpaceOnUse">
+ <stop
+ style="stop-color:#d9d9d9;stop-opacity:1"
+ offset="0"
+ id="stop29134" />
+ <stop
+ style="stop-color:white;stop-opacity:1"
+ offset="0.2"
+ id="stop29136" />
+ <stop
+ style="stop-color:#999;stop-opacity:1"
+ offset="1"
+ id="stop29138" />
+ <a:midPointStop
+ offset="0"
+ style="stop-color:#D9D9D9" />
+ <a:midPointStop
+ offset="0.5"
+ style="stop-color:#D9D9D9" />
+ <a:midPointStop
+ offset="0.20"
+ style="stop-color:#FFFFFF" />
+ <a:midPointStop
+ offset="0.5"
+ style="stop-color:#FFFFFF" />
+ <a:midPointStop
+ offset="1"
+ style="stop-color:#999999" />
+ </linearGradient>
+ <linearGradient
+ x1="601.48999"
+ y1="170.16"
+ x2="613.84003"
+ y2="170.16"
+ id="lg5725"
+ xlink:href="#x5002_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.12,0,0,1.12,-649.08,-160.62)" />
+ <linearGradient
+ x1="592.20001"
+ y1="156.45"
+ x2="609.98999"
+ y2="174.23"
+ id="x5004_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.12,0,0,1.12,-649.08,-160.62)">
+ <stop
+ style="stop-color:#d9d9d9;stop-opacity:1"
+ offset="0"
+ id="stop29157" />
+ <stop
+ style="stop-color:white;stop-opacity:1"
+ offset="1"
+ id="stop29159" />
+ <a:midPointStop
+ offset="0"
+ style="stop-color:#D9D9D9" />
+ <a:midPointStop
+ offset="0.5"
+ style="stop-color:#D9D9D9" />
+ <a:midPointStop
+ offset="1"
+ style="stop-color:#FFFFFF" />
+ </linearGradient>
+ <linearGradient
+ x1="592.20001"
+ y1="156.45"
+ x2="609.98999"
+ y2="174.23"
+ id="lg5728"
+ xlink:href="#x5004_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.12,0,0,1.12,-649.08,-160.62)" />
+ <linearGradient
+ x1="592.31"
+ y1="162.60001"
+ x2="609.32001"
+ y2="145.59"
+ id="x5003_"
+ gradientUnits="userSpaceOnUse">
+ <stop
+ style="stop-color:#f2f2f2;stop-opacity:1"
+ offset="0"
+ id="stop29143" />
+ <stop
+ style="stop-color:#e5e5e5;stop-opacity:1"
+ offset="1"
+ id="stop29145" />
+ <a:midPointStop
+ offset="0"
+ style="stop-color:#F2F2F2" />
+ <a:midPointStop
+ offset="0.5"
+ style="stop-color:#F2F2F2" />
+ <a:midPointStop
+ offset="1"
+ style="stop-color:#E5E5E5" />
+ </linearGradient>
+ <linearGradient
+ x1="592.31"
+ y1="162.60001"
+ x2="609.32001"
+ y2="145.59"
+ id="lg5732"
+ xlink:href="#x5003_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.12,0,0,1.12,-649.08,-160.62)" />
+ <linearGradient
+ x1="592.20001"
+ y1="156.45"
+ x2="609.98999"
+ y2="174.24001"
+ id="x5000_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.12,0,0,1.12,-649.08,-160.62)">
+ <stop
+ style="stop-color:#d9d9d9;stop-opacity:1"
+ offset="0"
+ id="stop29124" />
+ <stop
+ style="stop-color:white;stop-opacity:1"
+ offset="1"
+ id="stop29126" />
+ <a:midPointStop
+ offset="0"
+ style="stop-color:#D9D9D9" />
+ <a:midPointStop
+ offset="0.5"
+ style="stop-color:#D9D9D9" />
+ <a:midPointStop
+ offset="1"
+ style="stop-color:#FFFFFF" />
+ </linearGradient>
+ <linearGradient
+ x1="592.20001"
+ y1="156.45"
+ x2="609.98999"
+ y2="174.24001"
+ id="lg5735"
+ xlink:href="#x5000_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.12,0,0,1.12,-649.08,-160.62)" />
+ <linearGradient
+ x1="308.54999"
+ y1="149.89999"
+ x2="299.72"
+ y2="148.83"
+ id="XMLID_2433_"
+ gradientUnits="userSpaceOnUse">
+ <stop
+ style="stop-color:#d6d6d6;stop-opacity:1"
+ offset="0"
+ id="71615" />
+ <stop
+ style="stop-color:#a5a5a5;stop-opacity:1"
+ offset="1"
+ id="71617" />
+ <a:midPointStop
+ offset="0"
+ style="stop-color:#D6D6D6" />
+ <a:midPointStop
+ offset="0.5"
+ style="stop-color:#D6D6D6" />
+ <a:midPointStop
+ offset="1"
+ style="stop-color:#A5A5A5" />
+ </linearGradient>
+ <linearGradient
+ x1="308.54999"
+ y1="149.89999"
+ x2="299.72"
+ y2="148.83"
+ id="lg1952"
+ xlink:href="#XMLID_2433_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.03,0,0,1.03,-279.57,-124.36)" />
+ <radialGradient
+ cx="307.39999"
+ cy="121"
+ r="23.35"
+ fx="307.39999"
+ fy="121"
+ id="XMLID_2432_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.98,0,0,0.98,2.88,2.75)">
+ <stop
+ style="stop-color:#d2d2d2;stop-opacity:1"
+ offset="0.19"
+ id="71592" />
+ <stop
+ style="stop-color:#cfcfcf;stop-opacity:1"
+ offset="0.44999999"
+ id="71594" />
+ <stop
+ style="stop-color:#c7c7c7;stop-opacity:1"
+ offset="0.60000002"
+ id="71596" />
+ <stop
+ style="stop-color:#b9b9b9;stop-opacity:1"
+ offset="0.74000001"
+ id="71598" />
+ <stop
+ style="stop-color:#a4a4a4;stop-opacity:1"
+ offset="0.86000001"
+ id="71600" />
+ <stop
+ style="stop-color:#8a8a8a;stop-opacity:1"
+ offset="0.95999998"
+ id="71602" />
+ <stop
+ style="stop-color:gray;stop-opacity:1"
+ offset="1"
+ id="71604" />
+ <a:midPointStop
+ offset="0.19"
+ style="stop-color:#D2D2D2" />
+ <a:midPointStop
+ offset="0.8"
+ style="stop-color:#D2D2D2" />
+ <a:midPointStop
+ offset="1"
+ style="stop-color:#808080" />
+ </radialGradient>
+ <radialGradient
+ cx="307.39999"
+ cy="121"
+ r="23.35"
+ fx="307.39999"
+ fy="121"
+ id="radialGradient2331"
+ xlink:href="#XMLID_2432_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(-276.62,-121.54)" />
+ <linearGradient
+ x1="294.13"
+ y1="127.07"
+ x2="294.13"
+ y2="142.2"
+ id="XMLID_2430_"
+ gradientUnits="userSpaceOnUse">
+ <stop
+ style="stop-color:#b5d8ff;stop-opacity:1"
+ offset="0"
+ id="71582" />
+ <stop
+ style="stop-color:black;stop-opacity:1"
+ offset="1"
+ id="71584" />
+ <a:midPointStop
+ offset="0"
+ style="stop-color:#B5D8FF" />
+ <a:midPointStop
+ offset="0.5"
+ style="stop-color:#B5D8FF" />
+ <a:midPointStop
+ offset="1"
+ style="stop-color:#000000" />
+ </linearGradient>
+ <linearGradient
+ x1="294.13"
+ y1="127.07"
+ x2="294.13"
+ y2="142.2"
+ id="lg2820"
+ xlink:href="#XMLID_2430_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.03,0,0,1.03,-279.57,-124.36)" />
+ <linearGradient
+ x1="279.10999"
+ y1="148.03"
+ x2="309.16"
+ y2="148.03"
+ id="XMLID_2429_"
+ gradientUnits="userSpaceOnUse">
+ <stop
+ style="stop-color:#e1e1e1;stop-opacity:1"
+ offset="0"
+ id="71564" />
+ <stop
+ style="stop-color:#e1e1e1;stop-opacity:1"
+ offset="0.25"
+ id="71566" />
+ <stop
+ style="stop-color:#a5a5a5;stop-opacity:1"
+ offset="0.44"
+ id="71568" />
+ <stop
+ style="stop-color:#a5a5a5;stop-opacity:1"
+ offset="1"
+ id="71570" />
+ <a:midPointStop
+ offset="0"
+ style="stop-color:#E1E1E1" />
+ <a:midPointStop
+ offset="0.5"
+ style="stop-color:#E1E1E1" />
+ <a:midPointStop
+ offset="0.25"
+ style="stop-color:#E1E1E1" />
+ <a:midPointStop
+ offset="0.5"
+ style="stop-color:#E1E1E1" />
+ <a:midPointStop
+ offset="0.44"
+ style="stop-color:#A5A5A5" />
+ <a:midPointStop
+ offset="0.5"
+ style="stop-color:#A5A5A5" />
+ <a:midPointStop
+ offset="1"
+ style="stop-color:#A5A5A5" />
+ </linearGradient>
+ <linearGradient
+ x1="279.10999"
+ y1="148.03"
+ x2="309.16"
+ y2="148.03"
+ id="lg2818"
+ xlink:href="#XMLID_2429_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.03,0,0,1.03,-279.57,-124.36)" />
+ <radialGradient
+ cx="622.34302"
+ cy="14.449"
+ r="26.496"
+ fx="622.34302"
+ fy="14.449"
+ id="lg3499_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.851,0,0,0.849,69.297,51.658)">
+ <stop
+ style="stop-color:#23468e;stop-opacity:1"
+ offset="0"
+ id="stop10972" />
+ <stop
+ style="stop-color:#012859;stop-opacity:1"
+ offset="1"
+ id="stop10974" />
+ <a:midPointStop
+ offset="0"
+ style="stop-color:#23468E" />
+ <a:midPointStop
+ offset="0.5"
+ style="stop-color:#23468E" />
+ <a:midPointStop
+ offset="1"
+ style="stop-color:#012859" />
+ </radialGradient>
+ <radialGradient
+ cx="622.34302"
+ cy="14.449"
+ r="26.496"
+ fx="622.34302"
+ fy="14.449"
+ id="rg5791"
+ xlink:href="#lg3499_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.858,0,0,0.857,-511.7,9.02)" />
+ <linearGradient
+ x1="616.112"
+ y1="76.247002"
+ x2="588.14099"
+ y2="60.742001"
+ id="lg3497_"
+ gradientUnits="userSpaceOnUse">
+ <stop
+ style="stop-color:#01326e;stop-opacity:1"
+ offset="0"
+ id="stop10962" />
+ <stop
+ style="stop-color:#012859;stop-opacity:1"
+ offset="1"
+ id="stop10964" />
+ <a:midPointStop
+ offset="0"
+ style="stop-color:#01326E" />
+ <a:midPointStop
+ offset="0.5"
+ style="stop-color:#01326E" />
+ <a:midPointStop
+ offset="1"
+ style="stop-color:#012859" />
+ </linearGradient>
+ <linearGradient
+ x1="617.698"
+ y1="82.445999"
+ x2="585.95203"
+ y2="54.848999"
+ id="lg3496_"
+ gradientUnits="userSpaceOnUse">
+ <stop
+ style="stop-color:#e5e5e5;stop-opacity:1"
+ offset="0"
+ id="stop10950" />
+ <stop
+ style="stop-color:#ccc;stop-opacity:1"
+ offset="1"
+ id="stop10952" />
+ <a:midPointStop
+ offset="0"
+ style="stop-color:#E5E5E5" />
+ <a:midPointStop
+ offset="0.5"
+ style="stop-color:#E5E5E5" />
+ <a:midPointStop
+ offset="1"
+ style="stop-color:#CCCCCC" />
+ </linearGradient>
+ <linearGradient
+ x1="617.698"
+ y1="82.445999"
+ x2="585.95203"
+ y2="54.848999"
+ id="lg5794"
+ xlink:href="#lg3496_"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ x1="601.39001"
+ y1="55.341"
+ x2="588.29199"
+ y2="71.515999"
+ id="lg3495_"
+ gradientUnits="userSpaceOnUse">
+ <stop
+ style="stop-color:#d9d9d9;stop-opacity:1"
+ offset="0"
+ id="stop10941" />
+ <stop
+ style="stop-color:#f2f2f2;stop-opacity:1"
+ offset="0.52200001"
+ id="stop10943" />
+ <stop
+ style="stop-color:#ccc;stop-opacity:1"
+ offset="1"
+ id="stop10945" />
+ <a:midPointStop
+ offset="0"
+ style="stop-color:#D9D9D9" />
+ <a:midPointStop
+ offset="0.5"
+ style="stop-color:#D9D9D9" />
+ <a:midPointStop
+ offset="0.522"
+ style="stop-color:#F2F2F2" />
+ <a:midPointStop
+ offset="0.5"
+ style="stop-color:#F2F2F2" />
+ <a:midPointStop
+ offset="1"
+ style="stop-color:#CCCCCC" />
+ </linearGradient>
+ <linearGradient
+ x1="601.39001"
+ y1="55.341"
+ x2="588.29199"
+ y2="71.515999"
+ id="lg5771"
+ xlink:href="#lg3495_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.009,0,0,1.009,-581.615,-43.098)" />
+ <linearGradient
+ x1="611.34601"
+ y1="55.279999"
+ x2="590.39001"
+ y2="81.157997"
+ id="lg3494_"
+ gradientUnits="userSpaceOnUse">
+ <stop
+ style="stop-color:#d9d9d9;stop-opacity:1"
+ offset="0"
+ id="stop10932" />
+ <stop
+ style="stop-color:#f2f2f2;stop-opacity:1"
+ offset="0.52200001"
+ id="stop10934" />
+ <stop
+ style="stop-color:#ccc;stop-opacity:1"
+ offset="1"
+ id="stop10936" />
+ <a:midPointStop
+ offset="0"
+ style="stop-color:#D9D9D9" />
+ <a:midPointStop
+ offset="0.5"
+ style="stop-color:#D9D9D9" />
+ <a:midPointStop
+ offset="0.522"
+ style="stop-color:#F2F2F2" />
+ <a:midPointStop
+ offset="0.5"
+ style="stop-color:#F2F2F2" />
+ <a:midPointStop
+ offset="1"
+ style="stop-color:#CCCCCC" />
+ </linearGradient>
+ <linearGradient
+ x1="611.34601"
+ y1="55.279999"
+ x2="590.39001"
+ y2="81.157997"
+ id="lg5774"
+ xlink:href="#lg3494_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.009,0,0,1.009,-581.616,-43.098)" />
+ <linearGradient
+ x1="798.72998"
+ y1="69.839996"
+ x2="799.04999"
+ y2="70.709999"
+ id="g3302_"
+ gradientUnits="userSpaceOnUse">
+ <stop
+ style="stop-color:#005e00;stop-opacity:1"
+ offset="0"
+ id="s6504" />
+ <stop
+ style="stop-color:#23a11f;stop-opacity:1"
+ offset="1"
+ id="s6506" />
+ <a:midPointstop
+ style="stop-color:#005E00"
+ offset="0" />
+ <a:midPointstop
+ style="stop-color:#005E00"
+ offset="0.5" />
+ <a:midPointstop
+ style="stop-color:#23A11F"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="798.72998"
+ y1="69.839996"
+ x2="799.04999"
+ y2="70.709999"
+ id="lg5851"
+ xlink:href="#g3302_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.204,0,0,1.263,-926.036,-60.001)" />
+ <linearGradient
+ x1="779.19"
+ y1="122.73"
+ x2="811.69"
+ y2="149.74001"
+ id="g3301_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,-0.25,0,1,0,129.19)">
+ <stop
+ style="stop-color:#f2f2f2;stop-opacity:1"
+ offset="0"
+ id="s6483" />
+ <stop
+ style="stop-color:#eee;stop-opacity:1"
+ offset="0.17"
+ id="s6485" />
+ <stop
+ style="stop-color:#e3e3e3;stop-opacity:1"
+ offset="0.34"
+ id="s6487" />
+ <stop
+ style="stop-color:#cfcfcf;stop-opacity:1"
+ offset="0.50999999"
+ id="s6489" />
+ <stop
+ style="stop-color:#b4b4b4;stop-opacity:1"
+ offset="0.67000002"
+ id="s6491" />
+ <stop
+ style="stop-color:#919191;stop-opacity:1"
+ offset="0.83999997"
+ id="s6493" />
+ <stop
+ style="stop-color:#666;stop-opacity:1"
+ offset="1"
+ id="s6495" />
+ <a:midPointstop
+ style="stop-color:#F2F2F2"
+ offset="0" />
+ <a:midPointstop
+ style="stop-color:#F2F2F2"
+ offset="0.71" />
+ <a:midPointstop
+ style="stop-color:#666666"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="779.19"
+ y1="122.73"
+ x2="811.69"
+ y2="149.74001"
+ id="lg5855"
+ xlink:href="#g3301_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.204,-0.316,0,1.263,-926.036,103.123)" />
+ <clipPath
+ id="g3299_">
+ <use
+ id="use6469"
+ x="0"
+ y="0"
+ width="1005.92"
+ height="376.97"
+ xlink:href="#g101_" />
+ </clipPath>
+ <radialGradient
+ cx="1189.9301"
+ cy="100.05"
+ r="40.400002"
+ fx="1189.9301"
+ fy="100.05"
+ id="g3300_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.34,-8.46e-2,0,0.34,394.16,137.13)">
+ <stop
+ style="stop-color:white;stop-opacity:1"
+ offset="0"
+ id="s6472" />
+ <stop
+ style="stop-color:white;stop-opacity:0"
+ offset="1"
+ id="s6474" />
+ <a:midPointstop
+ style="stop-color:#FFFFFF"
+ offset="0" />
+ <a:midPointstop
+ style="stop-color:#FFFFFF"
+ offset="0.5" />
+ <a:midPointstop
+ style="stop-color:#000000"
+ offset="1" />
+ </radialGradient>
+ <radialGradient
+ cx="1199.74"
+ cy="97.150002"
+ r="40.400002"
+ fx="1199.74"
+ fy="97.150002"
+ id="rg5860"
+ xlink:href="#g3300_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.409,-0.107,0,0.429,-451.489,113.149)" />
+ <linearGradient
+ x1="796.38"
+ y1="67.580002"
+ x2="781.28003"
+ y2="58.549999"
+ id="g3298_"
+ gradientUnits="userSpaceOnUse">
+ <stop
+ style="stop-color:#4c8bca;stop-opacity:1"
+ offset="0"
+ id="s6462" />
+ <stop
+ style="stop-color:#b7e9ff;stop-opacity:1"
+ offset="1"
+ id="s6464" />
+ <a:midPointstop
+ style="stop-color:#4C8BCA"
+ offset="0" />
+ <a:midPointstop
+ style="stop-color:#4C8BCA"
+ offset="0.5" />
+ <a:midPointstop
+ style="stop-color:#B7E9FF"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="800.97998"
+ y1="140.72"
+ x2="777.71997"
+ y2="121.76"
+ id="g3297_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,-0.25,0,1,0,129.19)">
+ <stop
+ style="stop-color:#e5e5e5;stop-opacity:1"
+ offset="0"
+ id="s6448" />
+ <stop
+ style="stop-color:#ccc;stop-opacity:1"
+ offset="1"
+ id="s6450" />
+ <a:midPointstop
+ style="stop-color:#E5E5E5"
+ offset="0" />
+ <a:midPointstop
+ style="stop-color:#E5E5E5"
+ offset="0.5" />
+ <a:midPointstop
+ style="stop-color:#CCCCCC"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="800.97998"
+ y1="140.72"
+ x2="777.71997"
+ y2="121.76"
+ id="lg5890"
+ xlink:href="#g3297_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,-0.25,0,1,0,129.19)" />
+ <linearGradient
+ x1="790.03998"
+ y1="-16.33"
+ x2="779.84003"
+ y2="-3.73"
+ id="g3296_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(0,70.17)">
+ <stop
+ style="stop-color:#d9d9d9;stop-opacity:1"
+ offset="0"
+ id="s6439" />
+ <stop
+ style="stop-color:#f2f2f2;stop-opacity:1"
+ offset="0.51999998"
+ id="s6441" />
+ <stop
+ style="stop-color:#ccc;stop-opacity:1"
+ offset="1"
+ id="s6443" />
+ <a:midPointstop
+ style="stop-color:#D9D9D9"
+ offset="0" />
+ <a:midPointstop
+ style="stop-color:#D9D9D9"
+ offset="0.5" />
+ <a:midPointstop
+ style="stop-color:#F2F2F2"
+ offset="0.52" />
+ <a:midPointstop
+ style="stop-color:#F2F2F2"
+ offset="0.5" />
+ <a:midPointstop
+ style="stop-color:#CCCCCC"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="790.03998"
+ y1="-16.33"
+ x2="779.84003"
+ y2="-3.73"
+ id="lg5866"
+ xlink:href="#g3296_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.204,0,0,1.263,-926.036,28.6)" />
+ <linearGradient
+ x1="785.84003"
+ y1="72.989998"
+ x2="785.26001"
+ y2="76.279999"
+ id="g3293_"
+ gradientUnits="userSpaceOnUse">
+ <stop
+ style="stop-color:white;stop-opacity:1"
+ offset="0"
+ id="s6412" />
+ <stop
+ style="stop-color:#737373;stop-opacity:1"
+ offset="1"
+ id="s6414" />
+ <a:midPointstop
+ style="stop-color:#FFFFFF"
+ offset="0" />
+ <a:midPointstop
+ style="stop-color:#FFFFFF"
+ offset="0.5" />
+ <a:midPointstop
+ style="stop-color:#737373"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="785.84003"
+ y1="72.989998"
+ x2="785.26001"
+ y2="76.279999"
+ id="lg5871"
+ xlink:href="#g3293_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.204,0,0,1.263,-926.036,-60.001)" />
+ <linearGradient
+ x1="789.37"
+ y1="69.879997"
+ x2="791.03998"
+ y2="77.120003"
+ id="g3292_"
+ gradientUnits="userSpaceOnUse">
+ <stop
+ style="stop-color:#999;stop-opacity:1"
+ offset="0"
+ id="s6403" />
+ <stop
+ style="stop-color:#f2f2f2;stop-opacity:1"
+ offset="0.28"
+ id="s6405" />
+ <stop
+ style="stop-color:#666;stop-opacity:1"
+ offset="1"
+ id="s6407" />
+ <a:midPointstop
+ style="stop-color:#999999"
+ offset="0" />
+ <a:midPointstop
+ style="stop-color:#999999"
+ offset="0.5" />
+ <a:midPointstop
+ style="stop-color:#F2F2F2"
+ offset="0.28" />
+ <a:midPointstop
+ style="stop-color:#F2F2F2"
+ offset="0.5" />
+ <a:midPointstop
+ style="stop-color:#666666"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="789.37"
+ y1="69.879997"
+ x2="791.03998"
+ y2="77.120003"
+ id="lg5874"
+ xlink:href="#g3292_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.204,0,0,1.263,-926.036,-60.001)" />
+ <linearGradient
+ x1="786.65997"
+ y1="136.12"
+ x2="786.71002"
+ y2="134.33"
+ id="g3290_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,-0.25,0,1,0,137.29)">
+ <stop
+ style="stop-color:#d9d9d9;stop-opacity:1"
+ offset="0"
+ id="s6380" />
+ <stop
+ style="stop-color:#b2b2b2;stop-opacity:1"
+ offset="1"
+ id="s6382" />
+ <a:midPointstop
+ style="stop-color:#D9D9D9"
+ offset="0" />
+ <a:midPointstop
+ style="stop-color:#D9D9D9"
+ offset="0.5" />
+ <a:midPointstop
+ style="stop-color:#B2B2B2"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="786.65997"
+ y1="136.12"
+ x2="786.71002"
+ y2="134.33"
+ id="lg5878"
+ xlink:href="#g3290_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.204,-0.316,0,1.263,-926.036,113.351)" />
+ <radialGradient
+ cx="1458.77"
+ cy="-5.0999999"
+ r="35.130001"
+ fx="1458.77"
+ fy="-5.0999999"
+ id="g3289_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.42,0,0,0.42,167.09,79.84)">
+ <stop
+ style="stop-color:white;stop-opacity:1"
+ offset="0"
+ id="s6371" />
+ <stop
+ style="stop-color:#999;stop-opacity:1"
+ offset="1"
+ id="s6373" />
+ <a:midPointstop
+ style="stop-color:#FFFFFF"
+ offset="0" />
+ <a:midPointstop
+ style="stop-color:#FFFFFF"
+ offset="0.5" />
+ <a:midPointstop
+ style="stop-color:#999999"
+ offset="1" />
+ </radialGradient>
+ <radialGradient
+ cx="1458.77"
+ cy="-5.0999999"
+ r="35.130001"
+ fx="1458.77"
+ fy="-5.0999999"
+ id="rg5881"
+ xlink:href="#g3289_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.505,0,0,0.53,-724.957,40.636)" />
+ <radialGradient
+ cx="1612.98"
+ cy="-4.4699998"
+ r="36.580002"
+ fx="1612.98"
+ fy="-4.4699998"
+ id="g3288_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.34,0,0,0.36,238.56,86.87)">
+ <stop
+ style="stop-color:#e5e5e5;stop-opacity:1"
+ offset="0"
+ id="s6362" />
+ <stop
+ style="stop-color:#b2b2b2;stop-opacity:1"
+ offset="0.63999999"
+ id="s6364" />
+ <stop
+ style="stop-color:#737373;stop-opacity:1"
+ offset="1"
+ id="s6366" />
+ <a:midPointstop
+ style="stop-color:#E5E5E5"
+ offset="0" />
+ <a:midPointstop
+ style="stop-color:#E5E5E5"
+ offset="0.5" />
+ <a:midPointstop
+ style="stop-color:#B2B2B2"
+ offset="0.64" />
+ <a:midPointstop
+ style="stop-color:#B2B2B2"
+ offset="0.5" />
+ <a:midPointstop
+ style="stop-color:#737373"
+ offset="1" />
+ </radialGradient>
+ <radialGradient
+ cx="1612.98"
+ cy="-4.4699998"
+ r="36.580002"
+ fx="1612.98"
+ fy="-4.4699998"
+ id="rg5884"
+ xlink:href="#g3288_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.408,0,0,0.448,-638.943,49.495)" />
+ <radialGradient
+ cx="1470.5"
+ cy="-10.21"
+ r="33.290001"
+ fx="1470.5"
+ fy="-10.21"
+ id="g3287_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.42,0,0,0.42,167.09,79.84)">
+ <stop
+ style="stop-color:#e5e5e5;stop-opacity:1"
+ offset="0"
+ id="s6347" />
+ <stop
+ style="stop-color:#b2b2b2;stop-opacity:1"
+ offset="0.38999999"
+ id="s6349" />
+ <stop
+ style="stop-color:#b1b1b1;stop-opacity:1"
+ offset="0.75"
+ id="s6351" />
+ <stop
+ style="stop-color:#aaa;stop-opacity:1"
+ offset="0.88"
+ id="s6353" />
+ <stop
+ style="stop-color:#9e9e9e;stop-opacity:1"
+ offset="0.97000003"
+ id="s6355" />
+ <stop
+ style="stop-color:#999;stop-opacity:1"
+ offset="1"
+ id="s6357" />
+ <a:midPointstop
+ style="stop-color:#E5E5E5"
+ offset="0" />
+ <a:midPointstop
+ style="stop-color:#E5E5E5"
+ offset="0.5" />
+ <a:midPointstop
+ style="stop-color:#B2B2B2"
+ offset="0.39" />
+ <a:midPointstop
+ style="stop-color:#B2B2B2"
+ offset="0.87" />
+ <a:midPointstop
+ style="stop-color:#999999"
+ offset="1" />
+ </radialGradient>
+ <radialGradient
+ cx="1470.5"
+ cy="-10.21"
+ r="33.290001"
+ fx="1470.5"
+ fy="-10.21"
+ id="rg5887"
+ xlink:href="#g3287_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.505,0,0,0.53,-724.957,40.636)" />
+ <pattern
+ patternTransform="matrix(0.592927,0,0,0.592927,78,462)"
+ id="cream-spots"
+ height="32"
+ width="32"
+ patternUnits="userSpaceOnUse">
+ <g
+ transform="translate(-365.3146,-513.505)"
+ id="g3047">
+ id="path2858" />
+ <path
+ inkscape:label="#path2854"
+ sodipodi:nodetypes="czzzz"
+ style="fill:#e3dcc0"
+ id="path3060"
+ d="M 390.31462,529.50504 C 390.31462,534.47304 386.28262,538.50504 381.31462,538.50504 C 376.34662,538.50504 372.31462,534.47304 372.31462,529.50504 C 372.31462,524.53704 376.34662,520.50504 381.31462,520.50504 C 386.28262,520.50504 390.31462,524.53704 390.31462,529.50504 z " />
+</g>
+ </pattern>
+ <pattern
+ patternTransform="matrix(0.733751,0,0,0.733751,67,367)"
+ id="dark-cream-spots"
+ height="32"
+ width="32"
+ patternUnits="userSpaceOnUse">
+ <g
+ transform="translate(-408.0946,-513.505)"
+ id="dark-cream-spot"
+ inkscape:label="#g3043">
+ <path
+ sodipodi:nodetypes="czzzz"
+ style="fill:#c8c5ac"
+ d="M 433.09458,529.50504 C 433.09458,534.47304 429.06258,538.50504 424.09458,538.50504 C 419.12658,538.50504 415.09458,534.47304 415.09458,529.50504 C 415.09458,524.53704 419.12658,520.50504 424.09458,520.50504 C 429.06258,520.50504 433.09458,524.53704 433.09458,529.50504 z "
+ id="path2953" />
+ </g>
+ </pattern>
+ <pattern
+ patternTransform="matrix(0.375,0,0,0.375,379,400)"
+ id="white-spots"
+ height="32"
+ width="32"
+ patternUnits="userSpaceOnUse">
+ <g
+ transform="translate(-484.3997,-513.505)"
+ id="white-spot"
+ inkscape:label="#g3035">
+ <path
+ style="opacity:0.25;fill:white"
+ id="path3033"
+ d="M 509.39967,529.50504 C 509.39967,534.47304 505.36767,538.50504 500.39967,538.50504 C 495.43167,538.50504 491.39967,534.47304 491.39967,529.50504 C 491.39967,524.53704 495.43167,520.50504 500.39967,520.50504 C 505.36767,520.50504 509.39967,524.53704 509.39967,529.50504 z "
+ sodipodi:nodetypes="czzzz" />
+ </g>
+ </pattern>
+ <pattern
+ patternTransform="matrix(0.455007,0,0,0.455007,-5e-5,1.9e-5)"
+ id="black-spots"
+ height="32"
+ width="32"
+ patternUnits="userSpaceOnUse">
+ <g
+ transform="translate(-448.3997,-513.505)"
+ id="black-spot"
+ inkscape:label="#g3039">
+ <path
+ sodipodi:nodetypes="czzzz"
+ d="M 473.39967,529.50504 C 473.39967,534.47304 469.36767,538.50504 464.39967,538.50504 C 459.43167,538.50504 455.39967,534.47304 455.39967,529.50504 C 455.39967,524.53704 459.43167,520.50504 464.39967,520.50504 C 469.36767,520.50504 473.39967,524.53704 473.39967,529.50504 z "
+ id="path2961"
+ style="opacity:0.25;fill:black" />
+ </g>
+ </pattern>
+ <linearGradient
+ x1="501.0903"
+ y1="-19.2544"
+ x2="531.85413"
+ y2="0.72390002"
+ id="linearGradient17334"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)">
+ <stop
+ style="stop-color:#b4daea;stop-opacity:1"
+ offset="0"
+ id="stop17336" />
+ <stop
+ style="stop-color:#b4daea;stop-opacity:1"
+ offset="0.51120001"
+ id="stop17338" />
+ <stop
+ style="stop-color:#5387ba;stop-opacity:1"
+ offset="0.64609998"
+ id="stop17340" />
+ <stop
+ style="stop-color:#16336e;stop-opacity:1"
+ offset="1"
+ id="stop17342" />
+ <a:midPointStop
+ offset="0"
+ style="stop-color:#B4DAEA" />
+ <a:midPointStop
+ offset="0.5"
+ style="stop-color:#B4DAEA" />
+ <a:midPointStop
+ offset="0.5112"
+ style="stop-color:#B4DAEA" />
+ <a:midPointStop
+ offset="0.5"
+ style="stop-color:#B4DAEA" />
+ <a:midPointStop
+ offset="0.6461"
+ style="stop-color:#5387BA" />
+ <a:midPointStop
+ offset="0.5"
+ style="stop-color:#5387BA" />
+ <a:midPointStop
+ offset="1"
+ style="stop-color:#16336E" />
+ </linearGradient>
+ <linearGradient
+ x1="415.73831"
+ y1="11.854"
+ x2="418.13361"
+ y2="18.8104"
+ id="linearGradient17426"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.8362,0.5206,-1.1904,0.992,147.62,-30.9374)">
+ <stop
+ style="stop-color:#ccc;stop-opacity:1"
+ offset="0"
+ id="stop17428" />
+ <stop
+ style="stop-color:#f2f2f2;stop-opacity:1"
+ offset="1"
+ id="stop17430" />
+ <a:midPointStop
+ offset="0"
+ style="stop-color:#CCCCCC" />
+ <a:midPointStop
+ offset="0.5"
+ style="stop-color:#CCCCCC" />
+ <a:midPointStop
+ offset="1"
+ style="stop-color:#F2F2F2" />
+ </linearGradient>
+ <linearGradient
+ x1="478.21341"
+ y1="-131.9297"
+ x2="469.85818"
+ y2="-140.28481"
+ id="linearGradient17434"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.5592,0.829,-0.829,0.5592,101.3357,-104.791)">
+ <stop
+ style="stop-color:#f3403f;stop-opacity:1"
+ offset="0"
+ id="stop17436" />
+ <stop
+ style="stop-color:#d02a28;stop-opacity:1"
+ offset="0.37889999"
+ id="stop17438" />
+ <stop
+ style="stop-color:#b21714;stop-opacity:1"
+ offset="0.77649999"
+ id="stop17440" />
+ <stop
+ style="stop-color:#a6100c;stop-opacity:1"
+ offset="1"
+ id="stop17442" />
+ <a:midPointStop
+ offset="0"
+ style="stop-color:#F3403F" />
+ <a:midPointStop
+ offset="0.4213"
+ style="stop-color:#F3403F" />
+ <a:midPointStop
+ offset="1"
+ style="stop-color:#A6100C" />
+ </linearGradient>
+ <linearGradient
+ x1="502.70749"
+ y1="115.3013"
+ x2="516.39001"
+ y2="127.1953"
+ id="linearGradient17709"
+ xlink:href="#XMLID_1749_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.9703,0.2419,-0.2419,0.9703,11.0227,-35.6159)" />
+ <linearGradient
+ x1="506.09909"
+ y1="-11.5137"
+ x2="527.99609"
+ y2="2.7063999"
+ id="linearGradient17711"
+ xlink:href="#XMLID_1752_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)" />
+ <linearGradient
+ x1="516.57672"
+ y1="-15.769"
+ x2="516.57672"
+ y2="0.84280002"
+ id="linearGradient17713"
+ xlink:href="#XMLID_1753_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)" />
+ <linearGradient
+ x1="505.62939"
+ y1="-14.9526"
+ x2="527.49402"
+ y2="-0.7536"
+ id="linearGradient17715"
+ xlink:href="#XMLID_1756_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)" />
+ <linearGradient
+ x1="500.70749"
+ y1="-13.2441"
+ x2="513.46442"
+ y2="-2.1547"
+ id="linearGradient17717"
+ xlink:href="#XMLID_1757_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)" />
+ <linearGradient
+ x1="473.7681"
+ y1="209.17529"
+ x2="486.98099"
+ y2="213.2001"
+ id="linearGradient17721"
+ xlink:href="#XMLID_2274_"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ x1="481.23969"
+ y1="212.5742"
+ x2="472.92981"
+ y2="207.4967"
+ id="linearGradient17723"
+ xlink:href="#XMLID_2275_"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ x1="500.70749"
+ y1="-13.2441"
+ x2="513.46442"
+ y2="-2.1547"
+ id="linearGradient17416"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)">
+ <stop
+ style="stop-color:#5387ba;stop-opacity:1"
+ offset="0"
+ id="stop17418" />
+ <stop
+ style="stop-color:#96bad6;stop-opacity:1"
+ offset="1"
+ id="stop17420" />
+ <a:midPointStop
+ style="stop-color:#5387BA"
+ offset="0" />
+ <a:midPointStop
+ style="stop-color:#5387BA"
+ offset="0.5" />
+ <a:midPointStop
+ style="stop-color:#96BAD6"
+ offset="1" />
+ </linearGradient>
+ <defs
+ id="defs9929">
+ <path
+ d="M 489.21,209.35 L 485.35,203.63 C 483.63,204.25 473.47,208.93 471.5,210.18 C 470.57,210.77 470.17,211.16 469.72,212.48 C 470.93,212.31 471.72,212.49 473.42,213.04 C 473.26,214.77 473.24,215.74 473.57,218.2 C 474.01,216.88 474.41,216.49 475.34,215.9 C 477.33,214.65 487.49,209.97 489.21,209.35 z "
+ id="XMLID_960_" />
+ </defs>
+ <clipPath
+ id="clipPath17448">
+ <use
+ id="use17450"
+ x="0"
+ y="0"
+ width="744.09448"
+ height="600"
+ xlink:href="#XMLID_960_" />
+ </clipPath>
+ <linearGradient
+ x1="473.7681"
+ y1="209.17529"
+ x2="486.98099"
+ y2="213.2001"
+ id="linearGradient17452"
+ gradientUnits="userSpaceOnUse">
+ <stop
+ style="stop-color:#f3403f;stop-opacity:1"
+ offset="0"
+ id="stop17454" />
+ <stop
+ style="stop-color:#d02a28;stop-opacity:1"
+ offset="0.37889999"
+ id="stop17456" />
+ <stop
+ style="stop-color:#b21714;stop-opacity:1"
+ offset="0.77649999"
+ id="stop17458" />
+ <stop
+ style="stop-color:#a6100c;stop-opacity:1"
+ offset="1"
+ id="stop17460" />
+ <a:midPointStop
+ style="stop-color:#F3403F"
+ offset="0" />
+ <a:midPointStop
+ style="stop-color:#F3403F"
+ offset="0.4213" />
+ <a:midPointStop
+ style="stop-color:#A6100C"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="481.23969"
+ y1="212.5742"
+ x2="472.92981"
+ y2="207.4967"
+ id="linearGradient17463"
+ gradientUnits="userSpaceOnUse">
+ <stop
+ style="stop-color:#f3403f;stop-opacity:1"
+ offset="0"
+ id="stop17465" />
+ <stop
+ style="stop-color:#d02a28;stop-opacity:1"
+ offset="0.37889999"
+ id="stop17467" />
+ <stop
+ style="stop-color:#b21714;stop-opacity:1"
+ offset="0.77649999"
+ id="stop17469" />
+ <stop
+ style="stop-color:#a6100c;stop-opacity:1"
+ offset="1"
+ id="stop17471" />
+ <a:midPointStop
+ style="stop-color:#F3403F"
+ offset="0" />
+ <a:midPointStop
+ style="stop-color:#F3403F"
+ offset="0.4213" />
+ <a:midPointStop
+ style="stop-color:#A6100C"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="481.23969"
+ y1="212.5742"
+ x2="472.92981"
+ y2="207.4967"
+ id="linearGradient17807"
+ xlink:href="#XMLID_2275_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(-177.1654,35.43307)" />
+ <linearGradient
+ x1="473.7681"
+ y1="209.17529"
+ x2="486.98099"
+ y2="213.2001"
+ id="linearGradient17810"
+ xlink:href="#XMLID_2274_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(-177.1654,35.43307)" />
+ <linearGradient
+ x1="502.70749"
+ y1="115.3013"
+ x2="516.39001"
+ y2="127.1953"
+ id="linearGradient17812"
+ xlink:href="#XMLID_1749_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.9703,0.2419,-0.2419,0.9703,11.0227,-35.6159)" />
+ <linearGradient
+ x1="506.09909"
+ y1="-11.5137"
+ x2="527.99609"
+ y2="2.7063999"
+ id="linearGradient17814"
+ xlink:href="#XMLID_1752_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)" />
+ <linearGradient
+ x1="516.57672"
+ y1="-15.769"
+ x2="516.57672"
+ y2="0.84280002"
+ id="linearGradient17816"
+ xlink:href="#XMLID_1753_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)" />
+ <linearGradient
+ x1="505.62939"
+ y1="-14.9526"
+ x2="527.49402"
+ y2="-0.7536"
+ id="linearGradient17818"
+ xlink:href="#XMLID_1756_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)" />
+ <linearGradient
+ x1="502.70749"
+ y1="115.3013"
+ x2="516.39001"
+ y2="127.1953"
+ id="linearGradient17347"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.9703,0.2419,-0.2419,0.9703,11.0227,-35.6159)">
+ <stop
+ style="stop-color:#5387ba;stop-opacity:1"
+ offset="0"
+ id="stop17349" />
+ <stop
+ style="stop-color:#96bad6;stop-opacity:1"
+ offset="1"
+ id="stop17351" />
+ <a:midPointStop
+ offset="0"
+ style="stop-color:#5387BA" />
+ <a:midPointStop
+ offset="0.5"
+ style="stop-color:#5387BA" />
+ <a:midPointStop
+ offset="1"
+ style="stop-color:#96BAD6" />
+ </linearGradient>
+ <linearGradient
+ x1="516.57672"
+ y1="-15.769"
+ x2="516.57672"
+ y2="0.84280002"
+ id="linearGradient17379"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)">
+ <stop
+ style="stop-color:#b2b2b2;stop-opacity:1"
+ offset="0"
+ id="stop17381" />
+ <stop
+ style="stop-color:#f2f2f2;stop-opacity:1"
+ offset="1"
+ id="stop17383" />
+ <a:midPointStop
+ offset="0"
+ style="stop-color:#B2B2B2" />
+ <a:midPointStop
+ offset="0.5"
+ style="stop-color:#B2B2B2" />
+ <a:midPointStop
+ offset="1"
+ style="stop-color:#F2F2F2" />
+ </linearGradient>
+ <linearGradient
+ x1="502.70749"
+ y1="115.3013"
+ x2="516.39001"
+ y2="127.1953"
+ id="linearGradient17862"
+ xlink:href="#XMLID_1749_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.9703,0.2419,-0.2419,0.9703,-166.1427,-0.18283)" />
+ <linearGradient
+ x1="505.62939"
+ y1="-14.9526"
+ x2="527.49402"
+ y2="-0.7536"
+ id="linearGradient17864"
+ xlink:href="#XMLID_1756_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)" />
+ <defs
+ id="defs3859">
+ <polygon
+ points="465.54,213.52 481.94,217.46 482.74,216.71 487.46,198.05 471.08,194.07 470.26,194.83 465.54,213.52 "
+ id="XMLID_343_" />
+ </defs>
+ <linearGradient
+ x1="471.0806"
+ y1="201.07761"
+ x2="481.91711"
+ y2="210.4977"
+ id="linearGradient17389"
+ gradientUnits="userSpaceOnUse">
+ <stop
+ style="stop-color:#6498c1;stop-opacity:1"
+ offset="0.005618"
+ id="stop17391" />
+ <stop
+ style="stop-color:#79a9cc;stop-opacity:1"
+ offset="0.2332"
+ id="stop17393" />
+ <stop
+ style="stop-color:#a4cde2;stop-opacity:1"
+ offset="0.74049997"
+ id="stop17395" />
+ <stop
+ style="stop-color:#b4daea;stop-opacity:1"
+ offset="1"
+ id="stop17397" />
+ <a:midPointStop
+ style="stop-color:#6498C1"
+ offset="5.618000e-003" />
+ <a:midPointStop
+ style="stop-color:#6498C1"
+ offset="0.4438" />
+ <a:midPointStop
+ style="stop-color:#B4DAEA"
+ offset="1" />
+ </linearGradient>
+ <clipPath
+ id="clipPath17400">
+ <use
+ id="use17402"
+ x="0"
+ y="0"
+ width="744.09448"
+ height="600"
+ xlink:href="#XMLID_343_" />
+ </clipPath>
+ <linearGradient
+ x1="505.62939"
+ y1="-14.9526"
+ x2="527.49402"
+ y2="-0.7536"
+ id="linearGradient17404"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)">
+ <stop
+ style="stop-color:#b4daea;stop-opacity:1"
+ offset="0"
+ id="stop17406" />
+ <stop
+ style="stop-color:#b4daea;stop-opacity:1"
+ offset="0.51120001"
+ id="stop17408" />
+ <stop
+ style="stop-color:#5387ba;stop-opacity:1"
+ offset="0.64609998"
+ id="stop17410" />
+ <stop
+ style="stop-color:#16336e;stop-opacity:1"
+ offset="1"
+ id="stop17412" />
+ <a:midPointStop
+ style="stop-color:#B4DAEA"
+ offset="0" />
+ <a:midPointStop
+ style="stop-color:#B4DAEA"
+ offset="0.5" />
+ <a:midPointStop
+ style="stop-color:#B4DAEA"
+ offset="0.5112" />
+ <a:midPointStop
+ style="stop-color:#B4DAEA"
+ offset="0.5" />
+ <a:midPointStop
+ style="stop-color:#5387BA"
+ offset="0.6461" />
+ <a:midPointStop
+ style="stop-color:#5387BA"
+ offset="0.5" />
+ <a:midPointStop
+ style="stop-color:#16336E"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="506.09909"
+ y1="-11.5137"
+ x2="527.99609"
+ y2="2.7063999"
+ id="linearGradient17882"
+ xlink:href="#XMLID_1752_"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)" />
+ <defs
+ id="defs3826">
+ <polygon
+ points="463.52,216.14 480.56,220.24 481.36,219.5 483.03,202.04 469.05,196.69 468.24,197.45 463.52,216.14 "
+ id="XMLID_338_" />
+ </defs>
+ <linearGradient
+ x1="468.2915"
+ y1="204.7612"
+ x2="479.39871"
+ y2="214.4166"
+ id="linearGradient17357"
+ gradientUnits="userSpaceOnUse">
+ <stop
+ style="stop-color:#5387ba;stop-opacity:1"
+ offset="0"
+ id="stop17359" />
+ <stop
+ style="stop-color:#96bad6;stop-opacity:1"
+ offset="1"
+ id="stop17361" />
+ <a:midPointStop
+ style="stop-color:#5387BA"
+ offset="0" />
+ <a:midPointStop
+ style="stop-color:#5387BA"
+ offset="0.5" />
+ <a:midPointStop
+ style="stop-color:#96BAD6"
+ offset="1" />
+ </linearGradient>
+ <clipPath
+ id="clipPath17364">
+ <use
+ id="use17366"
+ x="0"
+ y="0"
+ width="744.09448"
+ height="600"
+ xlink:href="#XMLID_338_" />
+ </clipPath>
+ <linearGradient
+ x1="506.09909"
+ y1="-11.5137"
+ x2="527.99609"
+ y2="2.7063999"
+ id="linearGradient17368"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)">
+ <stop
+ style="stop-color:#b4daea;stop-opacity:1"
+ offset="0"
+ id="stop17370" />
+ <stop
+ style="stop-color:#b4daea;stop-opacity:1"
+ offset="0.51120001"
+ id="stop17372" />
+ <stop
+ style="stop-color:#5387ba;stop-opacity:1"
+ offset="0.64609998"
+ id="stop17374" />
+ <stop
+ style="stop-color:#16336e;stop-opacity:1"
+ offset="1"
+ id="stop17376" />
+ <a:midPointStop
+ style="stop-color:#B4DAEA"
+ offset="0" />
+ <a:midPointStop
+ style="stop-color:#B4DAEA"
+ offset="0.5" />
+ <a:midPointStop
+ style="stop-color:#B4DAEA"
+ offset="0.5112" />
+ <a:midPointStop
+ style="stop-color:#B4DAEA"
+ offset="0.5" />
+ <a:midPointStop
+ style="stop-color:#5387BA"
+ offset="0.6461" />
+ <a:midPointStop
+ style="stop-color:#5387BA"
+ offset="0.5" />
+ <a:midPointStop
+ style="stop-color:#16336E"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="296.4996"
+ y1="188.81061"
+ x2="317.32471"
+ y2="209.69398"
+ id="linearGradient2387"
+ xlink:href="#linearGradient2381"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.90776,0,0,0.90776,24.35648,49.24131)" />
+ <linearGradient
+ x1="296.4996"
+ y1="188.81061"
+ x2="317.32471"
+ y2="209.69398"
+ id="linearGradient5105"
+ xlink:href="#linearGradient2381"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.90776,0,0,0.90776,24.35648,49.24131)" />
+ <linearGradient
+ x1="296.4996"
+ y1="188.81061"
+ x2="317.32471"
+ y2="209.69398"
+ id="linearGradient5145"
+ xlink:href="#linearGradient2381"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.90776,0,0,0.90776,24.35648,49.24131)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2381"
+ id="linearGradient2371"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.90776,0,0,0.90776,24.35648,49.24131)"
+ x1="296.4996"
+ y1="188.81061"
+ x2="317.32471"
+ y2="209.69398" />
+ </defs>
+ <g
+ transform="matrix(0.437808,-0.437808,0.437808,0.437808,-220.8237,43.55311)"
+ id="g5089">
+ <path
+ d="M 8.4382985,-6.28125 C 7.8309069,-6.28125 4.125,-0.33238729 4.125,1.96875 L 4.125,28.6875 C 4.125,29.533884 4.7068159,29.8125 5.28125,29.8125 L 30.84375,29.8125 C 31.476092,29.8125 31.968751,29.319842 31.96875,28.6875 L 31.96875,23.46875 L 32.25,23.46875 C 32.74684,23.46875 33.156249,23.059339 33.15625,22.5625 L 33.15625,-5.375 C 33.15625,-5.8718398 32.74684,-6.28125 32.25,-6.28125 L 8.4382985,-6.28125 z "
+ transform="translate(282.8327,227.1903)"
+ style="fill:#5c5c4f;stroke:black;stroke-width:3.23021388;stroke-miterlimit:4;stroke-dasharray:none"
+ id="path5091" />
+ <rect
+ width="27.85074"
+ height="29.369793"
+ rx="1.1414107"
+ ry="1.1414107"
+ x="286.96509"
+ y="227.63805"
+ style="fill:#032c87"
+ id="rect5093" />
+ <path
+ d="M 288.43262,225.43675 L 313.67442,225.43675 L 313.67442,254.80655 L 287.29827,254.83069 L 288.43262,225.43675 z "
+ style="fill:white"
+ id="rect5095" />
+ <path
+ d="M 302.44536,251.73726 C 303.83227,259.59643 301.75225,263.02091 301.75225,263.02091 C 303.99609,261.41329 305.71651,259.54397 306.65747,257.28491 C 307.62455,259.47755 308.49041,261.71357 310.9319,263.27432 C 310.9319,263.27432 309.33686,256.07392 309.22047,251.73726 L 302.44536,251.73726 z "
+ style="fill:#a70000;fill-opacity:1;stroke-width:2"
+ id="path5097" />
+ <rect
+ width="25.241802"
+ height="29.736675"
+ rx="0.89682275"
+ ry="0.89682275"
+ x="290.73544"
+ y="220.92249"
+ style="fill:#809cc9"
+ id="rect5099" />
+ <path
+ d="M 576.47347,725.93939 L 582.84431,726.35441 L 583.25121,755.8725 C 581.35919,754.55465 576.39694,752.1117 574.98889,754.19149 L 574.98889,727.42397 C 574.98889,726.60151 575.65101,725.93939 576.47347,725.93939 z "
+ transform="matrix(0.499065,-0.866565,0,1,0,0)"
+ style="fill:#4573b3;fill-opacity:1"
+ id="rect5101" />
+ <path
+ d="M 293.2599,221.89363 L 313.99908,221.89363 C 314.45009,221.89363 314.81318,222.25673 314.81318,222.70774 C 315.02865,229.0361 295.44494,244.47124 292.44579,240.30491 L 292.44579,222.70774 C 292.44579,222.25673 292.80889,221.89363 293.2599,221.89363 z "
+ style="opacity:0.65536726;fill:url(#linearGradient2371);fill-opacity:1"
+ id="path5103" />
+ </g>
+</svg>
commit 2a7e61059e8bd627ccae9d3f365638bfad5e96e8
Merge: 051bce6... b912500...
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Sun Feb 1 04:02:25 2009 +0100
Merge branch 'master' of ssh://git.fedorahosted.org/git/revisor
commit 051bce64ebd6e9acec1b8c08be31da89cfcae93c
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Sun Feb 1 04:01:00 2009 +0100
Implement fix for #329: Quit button at the bottom right in the UI should go (johnp)
diff --git a/revisor/modgui/glade/base_buttons.glade b/revisor/modgui/glade/base_buttons.glade
index 66c72eb..bab0936 100644
--- a/revisor/modgui/glade/base_buttons.glade
+++ b/revisor/modgui/glade/base_buttons.glade
@@ -1,261 +1,262 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-
- <widget class="GtkHBox" id="button_hbox">
- <property name="visible">True</property>
- <property name="homogeneous">True</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkVBox" id="button_information_vbox">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkLabel" id="empty_label">
- <property name="visible">True</property>
- <property name="label"></property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkButton" id="button_information">
- <property name="border_width">10</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-info</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="sensitive">False</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="empty_label">
- <property name="visible">True</property>
- <property name="label"></property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkVBox" id="button_back_vbox">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkLabel" id="empty_label">
- <property name="visible">True</property>
- <property name="label"></property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkButton" id="button_back">
- <property name="border_width">10</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-go-back</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <signal name="clicked" handler="on_button_back_clicked" last_modification_time="Sun, 25 Mar 2007 16:36:18 GMT"/>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkVBox" id="button_forward_vbox">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkLabel" id="empty_label">
- <property name="visible">True</property>
- <property name="label"></property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkButton" id="button_forward">
- <property name="border_width">10</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-go-forward</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <signal name="clicked" handler="on_button_forward_clicked" last_modification_time="Sun, 25 Mar 2007 16:36:24 GMT"/>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkVBox" id="button_cancel_vbox">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkLabel" id="empty_label">
- <property name="visible">True</property>
- <property name="label"></property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkButton" id="button_cancel">
- <property name="border_width">10</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-quit</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <signal name="clicked" handler="on_button_cancel_clicked" last_modification_time="Sun, 25 Mar 2007 16:36:30 GMT"/>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
-
-</glade-interface>
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
+<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
+
+<glade-interface>
+
+ <widget class="GtkHBox" id="button_hbox">
+ <property name="visible">True</property>
+ <property name="homogeneous">True</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkVBox" id="button_information_vbox">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkLabel" id="empty_label">
+ <property name="visible">True</property>
+ <property name="label"></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkButton" id="button_information">
+ <property name="border_width">10</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-info</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="sensitive">False</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="empty_label">
+ <property name="visible">True</property>
+ <property name="label"></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkVBox" id="button_cancel_vbox">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkLabel" id="empty_label">
+ <property name="visible">True</property>
+ <property name="label"></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkButton" id="button_cancel">
+ <property name="border_width">10</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-quit</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <signal name="clicked" handler="on_button_cancel_clicked" last_modification_time="Sun, 25 Mar 2007 16:36:30 GMT"/>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkVBox" id="button_back_vbox">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkLabel" id="empty_label">
+ <property name="visible">True</property>
+ <property name="label"></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkButton" id="button_back">
+ <property name="border_width">10</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-go-back</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <signal name="clicked" handler="on_button_back_clicked" last_modification_time="Sun, 25 Mar 2007 16:36:18 GMT"/>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkVBox" id="button_forward_vbox">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkLabel" id="empty_label">
+ <property name="visible">True</property>
+ <property name="label"></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkButton" id="button_forward">
+ <property name="border_width">10</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-go-forward</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <signal name="clicked" handler="on_button_forward_clicked" last_modification_time="Sun, 25 Mar 2007 16:36:24 GMT"/>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ </widget>
+
+</glade-interface>
diff --git a/revisor/modgui/glade/welcome_buttons.glade b/revisor/modgui/glade/welcome_buttons.glade
index ec208f0..a771f90 100644
--- a/revisor/modgui/glade/welcome_buttons.glade
+++ b/revisor/modgui/glade/welcome_buttons.glade
@@ -89,6 +89,62 @@
<property name="fill">False</property>
</packing>
</child>
+
+ <child>
+ <widget class="GtkVBox" id="button_cancel_vbox">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkLabel" id="empty_label">
+ <property name="visible">True</property>
+ <property name="label"></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkButton" id="button_cancel">
+ <property name="border_width">10</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-quit</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <signal name="clicked" handler="on_button_cancel_clicked" last_modification_time="Sun, 25 Mar 2007 16:36:30 GMT"/>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
<child>
<widget class="GtkVBox" id="button_forward_vbox">
@@ -207,61 +263,6 @@
</packing>
</child>
- <child>
- <widget class="GtkVBox" id="button_cancel_vbox">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkLabel" id="empty_label">
- <property name="visible">True</property>
- <property name="label"></property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkButton" id="button_cancel">
- <property name="border_width">10</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-quit</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <signal name="clicked" handler="on_button_cancel_clicked" last_modification_time="Sun, 25 Mar 2007 16:36:30 GMT"/>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
</widget>
</glade-interface>
commit 2f46173c4d4ddefee01af237e974983ada33e451
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Sun Feb 1 00:59:54 2009 +0100
Add missing files (#466832)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index d030008..17b15e4 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -70,5 +70,8 @@ revisor/modrebrand/__init__.py
revisor/modreuseinstaller/__init__.py
revisor/modserver/__init__.py
revisor/modvirt/__init__.py
+revisor/modwui/modwui/controllers.py
+revisor/modwui/modwui/grids.py
+revisor/modwui/modwui/options.py
conf/revisor.desktop.in
commit b912500a1be57652d4d1158f65f4234a7976c199
Author: Guido Grazioli <guido.grazioli(a)gmail.com>
Date: Fri Jan 30 18:38:28 2009 +0000
updated italian translation
Transmitted-via: Transifex (translate.fedoraproject.org)
diff --git a/po/Changelog b/po/Changelog
index ced8a09..9b80c62 100644
--- a/po/Changelog
+++ b/po/Changelog
@@ -1,4 +1,6 @@
-Updated Polish translation
+updated italian translation
+
+Transmitted-via: Transifex (translate.fedoraproject.org)Updated Polish translation
Transmitted-via: Transifex (translate.fedoraproject.org)Updated Polish translation
diff --git a/po/it.po b/po/it.po
index c3e7536..3c26759 100644
--- a/po/it.po
+++ b/po/it.po
@@ -2,16 +2,19 @@
# Copyright (C) 2008 Free Software Foundation, Inc.
#
#
-# Guido Grazioli <guido.grazioli(a)gmail.com>, 2008.
+# Guido Grazioli <guido.grazioli(a)gmail.com>, 2008, 2009.
# Francesco Tombolini <tombo(a)adamantio.net>, 2008.
+#: ../revisor/modgui/glade/lm_bootloader.glade.h:4
+#: ../revisor/modgui/glade/lm_bootloader.glade.h:10
#: ../revisor/modgui/glade/lm_usercustomize.glade.h:1
+#: ../revisor/modgui/glade/lm_usercustomize.glade.h:4
msgid ""
msgstr ""
"Project-Id-Version: revisor.master\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-04 18:11+0200\n"
-"PO-Revision-Date: 2008-06-22 21:37+0200\n"
-"Last-Translator: Francesco Tombolini <tombo(a)adamantio.net>\n"
+"POT-Creation-Date: 2008-12-01 01:26+0000\n"
+"PO-Revision-Date: 2009-01-30 19:34+0100\n"
+"Last-Translator: Guido Grazioli <guido.grazioli(a)gmail.com>\n"
"Language-Team: Italian <fedora-trans-it(a)redhat.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -40,6 +43,24 @@ msgid ""
" Free Software Foundation, Inc.,\n"
" 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA\n"
msgstr ""
+"\n"
+" Revisor, a product of Fedora Unity\n"
+" Copyright (C) 2005, 2006, 2007 Fedora Unity\n"
+"\n"
+" This program is free software; you can redistribute it and/or modify\n"
+" it under the terms of the GNU General Public License as published by\n"
+" the Free Software Foundation; either version 2 of the License, or\n"
+" (at your option) any later version.\n"
+"\n"
+" This program is distributed in the hope that it will be useful,\n"
+" but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+" See the GNU General Public License for more details.\n"
+"\n"
+" You should have received a copy of the GNU General Public License\n"
+" along with this program; if not, write to the\n"
+" Free Software Foundation, Inc.,\n"
+" 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA\n"
#: ../revisor/modgui/glade/base_screen.glade.in.h:20
msgid ""
@@ -67,12 +88,12 @@ msgstr ""
"\t* Jeroen van Meeuwen (kanarip) <kanarip(a)fedoraunity.org>\n"
"\n"
"Traduttori:\n"
-"\t* Guido Grazioli <guido.grazioli(a)gmail.com> \t* Francesco Tombolini "
-"(tombo) <tombo(a)adamantio.net>"
+"\t* Guido Grazioli <guido.grazioli(a)gmail.com> \n"
+"\t* Francesco Tombolini (tombo) <tombo(a)adamantio.net>"
#: ../revisor/modgui/glade/base_screen.glade.in.h:32
msgid "<b>More information about:</b>"
-msgstr "<b>Più informazioni su:</b>"
+msgstr "<b>Altre informazioni su:</b>"
#: ../revisor/modgui/glade/base_screen.glade.in.h:33
msgid "<b>Version:</b> @VERSION@-@RELEASE@"
@@ -101,9 +122,8 @@ msgid "Fedora Unity:"
msgstr "Fedora Unity:"
#: ../revisor/modgui/glade/base_screen.glade.in.h:39
-#, fuzzy
msgid "File"
-msgstr "_File"
+msgstr "File"
#: ../revisor/modgui/glade/base_screen.glade.in.h:40
#: ../revisor/modgui/glade/revisor.glade.h:43
@@ -150,27 +170,27 @@ msgstr "Client / _Server"
#: ../revisor/modgui/glade/build_type.glade.h:2
msgid "Configuration _File Mode"
-msgstr ""
+msgstr "Modalità _File di configurazione"
#: ../revisor/modgui/glade/build_type.glade.h:3
msgid "Please select the build type to use:"
-msgstr ""
+msgstr "Prego selezionare il tipo di build da eseguire:"
#: ../revisor/modgui/glade/build_type.glade.h:4
msgid "Select Build Type"
-msgstr ""
+msgstr "Seleziona tipo di build"
#: ../revisor/modgui/glade/build_type.glade.h:5
msgid "_Chroot Build"
-msgstr ""
+msgstr "Build in _Chroot"
#: ../revisor/modgui/glade/build_type.glade.h:6
msgid "_Normal Build"
-msgstr ""
+msgstr "Build _Normale"
#: ../revisor/modgui/glade/build_type.glade.h:7
msgid "_Virtualized Build"
-msgstr ""
+msgstr "Build _Virtualizzata"
#: ../revisor/modgui/glade/dialog_filechooser.glade.h:1
msgid "Choose a file or folder"
@@ -178,7 +198,7 @@ msgstr "Selezionare un file o una cartella"
#: ../revisor/modgui/glade/finished_screen.glade.h:1
msgid "<b>Compose Results Location:</b>"
-msgstr ""
+msgstr "<b>Percorso dei risultati della composizione:</b>"
#: ../revisor/modgui/glade/finished_screen.glade.h:2
#: ../revisor/modgui/glade/load_kickstart.glade.h:1
@@ -188,7 +208,7 @@ msgstr "Opzioni avanzate"
#: ../revisor/modgui/glade/finished_screen.glade.h:3
msgid "Congratulations, Compose Complete"
-msgstr ""
+msgstr "Congratulazioni, composizione completata"
#: ../revisor/modgui/glade/finished_screen.glade.h:4
msgid "Create _Jigdo"
@@ -200,11 +220,11 @@ msgstr "Crea _Torrent"
#: ../revisor/modgui/glade/finished_screen.glade.h:6
msgid "Generate _Kickstart for Install Clients"
-msgstr ""
+msgstr "Genera file _Kickstart per installazione su client"
#: ../revisor/modgui/glade/finished_screen.glade.h:7
msgid "Send _Compose to Server"
-msgstr ""
+msgstr "Invia la _composizione a un server"
#: ../revisor/modgui/glade/finished_screen.glade.h:8
msgid "Setup _DHCPD Server"
@@ -272,15 +292,15 @@ msgstr "Autenticazione Hesiod"
#: ../revisor/modgui/glade/lm_auth.glade.h:12
msgid "Hesiod LHS:"
-msgstr "Hesiod·LHS:"
+msgstr "Hesiod LHS:"
#: ../revisor/modgui/glade/lm_auth.glade.h:13
msgid "Hesiod RHS:"
-msgstr "Hesiod·RHS:"
+msgstr "Hesiod RHS:"
#: ../revisor/modgui/glade/lm_auth.glade.h:14
msgid "Kerberos 5"
-msgstr "Kerberos·5"
+msgstr "Kerberos 5"
#: ../revisor/modgui/glade/lm_auth.glade.h:15
msgid "Kerberos 5 Authentication"
@@ -288,15 +308,15 @@ msgstr "Autenticazione Kerberos 5"
#: ../revisor/modgui/glade/lm_auth.glade.h:16
msgid "Kerberos Domain Controller (KDC):"
-msgstr "Kerberos·Domain·Controller·(KDC):"
+msgstr "Kerberos Domain Controller (KDC):"
#: ../revisor/modgui/glade/lm_auth.glade.h:17
msgid "Kerberos Master Server:"
-msgstr "Kerberos·Master·Server:"
+msgstr "Kerberos Master Server:"
#: ../revisor/modgui/glade/lm_auth.glade.h:18
msgid "Kerberos Realm:"
-msgstr "Kerberos·Realm:"
+msgstr "Kerberos Realm:"
#: ../revisor/modgui/glade/lm_auth.glade.h:19
msgid "LDAP "
@@ -415,6 +435,18 @@ msgstr "Parametri personalizzati del kernel: "
msgid "Provide optional kernel parameters."
msgstr "Inserire parametri personalizzati del kernel."
+#: ../revisor/modgui/glade/lm_bootloader.glade.h:6
+msgid "These could be as simple as 'noacpi' to disable advanced power control,"
+msgstr "Per esempio 'noacpi' per disabilitare il controllo energetico avanzato, "
+
+#: ../revisor/modgui/glade/lm_bootloader.glade.h:8
+msgid "or any other relevant kernel parameters."
+msgstr "o qualsiasi altro parametro rilevante del kernel."
+
+#: ../revisor/modgui/glade/lm_bootloader.glade.h:12
+msgid "In most situations, the default should suffice."
+msgstr "Nella maggior parte dei casi, l'impostazione predefinita è sufficiente."
+
#: ../revisor/modgui/glade/lm_display.glade.h:1
msgid "Color Depth"
msgstr "Profondità colore"
@@ -446,7 +478,7 @@ msgstr "Abilitato"
#: ../revisor/modgui/glade/lm_display.glade.h:8
msgid "Enabled in reconfiguration mode"
-msgstr ""
+msgstr "Abilitato in modalità riconfigurazione"
#: ../revisor/modgui/glade/lm_display.glade.h:9
msgid "General"
@@ -580,29 +612,30 @@ msgstr "Livello di sicurezza:"
msgid "Warn"
msgstr "Attenzione"
+#: ../revisor/modgui/glade/lm_usercustomize.glade.h:2
+#: ../revisor/modgui/glade/lm_usercustomize.glade.h:10
+msgid "Customize your Live Media"
+msgstr "Personalizza il supporto Live"
+
#: ../revisor/modgui/glade/lm_usercustomize.glade.h:6
msgid "Add user to the group \"wheel\""
-msgstr ""
+msgstr "Aggiungi l'utente al gruppo \"wheel\""
#: ../revisor/modgui/glade/lm_usercustomize.glade.h:7
msgid "Automatically login this user to the Desktop"
-msgstr ""
+msgstr "Login automatico di questo utente all'ambiente desktop"
#: ../revisor/modgui/glade/lm_usercustomize.glade.h:9
msgid "Create User Account:"
msgstr "Creazione account utente:"
-#: ../revisor/modgui/glade/lm_usercustomize.glade.h:10
-msgid "Customize your Live Media"
-msgstr ""
-
#: ../revisor/modgui/glade/lm_usercustomize.glade.h:11
msgid "Dump current user profile (and omit /etc/skel)"
-msgstr ""
+msgstr "Scarica il profilo edll'utente corrente (omettendo /etc/skel)"
#: ../revisor/modgui/glade/lm_usercustomize.glade.h:12
msgid "Enable \"wheel\" group to sudo without password"
-msgstr ""
+msgstr "Abilita il gruppo \"wheel\" ad eseguire sudo senza password"
#: ../revisor/modgui/glade/lm_usercustomize.glade.h:13
msgid "Full Name:"
@@ -723,6 +756,9 @@ msgid ""
"but may provide additional functionality. Please choose the packages which "
"you would like to have installed."
msgstr ""
+"Alcuni pacchetti associati a questo gruppo non sono obbligatori per l'"
+"installazione ma forniscono funzioni addizionali. Scegliere i pacchetti "
+"che si desidera installare."
#: ../revisor/modgui/glade/package_selection.glade.h:14
msgid "dialog1"
@@ -810,6 +846,23 @@ msgid ""
"this program; if not, write to the Free Software Foundation, Inc., 51 "
"Franklin St, Fifth Floor, Boston, MA 02110-1301 USA\n"
msgstr ""
+"\n"
+"Revisor, a product of Fedora Unity\n"
+"Copyright (C) 2005 - 2008 Fedora Unity\n"
+"\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public\n"
+"License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin St, Fifth Floor, Boston, MA 02110-1301 USA\n"
#: ../revisor/modgui/glade/revisor.glade.h:22
msgid ""
@@ -833,11 +886,11 @@ msgstr "0%"
#: ../revisor/modgui/glade/revisor.glade.h:29
msgid "<b>Installation Media</b>"
-msgstr ""
+msgstr "<b>Supporto di Installazione</b>"
#: ../revisor/modgui/glade/revisor.glade.h:30
msgid "<b>Live Media</b>"
-msgstr ""
+msgstr "<b>Supporto Live</b>"
#: ../revisor/modgui/glade/revisor.glade.h:31
msgid "<i>Initializing GUI</i>"
@@ -879,7 +932,7 @@ msgstr "Directory di destinazione:"
#: ../revisor/modgui/glade/revisor.glade.h:42
msgid "Dynamically Set Header Label"
-msgstr ""
+msgstr "Imposta etichetta dell'Header dinamicamente"
#: ../revisor/modgui/glade/revisor.glade.h:44
msgid "Message"
@@ -924,7 +977,7 @@ msgstr "Inizializzazione di Revisor."
#: ../revisor/modgui/glade/revisor.glade.h:53
msgid "Select Media Types"
-msgstr ""
+msgstr "Seleziona titpi di supporto"
#: ../revisor/modgui/glade/revisor.glade.h:54
msgid "Select Repositories:"
@@ -932,7 +985,7 @@ msgstr "Selezionare i repository:"
#: ../revisor/modgui/glade/revisor.glade.h:55
msgid "Spin Target:"
-msgstr ""
+msgstr "Target della spin:"
#: ../revisor/modgui/glade/revisor.glade.h:56
msgid "Translators"
@@ -1036,7 +1089,7 @@ msgstr "Nome:"
#: ../revisor/modgui/glade/revisor_configuration.glade.h:19
msgid "Protect"
-msgstr ""
+msgstr "Protetto"
#: ../revisor/modgui/glade/revisor_configuration.glade.h:20
msgid "Repository Information"
@@ -1056,19 +1109,19 @@ msgstr "<b>Tipi di supporto</b>"
#: ../revisor/modgui/glade/select_media_advanced.glade.h:3
msgid "Installation Media Types"
-msgstr ""
+msgstr "Tipi di supporto Installazione"
#: ../revisor/modgui/glade/select_media_advanced.glade.h:4
msgid "Live Media Types"
-msgstr ""
+msgstr "Tipi di supporto Live"
#: ../revisor/modgui/glade/select_media_advanced.glade.h:6
msgid "Rebrand Media"
-msgstr ""
+msgstr "Supporto Rebrand"
#: ../revisor/modgui/glade/select_media_advanced.glade.h:7
msgid "Rescue / Utility Media"
-msgstr ""
+msgstr "Supporto di Ripristino / Utility"
#: ../revisor/modgui/glade/select_media_advanced.glade.h:8
#: ../revisor/modgui/glade/select_media.glade.h:7
@@ -1077,7 +1130,7 @@ msgstr "Selezione tipo(i) di supporto"
#: ../revisor/modgui/glade/select_media_advanced.glade.h:9
msgid "Virtualization Media"
-msgstr ""
+msgstr "SUpporto di Virtualizzazione"
#: ../revisor/modgui/glade/select_media.glade.h:1
#: ../revisor/modgui/glade/select_media_installation.glade.h:1
@@ -1113,15 +1166,15 @@ msgstr "Albero di installazione"
#: ../revisor/modgui/glade/select_media_installation.glade.h:5
msgid "PXE Payload"
-msgstr ""
+msgstr "Payload PXE"
#: ../revisor/modgui/glade/select_media_installation.glade.h:7
msgid "Select Installation Media Type(s)"
-msgstr ""
+msgstr "Seleziona tipo di supporto di installazione"
#: ../revisor/modgui/glade/select_media_installation.glade.h:8
msgid "Unified ISO Image"
-msgstr ""
+msgstr "Immagine ISO Unified"
#: ../revisor/modgui/glade/select_media_live.glade.h:2
msgid "Optical"
@@ -1129,7 +1182,7 @@ msgstr "Ottico"
#: ../revisor/modgui/glade/select_media_live.glade.h:4
msgid "Select Live Media Type(s)"
-msgstr ""
+msgstr "Seleziona tipo di supporto Live"
#: ../revisor/modgui/glade/select_media_live.glade.h:5
msgid "USB Hard Disk"
@@ -1149,7 +1202,7 @@ msgstr "Immagine di ripristino"
#: ../revisor/modgui/glade/select_media_utility.glade.h:4
msgid "Select Utility Media Type(s)"
-msgstr ""
+msgstr "Seleziona tipo di supporto Utility"
#: ../revisor/modgui/glade/select_media_virtualization.glade.h:1
msgid "<b>Virtualization Media Types</b>"
@@ -1161,7 +1214,7 @@ msgstr "Guest KVM"
#: ../revisor/modgui/glade/select_media_virtualization.glade.h:4
msgid "Select Virtualization Media Type(s)"
-msgstr ""
+msgstr "Seleziona tipo di supporto Virtualizzazione"
#: ../revisor/modgui/glade/select_media_virtualization.glade.h:5
msgid "VMWare Appliance"
@@ -1200,7 +1253,7 @@ msgstr "Benvenuto in Revisor, da Fedora Unity"
#: ../revisor.py:34
msgid "Cannot find anaconda-runtime in /usr/lib/anaconda-runtime"
-msgstr ""
+msgstr "Impossibile trovare il runtime di anaconda in /usr/lib/anaconda-runtime"
#: ../revisor/base.py:104
msgid "Running Revisor in CLI mode..."
@@ -1223,7 +1276,7 @@ msgstr "Apertura di /usr/bin/htmlview %s%s"
#: ../revisor/base.py:178
#, python-format
msgid "Cannot fork process showing help, please use %s%s"
-msgstr ""
+msgstr "Impossibile eseguire il processo per mostrare l'help, usare %s%s"
#: ../revisor/base.py:180
#, python-format
@@ -1241,37 +1294,59 @@ msgstr "Caricamento configurazione da %s"
#: ../revisor/base.py:197 ../revisor/base.py:258 ../revisor/base.py:265
#: ../revisor/base.py:275 ../revisor/base.py:285 ../revisor/cfg.py:473
-#: ../revisor/cfg.py:484 ../revisor/cfg.py:497 ../revisor/pkgorder.py:172
-#: ../revisor/pkgorder.py:177 ../revisor/pkgorder.py:188
-#: ../revisor/pkgorder.py:191 ../revisor/pkgorder.py:200
-#: ../revisor/pkgorder.py:209
+#: ../revisor/cfg.py:484 ../revisor/cfg.py:497 ../revisor/pkgorder.py:178
+#: ../revisor/pkgorder.py:183 ../revisor/pkgorder.py:194
+#: ../revisor/pkgorder.py:197 ../revisor/pkgorder.py:206
+#: ../revisor/pkgorder.py:215
#, python-format
msgid "Using deprecated YUM function: %s()"
-msgstr ""
+msgstr "Uso della funzione deprecata di YUM: %s()"
#: ../revisor/base.py:199
#, python-format
msgid ""
"yum.YumBase.doConfigSetup failed, probably an invalid configuration file %s"
msgstr ""
+"yum.YumBase.doConfigSetup fallita, probabilmente il file di configurazione %s non è valido"
#: ../revisor/base.py:202
#, python-format
msgid "Bumping YUMs debuglevel (%d) to our debuglevel (%d)"
-msgstr ""
+msgstr "Impostazione del debuglevel di YUM (%d) a quello di Revisor (%d)"
#: ../revisor/base.py:204
#, python-format
msgid "YUMs debuglevel now %d"
-msgstr ""
+msgstr "Il livello di debug di YUM ora è %d"
#: ../revisor/base.py:239
msgid "Another application is running which is accessing software information."
msgstr ""
+"Un'altra applicazione in esecuzione sta accedendo alle informazioni software."
#: ../revisor/base.py:244
msgid "Fatal Error: Unable to retrieve software information.\n"
-msgstr ""
+msgstr "Errore fatale: impossibile recuperare le informazioni sul software.\n"
+
+#: ../revisor/base.py:245
+msgid "\tThis could be caused by one of the following:\n"
+msgstr "\tQuesto potrebbe essere causato da uno o più dei seguenti:\n"
+
+#: ../revisor/base.py:246
+msgid "\t - not having a network connection available,\n"
+msgstr "\t - connessione di rete non disponibile,\n"
+
+#: ../revisor/base.py:247
+msgid "\t - Server refusing connections,\n"
+msgstr "\t - il server nega le connessioni,\n"
+
+#: ../revisor/base.py:248
+msgid "\t - Using a mirror that isn't fully synchronized,\n"
+msgstr "\t - uso di un mirror non completamente sincronizzato,\n"
+
+#: ../revisor/base.py:249
+msgid "\t - Misconfigured repositories."
+msgstr "\t - repositori con configurazione errata."
#: ../revisor/base.py:254
msgid "Setting up a Transaction Set"
@@ -1279,17 +1354,19 @@ msgstr "Impostazione del set di transazione"
#: ../revisor/base.py:261
msgid "Getting myself a piece of the RPMDB"
-msgstr ""
+msgstr "Riserva di una parte di RPMDB"
#: ../revisor/base.py:268
msgid ""
"Apparently we're running on an Enterprise Linux system (we can tell from the "
"way yum sets up the RPM Database)"
msgstr ""
+"Sembra che l'ambiente di esecuzione sia un Enterprise Linux (dal modo in cui "
+"yum imposta il database di RPM)"
#: ../revisor/base.py:271
msgid "Getting Repository Information"
-msgstr ""
+msgstr "Recupero informazioni sul repositorio"
#: ../revisor/base.py:278
#, python-format
@@ -1298,7 +1375,7 @@ msgstr "Elenco architetture = %s"
#: ../revisor/base.py:280
msgid "Getting the Package Sacks"
-msgstr ""
+msgstr "Recupero dei Package Sack"
#: ../revisor/base.py:290
#, python-format
@@ -1325,117 +1402,125 @@ msgid ""
"What we're getting from pykickstart is: %d groups, %d packages and %d "
"excluded packages. %d packages are being explicitly ignored."
msgstr ""
+"Il risultato di pykickstart è: %d gruppi, %d pacchetti e %d pacchetti esclusi. "
+"%d pacchetti sono stati esplicitamente ignorati."
-#: ../revisor/base.py:329 ../revisor/base.py:618
+#: ../revisor/base.py:329 ../revisor/base.py:625
msgid "Select kickstart packages"
-msgstr ""
+msgstr "Selezione pacchetti kickstart"
#: ../revisor/base.py:337
#, python-format
msgid "Using pkgsack excludes, the list of packages to exclude is now: %r"
msgstr ""
+"Utilizzo delle esclusioni pkgsack, la lista dei pacchetti da escludere ora è: %r"
-#: ../revisor/base.py:354 ../revisor/base.py:646
+#: ../revisor/base.py:354 ../revisor/base.py:653
msgid "Appending group @core"
-msgstr ""
+msgstr "Aggiunta del gruppo @core"
-#: ../revisor/base.py:369 ../revisor/base.py:661
+#: ../revisor/base.py:369 ../revisor/base.py:668
msgid "Appending group @base"
-msgstr ""
+msgstr "Aggiunta del gruppo @base"
-#: ../revisor/base.py:381 ../revisor/base.py:672
+#: ../revisor/base.py:388 ../revisor/base.py:679
#, python-format
msgid "Found group: %s"
msgstr "Trovato gruppo: %s"
-#: ../revisor/base.py:387
+#: ../revisor/base.py:394
#, python-format
msgid "Repository metadata cannot be found: %s: %s"
-msgstr ""
+msgstr "Impossibile trovare i metadati del repositorio: %s: %s"
-#: ../revisor/base.py:390
+#: ../revisor/base.py:397
#, python-format
msgid "Group not found: %s"
msgstr "Gruppo non trovato: %s"
-#: ../revisor/base.py:402
+#: ../revisor/base.py:409
#, python-format
msgid "Selecting required packages for group %s"
msgstr "Selezione dei pacchetti necessari per il gruppo %s"
-#: ../revisor/base.py:406 ../revisor/base.py:427 ../revisor/base.py:448
-#: ../revisor/base.py:467
+#: ../revisor/base.py:413 ../revisor/base.py:434 ../revisor/base.py:455
+#: ../revisor/base.py:474
#, python-format
msgid "Including %s"
msgstr "Inclusione di %s"
-#: ../revisor/base.py:416 ../revisor/base.py:436
+#: ../revisor/base.py:423
#, python-format
-msgid "From Groups: Adding %s-%s:%s-%s.%s to transaction"
-msgstr "Dai gruppi: Aggiunta %s-%s:%s-%s.%s alla transazione"
+msgid "From Groups (required): Adding %s-%s:%s-%s.%s to transaction"
+msgstr "Dai gruppi (necessario): Aggiunto %s-%s:%s-%s.%s alla transazione"
-#: ../revisor/base.py:423
+#: ../revisor/base.py:430
#, python-format
msgid "Selecting default packages for group %s"
msgstr "Selezione dei pacchetti predefiniti per il gruppo %s"
#: ../revisor/base.py:443
#, python-format
+msgid "From Groups (default): Adding %s-%s:%s-%s.%s to transaction"
+msgstr "Dai gruppi (predefinito): Aggiunto %s-%s:%s-%s.%s alla transazione"
+
+#: ../revisor/base.py:450
+#, python-format
msgid "Selecting optional packages for group %s"
msgstr "Selezione dei pacchetti opzionali per il gruppo %s"
-#: ../revisor/base.py:457 ../revisor/base.py:476
+#: ../revisor/base.py:464 ../revisor/base.py:483
#, python-format
-msgid "From Groups --optional: Adding %s-%s:%s-%s.%s to transaction"
-msgstr ""
+msgid "From Groups (optional): Adding %s-%s:%s-%s.%s to transaction"
+msgstr "Dai gruppi (opzionale): Aggiunto %s-%s:%s-%s.%s alla transazione"
-#: ../revisor/base.py:463
+#: ../revisor/base.py:470
#, python-format
msgid "No include parameter for group %s, using defaults"
-msgstr ""
+msgstr "Nessun paramentro di inclusione per il gruppo %s, verrà usato il default"
-#: ../revisor/base.py:485 ../revisor/base.py:689
+#: ../revisor/base.py:492 ../revisor/base.py:696
#, python-format
msgid "Testing condition: %s / %s"
msgstr "Verifica condizione: %s / %s"
-#: ../revisor/base.py:499
+#: ../revisor/base.py:506
#, python-format
msgid "From package list, including: %s"
msgstr "Dalla lista pacchetti, inclusione: %s"
-#: ../revisor/base.py:502
+#: ../revisor/base.py:509
#, python-format
msgid "Package %s is in excludeList, continuing"
-msgstr ""
+msgstr "Il pacchetto %s è nella excludeList, continuo"
-#: ../revisor/base.py:510
+#: ../revisor/base.py:517
msgid "No packages found!"
msgstr "Nessun pacchetto trovato!"
-#: ../revisor/base.py:515 ../revisor/base.py:544
+#: ../revisor/base.py:522 ../revisor/base.py:551
#, python-format
msgid "From Packages: Adding %s-%s:%s-%s.%s to transaction"
msgstr "Dai pacchetti: Aggiunta %s-%s:%s-%s.%s alla transazione"
-#: ../revisor/base.py:522
+#: ../revisor/base.py:529
#, python-format
msgid "Could not find package '%s', searching..."
msgstr "Impossibile trovare il pacchetto '%s', ricerca..."
-#: ../revisor/base.py:535
+#: ../revisor/base.py:542
#, python-format
msgid "Found packages matching '%s': %s"
msgstr "Trovati pacchetti corrispondenti a '%s': %s"
-#: ../revisor/base.py:546
+#: ../revisor/base.py:553
#, python-format
msgid "From Packages: Not adding %s now because it is in the ignore list"
msgstr ""
"Per l'opzione Packages: %s non aggiunto perchè presenta nell'elenco "
"pacchetti da ignorare "
-#: ../revisor/base.py:557
+#: ../revisor/base.py:564
#, python-format
msgid ""
"More then one package found for %s-%s-%s.%s - going to add them all to the "
@@ -1444,29 +1529,31 @@ msgstr ""
"Trovato più di un pacchetto per %s-%s-%s.%s - verranno tutti aggiunti alla "
"transazione"
-#: ../revisor/base.py:559
+#: ../revisor/base.py:566
#, python-format
msgid "Could not find package %s-%s-%s.%s"
msgstr "Impossibile trovare il pacchetto %s-%s-%s.%s"
-#: ../revisor/base.py:562
+#: ../revisor/base.py:569
#, python-format
msgid "From Packages (exact string %s-%s-%s.%s), selecting %s-%s-%s.%s"
msgstr "Dai pacchetti (stringa esatta %s-%s-%s.%s), selezionato %s-%s-%s.%s"
-#: ../revisor/base.py:582 ../revisor/base.py:737
+#: ../revisor/base.py:589 ../revisor/base.py:744
#, python-format
msgid "From Excludes: Removing %s-%s:%s-%s.%s from transaction"
msgstr "Da esclusioni: Rimozione %s-%s:%s-%s.%s dalla transazione"
-#: ../revisor/base.py:585 ../revisor/base.py:740
+#: ../revisor/base.py:592 ../revisor/base.py:747
#, 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 ""
+"Tentativo di escludere un pacchetto non disponibile nei repositori caricati, "
+"o che non è stato aggiunto alla transazione: %s"
-#: ../revisor/base.py:591
+#: ../revisor/base.py:598
#, python-format
msgid ""
"\n"
@@ -1478,80 +1565,92 @@ msgid ""
"You can continue with these minor errors but obviously the results may not "
"be what you expected."
msgstr ""
+"\n"
+"I seguenti errori sono occorso mentre si selezionaveno gruppi e pacchetti da "
+"kickstart:\n"
+"\n"
+"- %s\n"
+"\n"
+"E' possibile continuare comunque ignorando queste anomalie minori, ma il "
+"risultato potrebbe non corrispondere a quanto richiesto."
-#: ../revisor/base.py:597
+#: ../revisor/base.py:604
msgid "This is what was selected to be installed:"
msgstr "Riepilogo della selezione per l'installazione:"
-#: ../revisor/base.py:610
+#: ../revisor/base.py:617
#, python-format
msgid ""
"What we're getting from pykickstart is: %d groups, %d packages and %d "
"excluded packages."
msgstr ""
+"Risultati di pykickstart: %d gruppi, %d pacchetti e %d pacchetti esclusi."
-#: ../revisor/base.py:629
+#: ../revisor/base.py:636
#, python-format
msgid "Using pkgsack excludes, excluded packages is now: %r"
-msgstr ""
+msgstr "Uso degli excludes di pkgsack, i pacchetti esclusi sono ora: %r"
-#: ../revisor/base.py:669
+#: ../revisor/base.py:676
#, python-format
msgid "No such group %s"
msgstr "Il gruppo %s non esiste"
-#: ../revisor/base.py:726
+#: ../revisor/base.py:733
#, python-format
msgid "Adding %s-%s:%s-%s.%s"
msgstr "Aggiunta di %s-%s:%s-%s.%s"
-#: ../revisor/base.py:758
+#: ../revisor/base.py:765
msgid "Initting progress bar for "
msgstr "Inizializzazione barra di avanzamento per "
-#: ../revisor/base.py:765
+#: ../revisor/base.py:772
msgid "Apparently we have not yet entered the Build Media stage"
-msgstr ""
+msgstr "Apparentemente, lo stadio Creazione Media non è ancora iniziato"
-#: ../revisor/base.py:794
+#: ../revisor/base.py:801 ../revisor/misc.py:156
#, python-format
msgid "Checking dependencies for %s.%s"
msgstr "Controllo dipendenze per %s.%s"
#. pbar.cur_task += 1.0
-#: ../revisor/base.py:816
+#: ../revisor/base.py:823 ../revisor/misc.py:183
#, python-format
msgid "Unresolvable dependency %s %s %s in %s.%s"
msgstr "Dipendenza non risolta: %s %s %s in %s.%s"
-#: ../revisor/base.py:823
+#: ../revisor/base.py:830 ../revisor/misc.py:190
#, python-format
msgid "Added %s-%s:%s-%s.%s for %s-%s:%s-%s.%s (requiring %s %s %s)"
msgstr "Aggiunta di %s-%s:%s-%s.%s per %s-%s:%s-%s.%s (che richiede %s·%s·%s)"
-#: ../revisor/base.py:826
+#: ../revisor/base.py:833 ../revisor/misc.py:196
msgid "Checking dependencies - allowing conflicts within the package set"
msgstr "Controllo dipendenze - conflitti tollerati nel set di pacchetti"
-#: ../revisor/base.py:827 ../revisor/base.py:856
+#: ../revisor/base.py:834 ../revisor/base.py:863
msgid "Resolving Dependencies"
msgstr "Risoluzione delle dipendenze"
-#: ../revisor/base.py:849
+#: ../revisor/base.py:856
#, python-format
msgid ""
"The following packages were excluded using the kickstart package manifest, "
"but were included for dependency resolving:\n"
" - %s"
msgstr ""
+"I seguenti pacchetti sono stati esclusi usando il manifest dei pacchetti di "
+"kickstart, ma sono stati reinclusi per risolvere dipendenze:\n"
+" - %s"
-#: ../revisor/base.py:855
+#: ../revisor/base.py:862
msgid ""
"Checking dependencies - not allowing any conflicts within the package set"
msgstr ""
"Controllo dipendenze - non sono permessi conflitti nel set di pacchetti"
-#: ../revisor/base.py:883
+#: ../revisor/base.py:890
#, python-format
msgid ""
"Unable to resolve dependencies for some packages selected:\n"
@@ -1563,16 +1662,16 @@ msgstr ""
"%s"
#. End of dependency resolving
-#: ../revisor/base.py:887 ../revisor/image.py:97
+#: ../revisor/base.py:894 ../revisor/image.py:97
msgid "Unable to build transaction"
msgstr "Impossibile creare la transazione"
-#: ../revisor/base.py:892 ../revisor/image.py:102
+#: ../revisor/base.py:899 ../revisor/image.py:102
#, python-format
msgid "Succesfully built transaction: ret %s, msg %s"
msgstr "Transazione creata correttamente: ret %s, msg %s"
-#: ../revisor/base.py:898
+#: ../revisor/base.py:905
#, python-format
msgid ""
"Errors where encountered while downloading package headers:\n"
@@ -1583,194 +1682,209 @@ msgstr ""
"\n"
"%s"
-#: ../revisor/base.py:907
+#: ../revisor/base.py:914
msgid ""
"The package set after dependency resolving does not match the packages "
"selected in the kickstart manifest"
msgstr ""
+"L'insieme di pacchetti determinato dopo la risoluzione delle dipendenze non "
+"corrisponde ai pacchetti selezionati nel manifest di kickstart"
-#: ../revisor/base.py:931
+#: ../revisor/base.py:941
#, python-format
msgid "No such repository: %s"
msgstr "Repository non trovato: %s"
-#: ../revisor/base.py:933
+#: ../revisor/base.py:943
#, python-format
msgid "Enabling %s repository"
msgstr "Repository %s abilitato"
-#: ../revisor/base.py:951
-#, fuzzy, python-format
+#: ../revisor/base.py:962
+#, python-format
msgid "Disabling %s repository"
-msgstr "Repository %s abilitato"
+msgstr "Repository %s disabilitato"
-#: ../revisor/base.py:972
+#: ../revisor/base.py:969
+msgid "Creating a list of SRPMs"
+msgstr "Creazione dell'elenco di SRPM in corso"
+
+#: ../revisor/base.py:984
+msgid "Source RPM PO already in the list"
+msgstr "RPM dei sorgenti già presente nell'elenco"
+
+#: ../revisor/base.py:986
+#, python-format
+msgid "Source RPM found in non-source repository %s"
+msgstr "Pacchetto RPM di sorgenti trovato nel repositorio (non di sorgenti) %s"
+
+#: ../revisor/base.py:988
#, python-format
msgid "Error: Cannot find a source rpm for %s"
msgstr "Errore: impossibile trovare il pacchetto rpm sorgente per %s"
-#: ../revisor/base.py:974 ../revisor/modgui/build_media.py:106
+#: ../revisor/base.py:990 ../revisor/modgui/build_media.py:106
#: ../revisor/modgui/build_media.py:142 ../revisor/modgui/build_media.py:219
msgid "Downloading Source Packages"
msgstr "Download pacchetti dei sorgenti"
-#: ../revisor/base.py:1003 ../revisor/progress.py:441
+#: ../revisor/base.py:1019 ../revisor/progress.py:441
#, python-format
msgid "Downloading %s"
msgstr "Download di %s"
-#: ../revisor/base.py:1033 ../revisor/modgui/build_media.py:101
+#: ../revisor/base.py:1049 ../revisor/modgui/build_media.py:101
#: ../revisor/modgui/build_media.py:214
msgid "Downloading Packages"
msgstr "Download dei pacchetti"
-#: ../revisor/base.py:1042
+#: ../revisor/base.py:1058
msgid "Unable to find a suitable mirror."
msgstr "Impossibile trovare un mirror idoneo."
-#: ../revisor/base.py:1054
+#: ../revisor/base.py:1070
#, python-format
msgid "Errors were encountered while downloading packages: %s"
msgstr "Si sono verificati degli errori durante il download dei pacchetti: %s"
-#: ../revisor/base.py:1095
+#: ../revisor/base.py:1111
#, python-format
msgid "Overriding auto package selection with user package selection for %s..."
msgstr ""
"Selezione automatica dei pacchetti prevaricata dalla selezione utente per %"
"s..."
-#: ../revisor/base.py:1108
+#: ../revisor/base.py:1124
#, python-format
msgid "Adding required package %s-%s:%s-%s.%s"
msgstr "Aggiunta del pacchetto necessario %s-%s:%s-%s.%s"
#. This list has already been resolved
-#: ../revisor/base.py:1111
+#: ../revisor/base.py:1127
#, python-format
msgid "%s. This is a required package."
msgstr "%s. Questo è un pacchetto necessario."
-#: ../revisor/base.py:1123
+#: ../revisor/base.py:1139
#, python-format
msgid "Adding suggested package %s-%s:%s-%s.%s"
msgstr "Aggiunta del pacchetto consigliato %s-%s:%s-%s.%s"
-#: ../revisor/base.py:1133
+#: ../revisor/base.py:1149
#, python-format
msgid "Packages that do not need to be on the media: %s"
-msgstr ""
+msgstr "Pacchetti non necessari sul supporto: %s"
-#: ../revisor/base.py:1158 ../revisor/base.py:1184
+#: ../revisor/base.py:1174 ../revisor/base.py:1200
msgid "Did not succeed in adding in all required packages"
msgstr "Impossibile aggiungere tutti i pacchetti necessari"
-#: ../revisor/base.py:1192
+#: ../revisor/base.py:1208
msgid "Populating statistics"
msgstr "Popolamento statistiche"
-#: ../revisor/base.py:1208
-#, fuzzy, python-format
+#: ../revisor/base.py:1224
+#, python-format
msgid "Package %s-%s:%s-%s.%s does not seem to have a archivesize header"
msgstr ""
-"Il pacchetto %s-%s:%s-%s.%s non contiene il dato sulla dimensione nell'header"
+"Il pacchetto %s-%s:%s-%s.%s non contiene il dato archivesize nell'header"
-#: ../revisor/base.py:1216
-#, fuzzy, python-format
+#: ../revisor/base.py:1232
+#, python-format
msgid "Package %s-%s:%s-%s.%s does not seem to have a installedsize header"
msgstr ""
-"Il pacchetto %s-%s:%s-%s.%s non contiene il dato sulla dimensione nell'header"
+"Il pacchetto %s-%s:%s-%s.%s non contiene il dato installedsize nell'header"
-#: ../revisor/base.py:1224
-#, fuzzy, python-format
+#: ../revisor/base.py:1240
+#, python-format
msgid "Package %s-%s:%s-%s.%s does not seem to have a packagesize header"
msgstr ""
-"Il pacchetto %s-%s:%s-%s.%s non contiene il dato sulla dimensione nell'header"
+"Il pacchetto %s-%s:%s-%s.%s non contiene il dato packagesize nell'header"
-#: ../revisor/base.py:1234
+#: ../revisor/base.py:1250
#, python-format
msgid "Total size of all packages (archivesize): %s %s"
-msgstr ""
+msgstr "Dimensione totale di tutti i pacchetti (archivesize): %s %s"
-#: ../revisor/base.py:1235
+#: ../revisor/base.py:1251
#, python-format
msgid "Total size of all packages, (installedsize): %s %s"
-msgstr ""
+msgstr "Dimensione totale di tutti i pacchetti (installedsize): %s %s"
-#: ../revisor/base.py:1236
+#: ../revisor/base.py:1252
#, python-format
msgid "Total size of all packages, (packagesize): %s %s"
-msgstr ""
+msgstr "Dimensione totale di tutti i pacchetti (packagesize): %s %s"
-#: ../revisor/base.py:1271
+#: ../revisor/base.py:1287
#, python-format
msgid "Report of the %d most space consuming packages"
msgstr "Riepilogo dei %d pacchetti di maggiori dimensioni"
-#: ../revisor/base.py:1366 ../revisor/base.py:1380 ../revisor/base.py:2001
+#: ../revisor/base.py:1382 ../revisor/base.py:1396 ../revisor/base.py:2017
#, python-format
msgid "Creating pkgdir: %s"
msgstr "Creazione pkgdir: %s"
#. Now for each txmbr in
#. Link the localPkg() result into the build tree
-#: ../revisor/base.py:1389
+#: ../revisor/base.py:1405
msgid "Linking in packages"
msgstr "Creazione link ai pacchetti"
-#: ../revisor/base.py:1408 ../revisor/base.py:2025
+#: ../revisor/base.py:1424 ../revisor/base.py:2041
#, python-format
msgid "Package hard link failed: %s: %s"
msgstr "Hardlink al pacchetto fallito: %s: %s"
-#: ../revisor/base.py:1413 ../revisor/base.py:2030
+#: ../revisor/base.py:1429 ../revisor/base.py:2046
#, python-format
msgid "Copying: %s to %s"
msgstr "Copia: %s su %s"
-#: ../revisor/base.py:1416 ../revisor/base.py:2033
+#: ../revisor/base.py:1432 ../revisor/base.py:2049
#, python-format
msgid "Symlinking: %s to %s"
msgstr "Creazione link simbolico: %s su %s"
-#: ../revisor/base.py:1419 ../revisor/base.py:2036
+#: ../revisor/base.py:1435 ../revisor/base.py:2052
msgid "Package symlink succeeded"
msgstr "Symlink al pacchetto creato con successo"
-#: ../revisor/base.py:1421 ../revisor/base.py:1428 ../revisor/base.py:2038
-#: ../revisor/base.py:2045
+#: ../revisor/base.py:1437 ../revisor/base.py:1444 ../revisor/base.py:2054
+#: ../revisor/base.py:2061
#, python-format
msgid "Package link failed, trying copy: %s: %s"
msgstr "Link al pacchetto fallito, tentativo di copia: %s: %s"
-#: ../revisor/base.py:1438
+#: ../revisor/base.py:1454
msgid "Creating Repository Information"
msgstr "Creazione delle informazioni del repository"
#. FIXME: Optionally recompose installer images
-#: ../revisor/base.py:1453
+#: ../revisor/base.py:1469
msgid "Building Installation Images"
msgstr "Creazione immagini di installazione"
-#: ../revisor/base.py:1459
+#: ../revisor/base.py:1475
msgid "Using already existing installer images"
-msgstr ""
+msgstr "Uso delle immagini di installazione già esistenti"
-#: ../revisor/base.py:1473
+#: ../revisor/base.py:1489
msgid "Linking in release notes"
msgstr "Collegamento alle note di rilascio"
-#: ../revisor/base.py:1485
+#: ../revisor/base.py:1501
#, python-format
msgid "Copying updates.img from %s to %s"
msgstr "Copia di updates.img da %s a %s"
-#: ../revisor/base.py:1494 ../revisor/pungi.py:412
+#: ../revisor/base.py:1510 ../revisor/pungi.py:414
#, python-format
msgid "copy_dir '%s' not accessible"
msgstr "copy_dir '%s' non accessibile"
-#: ../revisor/base.py:1505
+#: ../revisor/base.py:1521
#, python-format
msgid "Size of the installation tree is %s MB"
msgstr "La dimensione dell'albero di installazione è %s MB"
@@ -1779,102 +1893,101 @@ msgstr "La dimensione dell'albero di installazione è %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:1555
+#: ../revisor/base.py:1571
msgid "Running pkgorder"
msgstr "Esecuzione di pkgorder"
-#: ../revisor/base.py:1618
+#: ../revisor/base.py:1634
msgid "Appending group core and base"
-msgstr ""
+msgstr "Aggiunta dei gruppi core e base"
-#: ../revisor/base.py:1625
-#, fuzzy, python-format
+#: ../revisor/base.py:1641
+#, python-format
msgid "Appending default group %s"
-msgstr "Selezione dei pacchetti predefiniti per il gruppo %s"
+msgstr "Aggiunta del gruppo predefinito %s"
-#: ../revisor/base.py:1665
-#, fuzzy, python-format
+#: ../revisor/base.py:1681
+#, python-format
msgid "Appending non-default group %s"
-msgstr "Selezione dei pacchetti predefiniti per il gruppo %s"
+msgstr "Aggiunta del gruppo non predefinito %s"
-#: ../revisor/base.py:1671
-#, fuzzy, python-format
+#: ../revisor/base.py:1687
+#, python-format
msgid "Appending non-default support group %s"
-msgstr "Selezione dei pacchetti predefiniti per il gruppo %s"
+msgstr "Aggiunta del gruppo di supporto non predefinito %s"
-#: ../revisor/base.py:1738
+#: ../revisor/base.py:1754
#, python-format
msgid "Not running package ordering, using file %s instead"
-msgstr ""
+msgstr "Ordinamento dei pacchetti non eseguito, file %s in uso per l'ordinamento"
-#: ../revisor/base.py:1740
-#, fuzzy
+#: ../revisor/base.py:1756
msgid "Not running package ordering"
-msgstr "Esecuzione di pkgorder"
+msgstr "Esecuzione dell'odinamento dei pacchetti non eseguita"
-#: ../revisor/base.py:1772
+#: ../revisor/base.py:1788
msgid "^Install using kickstart"
-msgstr ""
+msgstr "^Installazione usando kickstart"
#. Split Tree
-#: ../revisor/base.py:1795
+#: ../revisor/base.py:1811
#, python-format
msgid "Splitting Build Tree (%s)"
-msgstr ""
+msgstr "Suddivisione del build tree (%s)"
#. Split repo
-#: ../revisor/base.py:1801
+#: ../revisor/base.py:1817
#, python-format
msgid "Splitting Repository (%s)"
-msgstr ""
+msgstr "Suddivisione del repositorio (%s)"
-#: ../revisor/base.py:1815 ../revisor/modgui/build_media.py:244
+#: ../revisor/base.py:1831 ../revisor/modgui/build_media.py:244
#, python-format
msgid "Creating %s ISO Image #%d"
msgstr "Creazione immagine ISO %s #%d"
-#: ../revisor/base.py:1820 ../revisor/modgui/build_media.py:248
+#: ../revisor/base.py:1836 ../revisor/modgui/build_media.py:248
#, python-format
msgid "Creating %s ISO Image"
msgstr "Creazione immagine ISO %s"
#. 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:1834
+#: ../revisor/base.py:1850
msgid "Implanting MD5 into ISO Images"
msgstr "Inserimento MD5 nelle immagini ISO"
#. mediatype = built_image["mediatype"]
#. if not mediatype == 'source':
-#: ../revisor/base.py:1842
+#: ../revisor/base.py:1858
#, python-format
msgid "Implanting md5 into ISO Image: %s"
msgstr "Inserimento md5 nell'immagine ISO: %s"
-#: ../revisor/base.py:1848
+#: ../revisor/base.py:1864
msgid "Cannot implant ISO md5sum"
-msgstr ""
+msgstr "Impossibile impiantare la md5sum della ISO"
#. Do some SHA1SUMMONING
-#: ../revisor/base.py:1856
+#: ../revisor/base.py:1872
msgid "Creating SHA1SUMs for Images"
msgstr "Creazione SHA1SUM per le immagini"
-#: ../revisor/base.py:1872
+#: ../revisor/base.py:1888
msgid "Creating Rescue ISO Image"
msgstr "Creazione immagine ISO di ripristino"
-#: ../revisor/base.py:1932
-#, fuzzy, python-format
+#: ../revisor/base.py:1948
+#, python-format
msgid "Copying %s to %s (%d files)"
-msgstr "Copia di %s su %s"
+msgstr "Copia di %s su %s (%d file)"
-#: ../revisor/base.py:1936
-#, fuzzy, python-format
+#: ../revisor/base.py:1952
+#, python-format
msgid "Moving %s to %s (%d files)"
-msgstr "Copia di %s su %s"
+msgstr "Spostamento di %s su %s (%d file)"
-#: ../revisor/base.py:1939
+#: ../revisor/base.py:1955
#, python-format
msgid ""
"Moving of the source tree failed (trying copy):\n"
@@ -1885,7 +1998,7 @@ msgstr ""
"\n"
"%s"
-#: ../revisor/base.py:1942
+#: ../revisor/base.py:1958
#, python-format
msgid ""
"Copying of the source tree failed:\n"
@@ -1896,12 +2009,12 @@ msgstr ""
"\n"
"%s"
-#: ../revisor/base.py:1947 ../revisor/pungi.py:408
+#: ../revisor/base.py:1963 ../revisor/pungi.py:410
#, python-format
msgid "Copying %s to %s"
msgstr "Copia di %s su %s"
-#: ../revisor/base.py:1951
+#: ../revisor/base.py:1967
#, python-format
msgid ""
"Copying of the installation tree failed:\n"
@@ -1912,42 +2025,41 @@ msgstr ""
"\n"
"%s"
-#: ../revisor/base.py:1957
+#: ../revisor/base.py:1973
msgid "Creating ext3 filesystem"
msgstr "Creazione filesystem ext3"
-#: ../revisor/base.py:1964
+#: ../revisor/base.py:1980
msgid "Configuring System"
msgstr "Configurazione del sistema"
#. Now for each txmbr in
#. Link the localPkg() result into the build tree
-#: ../revisor/base.py:2010
-#, fuzzy
+#: ../revisor/base.py:2026
msgid "Linking in Source packages"
-msgstr "Creazione link ai pacchetti"
+msgstr "Creazione link ai pacchetti dei sorgenti"
-#: ../revisor/base.py:2065
+#: ../revisor/base.py:2081
#, python-format
msgid "Setting rundir to %s"
msgstr "Impostazione di rundir a %s"
-#: ../revisor/base.py:2071
+#: ../revisor/base.py:2087
#, python-format
msgid "Directory %s could not be created. Aborting"
msgstr "Impossibile creare la directory %s. Terminato"
-#: ../revisor/base.py:2073
+#: ../revisor/base.py:2089
#, python-format
msgid "Running command: %s"
msgstr "Esecuzione comando: %s"
-#: ../revisor/base.py:2074
+#: ../revisor/base.py:2090
#, python-format
msgid "Extra information: %s %s %s"
msgstr "Informazioni extra: %s %s %s"
-#: ../revisor/base.py:2102
+#: ../revisor/base.py:2118
#, python-format
msgid "Got an error from %s (return code %s)"
msgstr "Errore restituito da %s (codice di errore %s)"
@@ -2140,6 +2252,8 @@ msgid ""
"You have selected a model with architecture %s which doesn't compose on the "
"system architecture %s."
msgstr ""
+"E' stato selezionato un modello con architettura %s che non è possibile "
+"comporre sull'architettura di sistema %s."
#: ../revisor/cfg.py:641
msgid "Setting options from configuration file"
@@ -2181,103 +2295,106 @@ msgstr ""
"Si è tentato di caricare il modello %s ma non è presente nel file di "
"configurazione %s"
-#: ../revisor/cfg.py:710
+#: ../revisor/cfg.py:713
#, python-format
msgid "Model %s has no configuration directive 'main' which is required"
msgstr ""
"Il modello %s non ha la direttiva di configurazione obbligatoria 'main'"
-#: ../revisor/cfg.py:713
+#: ../revisor/cfg.py:716
#, python-format
msgid "Testing for configuration parameter %s"
msgstr "Verifica del parametro di configurazione %s"
-#: ../revisor/cfg.py:742
+#: ../revisor/cfg.py:745
#, python-format
msgid "Setting %s to %r (from configuration file model %s)"
msgstr "Impostazione di %s a %r (dal modello del file di configurazione %s)"
-#: ../revisor/cfg.py:776
+#: ../revisor/cfg.py:779
#, python-format
msgid "Configuration file %s not readable"
msgstr "File di configurazione %s non leggibile"
-#: ../revisor/cfg.py:779 ../revisor/modgui/configuration.py:465
+#: ../revisor/cfg.py:782 ../revisor/modgui/configuration.py:465
#, python-format
msgid "Reading configuration file %s"
msgstr "Lettura file di configurazione %s"
-#: ../revisor/cfg.py:783
+#: ../revisor/cfg.py:786
#, python-format
msgid "Invalid configuration file %s"
msgstr "File di configurazione %s non valido"
-#: ../revisor/cfg.py:786
+#: ../revisor/cfg.py:789
#, python-format
msgid "No master configuration section [revisor] in configuration file %s"
msgstr ""
"Sezione principale [revisor] non presente nel file di configurazione %s"
-#: ../revisor/cfg.py:820
+#: ../revisor/cfg.py:823
#, python-format
msgid "Setting %s to %r (from configuration file)"
msgstr "Impostazione di %s a %r (dal file di configurazione)"
-#: ../revisor/cfg.py:824
+#: ../revisor/cfg.py:827
msgid "Setting options from command-line"
msgstr "Impostazione delle opzioni da linea di comando"
-#: ../revisor/cfg.py:838 ../revisor/cfg.py:845
+#: ../revisor/cfg.py:841 ../revisor/cfg.py:848
#, python-format
msgid "Setting %s to %r (from command line)"
msgstr "Impostazione di %s a %r (dalla linea di comando)"
-#: ../revisor/cfg.py:840
+#: ../revisor/cfg.py:843
#, python-format
msgid "Checked setting %s through plugin"
msgstr "Impostazione %s controllata mediante il plugin"
-#: ../revisor/cfg.py:843
+#: ../revisor/cfg.py:846
#, python-format
msgid "No check_setting_%s()"
msgstr "No check_setting_%s()"
-#: ../revisor/cfg.py:847
-#, fuzzy, python-format
+#: ../revisor/cfg.py:850
+#, python-format
msgid "Not setting %s to %r (command line matches default)"
-msgstr "Impostazione di %s a %r (dalla linea di comando)"
+msgstr ""
+"Parametro %s non impostato a %r (la linea di comando corrisponde al default)"
-#: ../revisor/cfg.py:889
+#: ../revisor/cfg.py:892
msgid ""
"Updates.img is only usable with installation media. Please remove --updates-"
"img or also build installation media."
msgstr ""
+"Updates.img è utilizzabile solamente per i supporti di installazione. Rimuovere "
+"l'opzione --updates-img o scegliere di creare anche i supporti di installazione."
-#: ../revisor/cfg.py:893
+#: ../revisor/cfg.py:896
msgid "Kickstart failed"
msgstr "Kickstart fallito"
-#: ../revisor/cfg.py:898
+#: ../revisor/cfg.py:903 ../revisor/cfg.py:908
#, python-format
msgid "Kickstart file %s not readable"
msgstr "File kickstart %s non leggibile"
-#: ../revisor/cfg.py:900
+#: ../revisor/cfg.py:905 ../revisor/cfg.py:910
#, python-format
msgid "Kickstart file %s fails to load, continuing with defaults"
msgstr ""
"Impossibile caricare il file kickstart %s, continuo con le impostazioni "
"predefinite"
-#: ../revisor/cfg.py:903
+#: ../revisor/cfg.py:913
msgid "No kickstart file specified"
msgstr "File kickstart non specificato"
-#: ../revisor/cfg.py:906 ../revisor/cfg.py:927
+#: ../revisor/cfg.py:916 ../revisor/cfg.py:937
msgid "No media specified"
-msgstr ""
+msgstr "Nessun supporto specificato"
-#: ../revisor/cfg.py:909
+#: ../revisor/cfg.py:919
msgid ""
"When composing in respin mode, you can only select one type of media "
"install, live or virtual. You can however select multiple media such as cd, "
@@ -2287,293 +2404,359 @@ msgstr ""
"tra installazione live o virtuale. E' comunque possibile selezionare diversi "
"tipi di supporto tra cd, dvd, ecc."
-#: ../revisor/cfg.py:954
+#: ../revisor/cfg.py:964
#, python-format
msgid "pulling self.packages_list[%r][%r][%r][%r]"
-msgstr ""
+msgstr "caricamento self.packages_list[%r][%r][%r][%r]"
-#: ../revisor/cfg.py:959
-#, fuzzy, python-format
+#: ../revisor/cfg.py:969
+#, python-format
msgid "returning pkg_list: %r"
-msgstr "Creazione pkgdir: %s"
+msgstr "pkg_list risultante: %r"
-#: ../revisor/cfg.py:1077
+#: ../revisor/cfg.py:1087
msgid "Run from image"
msgstr "Esegui dall'immagine"
-#: ../revisor/cfg.py:1078
+#: ../revisor/cfg.py:1088
msgid "Run from RAM - requires 1 GB+"
msgstr "Esegui dalla RAM - richiede 1 GB+"
+#: ../revisor/image.py:87
+#, python-format
+msgid ""
+"Error encountered during installation of the software you selected:\n"
+"\n"
+"%s"
+msgstr ""
+"Si è verificato un errore durante l'installazione del software selezionato:\n"
+"\n"
+"%s"
+
+#: ../revisor/image.py:93
+msgid "Running package installation"
+msgstr "Installazione dei pacchetti"
+
+#. self.cfg.yumobj.ts.check()
+#. self.cfg.yumobj.ts.order()
+#: ../revisor/image.py:107
+msgid "Installing Software"
+msgstr "Installazione software"
+
+#: ../revisor/image.py:142
+msgid "SELinux requested but not enabled on host"
+msgstr "SELinux richiesto ma non abilitato sull'host"
+
+#: ../revisor/image.py:194
+#, python-format
+msgid ""
+"Setting self.cfg.payload_livemedia to %s (from 'part /' command in "
+"kickstart, instead of %s)"
+msgstr ""
+"Impostazione di self.cfg.payload_livemedia a %s (dal comando 'part /' nel "
+"kickstart, invece di %s)"
+
+#: ../revisor/image.py:199
+#, python-format
+msgid ""
+"Setting self.cfg.payload_livemedia to %s (from total installed size of RPMs, "
+"instead of %s)"
+msgstr ""
+"Impostazione di self.cfg.payload_livemedia a %s (dalla dimensione totale degli "
+"RPM installati, invece di %s)"
+
#. #
#. # Runtime Options
#. #
-#: ../revisor/__init__.py.in:85
+#: ../revisor/__init__.py.in:86
msgid "Runtime Options"
msgstr "Opzioni runtime"
-#: ../revisor/__init__.py.in:90
+#: ../revisor/__init__.py.in:91
msgid "Use the CLI rather then GUI"
msgstr "Usare l'interfaccia testuale al posto di quella grafica"
-#: ../revisor/__init__.py.in:95
+#: ../revisor/__init__.py.in:96
msgid ""
"Force Revisor to use the GUI. Does not fallback to CLI and thus shows GUI "
"related errors"
msgstr ""
+"Forza Revisor ad usare la GUI. Non esegue la CLI in caso di errori della GUI, "
+"ma li mostra ed esce"
-#: ../revisor/__init__.py.in:100
+#: ../revisor/__init__.py.in:101
msgid "List available models"
msgstr "Elenco dei modelli disponibili"
-#: ../revisor/__init__.py.in:105
+#: ../revisor/__init__.py.in:106
msgid "Development mode. Skips some tasks that take time."
msgstr "Modalità sviluppatore. Salta alcune operazioni che richiedono tempo."
-#: ../revisor/__init__.py.in:110
+#: ../revisor/__init__.py.in:111
msgid "Report the sizes of all RPMs selected in a list"
-msgstr ""
+msgstr "Riporta le dimensioni di tutti gli RPM selezionati in una lista"
-#: ../revisor/__init__.py.in:115
+#: ../revisor/__init__.py.in:116
msgid ""
"Force Revisor to interpret the package manifest as complete package nevra "
"(name, epoch, version, release and architecture). Implies --kickstart-exact"
msgstr ""
+"Forza Revisor a interpretare il manifest dei pacchetti come un completo "
+"package nevra (name, epoch, version, release and architecture). Implica "
+"--kickstart-exact"
-#: ../revisor/__init__.py.in:120
+#: ../revisor/__init__.py.in:121
msgid ""
"Tells Revisor to ignore @core and @base (or %packages --nobase) and only add "
"what is in the package manifest"
msgstr ""
+"Permette a Revisor di ignorare i gruppi @core e @base (o %packages --nobase) e "
+"aggiungere solamente i paccchetti nel manifest dei pacchetti"
-#: ../revisor/__init__.py.in:126
+#: ../revisor/__init__.py.in:127
msgid ""
"Should Revisor not clean up at all (0), clean up it's temporary build data "
"(1), or everything -this includes the yum cache (2)"
msgstr ""
+"Imposta Revisor per non effettuare alcun clean (0), effettuare il clean dei "
+"soli dati di build temporanei (1), o di tutto compresa la cache di yum (2)"
-#: ../revisor/__init__.py.in:132
+#: ../revisor/__init__.py.in:133
msgid "Size of the USB Thumb Drive. Default to 4G."
msgstr "Dimensione del disco USB. Predefinito a 4G."
-#: ../revisor/__init__.py.in:141
+#: ../revisor/__init__.py.in:142
msgid "Set debugging level (0 by default)"
msgstr "Imposta livello di debug (predefinito 0)"
-#: ../revisor/__init__.py.in:150
+#: ../revisor/__init__.py.in:151
msgid "Answer all questions as 'yes'"
msgstr "Rispondi 'si' a tutte le domande"
#. #
#. # Configuration Options
#. #
-#: ../revisor/__init__.py.in:155
+#: ../revisor/__init__.py.in:156
msgid "Configuration Options"
msgstr "Opzioni di configurazione"
#. Might be disabled for testing purposes
#. default = os.path.join(BASE_CONFD_DIR,"fedora-7-gold.cfg"),
-#: ../revisor/__init__.py.in:162
+#: ../revisor/__init__.py.in:163
msgid "Use kickstart file"
msgstr "Utilizzare file kickstart"
-#: ../revisor/__init__.py.in:168
+#: ../revisor/__init__.py.in:169
msgid "Save options to given file (as a kickstart)"
-msgstr ""
+msgstr "Salva le opzioni nel file specificato (come un kickstart)"
-#: ../revisor/__init__.py.in:174
+#: ../revisor/__init__.py.in:175
msgid "Revisor configuration file to use"
msgstr "File di configurazione di Revisor da usare"
-#: ../revisor/__init__.py.in:180
+#: ../revisor/__init__.py.in:181
msgid "Get the sources to go with the binaries"
-msgstr ""
+msgstr "Includi anche i sorgenti dei binari installati"
-#: ../revisor/__init__.py.in:185
+#: ../revisor/__init__.py.in:186
msgid "Destination directory for products"
msgstr "Directory di destinazione per i prodotti"
-#: ../revisor/__init__.py.in:191
+#: ../revisor/__init__.py.in:192
msgid "Working directory"
msgstr "Directory di lavoro"
-#: ../revisor/__init__.py.in:197
+#: ../revisor/__init__.py.in:198
msgid "Model to use for composing"
msgstr "Modello da usare per la composizione"
-#: ../revisor/__init__.py.in:203
+#: ../revisor/__init__.py.in:204
msgid "Mode to use for composing updated spins"
-msgstr ""
+msgstr "Modalità per la composizione di spin aggiornate"
-#: ../revisor/__init__.py.in:208
+#: ../revisor/__init__.py.in:209
msgid ""
"Sometimes, it's better to copy local data rather then (sym)linking it. If "
"you have enough space..."
msgstr ""
+"Alcune volte è meglio copiare i dati locali piuttosto che creare link simbolici."
+"Sempre che ci sia sufficiente spazio disco..."
-#: ../revisor/__init__.py.in:213
+#: ../revisor/__init__.py.in:214
msgid "Directory to copy onto the media"
-msgstr ""
+msgstr "Directory da copiare sul supporto"
#. #
#. # Installation Media Options
#. #
-#: ../revisor/__init__.py.in:218
+#: ../revisor/__init__.py.in:219
msgid "Installation Media Options"
-msgstr ""
+msgstr "Opzioni supporto di installazione"
-#: ../revisor/__init__.py.in:223
-#, fuzzy
+#: ../revisor/__init__.py.in:224
msgid "Create Installation Media CDs (Capacity per disc: 685MB)"
-msgstr "Crea DVD dual-layer di installazione"
+msgstr "Crea CD di installazione (capacità per disco: 685MB)"
-#: ../revisor/__init__.py.in:228
-#, fuzzy
+#: ../revisor/__init__.py.in:229
msgid "Create Installation Media DVDs (Capacity per disc: 4.3GB)"
-msgstr "Crea DVD di installazione"
+msgstr "Crea DVD di installazione (capacità per disco: 4.3GB)"
-#: ../revisor/__init__.py.in:233
-#, fuzzy
+#: ../revisor/__init__.py.in:234
msgid "Create Installation Media Dual-Layered DVDs (Capacity per disc: 8.5GB)"
-msgstr "Crea DVD dual-layer di installazione"
+msgstr "Crea DVD dual-layer di installazione (capacità per disco: 8.5GB)"
-#: ../revisor/__init__.py.in:238
-#, fuzzy
+#: ../revisor/__init__.py.in:239
msgid "Create Installation Media Blu-Ray Discs (Capacity per disc: 50GB)"
-msgstr "Crea DVD dual-layer di installazione"
+msgstr "Crea disco Blu-Ray di installazione (capacita per disco: 50GB)"
-#: ../revisor/__init__.py.in:243
+#: ../revisor/__init__.py.in:244
msgid "Create Unified ISO from install tree"
-msgstr ""
+msgstr "Crea una Unified ISO dall'albero di installazione"
-#: ../revisor/__init__.py.in:254
+#: ../revisor/__init__.py.in:255
msgid "Create the Installation Tree."
msgstr "Crea l'albero di installazione."
-#: ../revisor/__init__.py.in:259
+#: ../revisor/__init__.py.in:260
msgid "Create Media without graphical installer."
msgstr "Crea supporti senza installazione grafica."
-#: ../revisor/__init__.py.in:264
+#: ../revisor/__init__.py.in:265
msgid "Include kickstart file on media or in the tree"
msgstr ""
"Includere il file kickstart sui supporti o nell'albero di installazione"
-#: ../revisor/__init__.py.in:269
+#: ../revisor/__init__.py.in:270
msgid ""
"In the bootloader menu (isolinux.cfg), set kickstart to boot by default "
"(works with --kickstart-include)"
msgstr ""
+"Nel menu del bootloader (isolinux.cfg), imposta l'avvio predefinito con "
+"kickstart (funziona con --kickstart-include)"
-#: ../revisor/__init__.py.in:274
+#: ../revisor/__init__.py.in:275
msgid "Filter anything from comps that is not in the package set"
-msgstr ""
+msgstr "Filtra qualsiasi pacchetto da comps che non sia nel set di pacchetti"
-#: ../revisor/__init__.py.in:279
+#: ../revisor/__init__.py.in:280
msgid "Use Revisor's comps file instead of those from the repositories"
-msgstr ""
+msgstr "Usa il file comps di Revisor al posto di quelli dei repositori"
-#: ../revisor/__init__.py.in:284
+#: ../revisor/__init__.py.in:285
msgid "Comps file to include on the installation media"
-msgstr ""
+msgstr "File comps da includere nel supporto di installazione"
-#: ../revisor/__init__.py.in:289
+#: ../revisor/__init__.py.in:290
msgid "Include specified updates.img on installation media."
-msgstr ""
+msgstr "Includere il file updates.img specificato sul supporto di installazione"
-#: ../revisor/__init__.py.in:295
+#: ../revisor/__init__.py.in:296
msgid "Product Name"
-msgstr ""
+msgstr "Nome prodotto"
-#: ../revisor/__init__.py.in:300
+#: ../revisor/__init__.py.in:301
msgid ""
"Product Path (e.g. Fedora/ or Packages/ -but without the appending slash)"
msgstr ""
+"Percorso prodotto (es. Fedora/ o Pacchetti/ - senza la slash finale)"
-#: ../revisor/__init__.py.in:305
+#: ../revisor/__init__.py.in:306
msgid ""
"ISO Label Base. Note that other things are appended but that the length can "
"be 32 chars maximum."
msgstr ""
+"ISO Label Base. Notare che altre stringhe posso essere aggiunge ma la lunghezza "
+"massima è 32 caratteri."
-#: ../revisor/__init__.py.in:310
+#: ../revisor/__init__.py.in:311
msgid "The base name for the ISOs"
-msgstr ""
+msgstr "Il base name della immagine ISO"
-#: ../revisor/__init__.py.in:315
+#: ../revisor/__init__.py.in:316
msgid "Product Version"
msgstr "Versione prodotto"
-#: ../revisor/__init__.py.in:320
+#: ../revisor/__init__.py.in:321
msgid ""
"Base Product Version - relevant to required packages and pykickstart "
"compatibility"
msgstr ""
+"Versione base prodotto - rilevante per i paccheti obbligatori e la compatibilità"
+" con pykickstart"
#. #
#. # Utility Media Options
#. #
-#: ../revisor/__init__.py.in:325
+#: ../revisor/__init__.py.in:326
msgid "Utility Media Options"
-msgstr ""
+msgstr "Opzioni supporto di utilità"
-#: ../revisor/__init__.py.in:330
+#: ../revisor/__init__.py.in:331
msgid "Create Rescue Media"
msgstr "Crea immagine di ripristino"
#. #
#. # Live Media Options
#. #
-#: ../revisor/__init__.py.in:335
+#: ../revisor/__init__.py.in:336
msgid "Live Media Options"
msgstr "Impostazioni disco Live"
-#: ../revisor/__init__.py.in:340
+#: ../revisor/__init__.py.in:341
msgid "Create Live Media CD/DVD"
msgstr "Crea CD/DVD Live"
-#: ../revisor/__init__.py.in:345
+#: ../revisor/__init__.py.in:346
msgid "Create Live Media Thumb Drive Image (will be depreciated)"
-msgstr ""
+msgstr "Crea immagine Live su chiavetta USB (sarà deprecata)"
-#: ../revisor/__init__.py.in:350
+#: ../revisor/__init__.py.in:351
msgid "Create Live Media Hard Disk Image (will be depreciated)"
msgstr "Crea immagine Live su disco rigido (sarà deprecata)"
-#: ../revisor/__init__.py.in:355
+#: ../revisor/__init__.py.in:356
msgid "Create Live Media Raw Hard Disk Image"
-msgstr ""
+msgstr "Crea immagine Live raw su disco rigido"
-#: ../revisor/__init__.py.in:360
+#: ../revisor/__init__.py.in:361
msgid "Interactively work in the live image before building the ISO image."
msgstr ""
+"Lavora interattivamente sull'immagine live prima di creare l'immagine ISO."
-#: ../revisor/__init__.py.in:365
+#: ../revisor/__init__.py.in:366
msgid "Skip file system compression."
-msgstr ""
+msgstr "Non eseguire la compressione del file system."
-#: ../revisor/__init__.py.in:370
+#: ../revisor/__init__.py.in:371
msgid "Skip prelinking the contents of the filesystem."
-msgstr ""
+msgstr "Non eseguire il prelinking dei contenuti del file system."
-#: ../revisor/__init__.py.in:375
+#: ../revisor/__init__.py.in:376
msgid ""
"Ignore filesystem overhead. Useless blocks will not be removed from the "
"filesystem."
msgstr ""
+"Ignora l'overhead del file system. I blocchi inutilizzati non verranno "
+"rimossi dal file system."
-#: ../revisor/__init__.py.in:380
+#: ../revisor/__init__.py.in:381
msgid "Set the preferred kernel. One of normal, PAE, xen or debug."
-msgstr ""
+msgstr "Imposta il kernel preferito. Uno tra normale, PAE, xen e debug"
+
+#: ../revisor/__init__.py.in:422
+#, python-format
+msgid " %s - No Description"
+msgstr " %s - Nessuna descrizione"
-#: ../revisor/__init__.py.in:441
+#: ../revisor/__init__.py.in:442
msgid "Interrupted by user"
msgstr "Interrotto dall'utente"
-#: ../revisor/__init__.py.in:448
+#: ../revisor/__init__.py.in:449
msgid ""
"Traceback occurred, please report a bug at http://fedorahosted.org/revisor"
msgstr ""
+"Traceback generato, riportare il bug a http://fedorahosted.org/revisor"
#: ../revisor/logger.py:86
msgid "Error"
@@ -2591,54 +2774,63 @@ msgstr "Si desidera continuare? [S/n]"
msgid "Abort! Abort! Abort!"
msgstr "Arresto! Arresto! Arresto!"
-#: ../revisor/image.py:87
-#, python-format
-msgid ""
-"Error encountered during installation of the software you selected:\n"
-"\n"
-"%s"
+#: ../revisor/misc.py:36
+msgid "This tool has to run with root privileges. Aborting"
msgstr ""
-"Si è verificato un errore durante l'installazione del software selezionato:\n"
-"\n"
-"%s"
-
-#: ../revisor/image.py:93
-msgid "Running package installation"
-msgstr "Installazione dei pacchetti"
+"Questo strumento deve essere eseguito con i privilegi di root. Non è possibile "
+"continuare"
-#. self.cfg.yumobj.ts.check()
-#. self.cfg.yumobj.ts.order()
-#: ../revisor/image.py:107
-#, fuzzy
-msgid "Installing Software"
-msgstr "Installazione software nel supporto Live"
-
-#: ../revisor/image.py:142
-msgid "SELinux requested but not enabled on host"
+#. SELinux in enforcing mode
+#: ../revisor/misc.py:47
+msgid ""
+"SELinux is in enforcing mode on this host. Composing media will fail. Please "
+"set SELinux to permissive mode."
msgstr ""
+"SELinux è impostato in modalità enforcing su questo host, per questo la "
+"crezione del supporto fallirà. Impostare la modalità di SELinux a permissive "
+"per continuare."
-#: ../revisor/image.py:194
-#, python-format
+#: ../revisor/misc.py:52
msgid ""
-"Setting self.cfg.payload_livemedia to %s (from 'part /' command in "
-"kickstart, instead of %s)"
+"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 su questo host è disabilitato, per questo SELinux non sarà disponibile "
+"sul supporto creato e di conseguenza nei sistemi in cui il supporto creato "
+"verrà installato"
-#: ../revisor/image.py:199
+#: ../revisor/misc.py:134 ../revisor/misc.py:141
+#, python-format
+msgid "Resolved %s"
+msgstr "Determinato a %s"
+
+#: ../revisor/misc.py:144
#, python-format
msgid ""
-"Setting self.cfg.payload_livemedia to %s (from total installed size of RPMs, "
-"instead of %s)"
+"Looking to resolve package %s to a Provides, but we still can't find it."
msgstr ""
+"Tentativo di determinare un Provides per il pacchetto %s, ma non è ancora stato "
+"possibile trovarlo."
-#: ../revisor/pkgorder.py:135
+#: ../revisor/pkgorder.py:78
+#, python-format
+msgid "Adding group(s): %r"
+msgstr "Aggiunta dei gruppi: %r"
+
+#: ../revisor/pkgorder.py:96
+#, python-format
+msgid "Adding package(s): %r"
+msgstr "Aggiunta dei pacchetti: %r"
+
+#: ../revisor/pkgorder.py:141
#, python-format
msgid "Unable to create yum configuration file for package ordering at %s"
msgstr ""
"Impossibile creare il file di configurazione di yum per l'ordinamento dei "
"pacchetti in %s"
-#: ../revisor/pkgorder.py:154
+#: ../revisor/pkgorder.py:160
#, python-format
msgid "-> package %s"
msgstr "-> pacchetto %s"
@@ -2661,37 +2853,43 @@ msgstr "RuntimeError per il plugin %s: %s"
#: ../revisor/plugins.py:91 ../revisor/plugins.py:93
#, python-format
msgid "Cannot set defaults for plugin %s: %s"
-msgstr ""
+msgstr "Impossibile impostare il default per il plugin %s: %s"
#: ../revisor/plugins.py:95
#, python-format
msgid "Cannot set defaults for plugin %s: Unknown Error"
-msgstr ""
+msgstr "Impossibile impostare i default per il plugin %s: errore sconosciuto"
#: ../revisor/plugins.py:98
#, python-format
msgid "Not setting defaults for plugin %s: No function 'set_defaults()'"
msgstr ""
+"Impossibile impostare i default per il plugin %s: funzione 'set_defaults()' "
+"non disponibile"
#: ../revisor/plugins.py:115
#, python-format
msgid "Cannot set runtime for plugin %s: %s"
-msgstr ""
+msgstr "Impossibile impostare il runtime per il plugin %s: %s"
#: ../revisor/plugins.py:117
#, python-format
msgid "Not setting runtime for plugin %s: No function 'set_runtime()'"
msgstr ""
+"Impossibile impostare il runtime per il plugin %s: funzione 'set_runtime()' "
+"non disponibile"
#: ../revisor/plugins.py:134
#, python-format
msgid "Cannot add options for plugin %s: %s"
-msgstr ""
+msgstr "Impossibile aggiungere opzioni al plugin %s: %s"
#: ../revisor/plugins.py:136
#, python-format
msgid "Not adding options for plugin %s: No function 'add_options()'"
msgstr ""
+"Impossibile aggiungere opzioni al plugin %s: funzione 'add_options()' "
+"non disponibile"
#: ../revisor/plugins.py:154
#, python-format
@@ -2702,11 +2900,13 @@ msgstr "Impossibile verificare le opzioni del plugin %s: %s"
#, python-format
msgid "Not checking options for plugin %s: No function 'check_options()'"
msgstr ""
+"Impossibile verificare le opzioni del plugin %s: funzione 'check_options()' "
+"non disponibile"
#: ../revisor/plugins.py:192
#, python-format
msgid "Cannot execute hook %s for plugin %s: %s"
-msgstr ""
+msgstr "Impossibile eseguire la chiamata %s per il plugin %s: %s"
#: ../revisor/progress.py:79 ../revisor/modgui/build_media.py:89
#: ../revisor/modgui/build_media.py:95 ../revisor/modgui/build_media.py:99
@@ -2790,80 +2990,82 @@ msgstr "Eliminato: %s"
msgid "%s: %s"
msgstr "%s: %s"
-#: ../revisor/pungi.py:62
+#: ../revisor/pungi.py:61
#, python-format
msgid "Error: Cannot create destination dir %s"
msgstr "Errore: impossibile creare la dir di destinazione %s"
-#: ../revisor/pungi.py:68
+#: ../revisor/pungi.py:67
#, python-format
msgid "Error: Cannot remove destination dir %s"
msgstr "Errore: impossibile eliminare la dir di destinazione %s"
-#: ../revisor/pungi.py:73
+#: ../revisor/pungi.py:72
#, python-format
msgid "Error: Cannot recreate destination dir %s"
msgstr "Errore: impossibile ricreare la dir di destinazione %s"
-#: ../revisor/pungi.py:340
+#: ../revisor/pungi.py:342
msgid "Getting relnotes..."
msgstr "Scaricamento note rilascio..."
-#: ../revisor/pungi.py:361
+#: ../revisor/pungi.py:363
#, python-format
msgid "An error occured extracting the release files: %s"
msgstr "Errore nell'estrazione dei file di rilascio: %s"
-#: ../revisor/pungi.py:370
+#: ../revisor/pungi.py:372
#, python-format
msgid "Copying %s"
msgstr "Copia di %s"
-#: ../revisor/pungi.py:387
+#: ../revisor/pungi.py:389
#, python-format
msgid "Could not access directory %s, cannot copy extra files onto the media."
msgstr ""
"Impossibile accedere alla directory %s per i copiare i file extra sul "
"supporto."
-#: ../revisor/pungi.py:393
+#: ../revisor/pungi.py:395
#, python-format
msgid "Could not create files/ directory: %s"
msgstr "Impossibile creare la directory files/: %s"
-#: ../revisor/pungi.py:404
+#: ../revisor/pungi.py:406
#, python-format
msgid "Creating %s"
msgstr "Creazione di %s"
-#: ../revisor/pungi.py:452
+#: ../revisor/pungi.py:454
#, python-format
msgid "Disc %s #%d is oversized (%r > %r)"
-msgstr ""
+msgstr "Disco %s #%d : sovradimensionato (%r > %r)"
-#: ../revisor/pungi.py:456
-#, fuzzy, python-format
+#: ../revisor/pungi.py:458
+#, python-format
msgid "Removing tree %s"
-msgstr "In rimozione per dipendenze:\n"
+msgstr "Eliminazione dell'albero %s"
-#: ../revisor/pungi.py:464
+#: ../revisor/pungi.py:466
#, python-format
msgid "Disc %s #%d is OK in size (%r <= %r)"
-msgstr ""
+msgstr "Disco %s #%d : dimensioni OK (%r <= %r)"
-#: ../revisor/pungi.py:515
+#: ../revisor/pungi.py:517
msgid ""
"Hacking anaconda's .discinfo because it'll shit itself if it reads it's own "
"output"
msgstr ""
+"Hacking del file .discinfo di anaconda, per evitare problemi di esecuzione "
+"quando anaconda legge in input il proprio output"
-#: ../revisor/modcobbler/__init__.py:69 ../revisor/modcobbler/__init__.py:218
-#: ../revisor/modcobbler/__init__.py:255
+#: ../revisor/modcobbler/__init__.py:69 ../revisor/modcobbler/__init__.py:219
+#: ../revisor/modcobbler/__init__.py:256
#, python-format
msgid "There is a problem connecting to %s"
msgstr "Si è verificato un problema nella connessione a %s"
-#: ../revisor/modcobbler/__init__.py:82
+#: ../revisor/modcobbler/__init__.py:83
#, python-format
msgid ""
" Distro: %s\n"
@@ -2872,57 +3074,66 @@ msgstr ""
" Distro: %s\n"
" Profili esistenti:"
-#: ../revisor/modcobbler/__init__.py:84
+#: ../revisor/modcobbler/__init__.py:83
+msgid "name"
+msgstr "nome"
+
+#: ../revisor/modcobbler/__init__.py:85
#, python-format
msgid " Profile: %s"
msgstr " Profilo: %s"
-#: ../revisor/modcobbler/__init__.py:86
+#: ../revisor/modcobbler/__init__.py:87
msgid "No listing found on cobbler server."
-msgstr ""
+msgstr "Nessun elenco trovato sul server cobbler"
-#: ../revisor/modcobbler/__init__.py:103
+#: ../revisor/modcobbler/__init__.py:104
msgid "Add compose to a Cobbler server as both a Distribution and Profile."
-msgstr ""
+msgstr "Aggiungi la composizione al server Cobbler sia come distribuzione che "
+"come profilo."
-#: ../revisor/modcobbler/__init__.py:110
+#: ../revisor/modcobbler/__init__.py:111
msgid ""
"Add compose options as a Profile to a Cobbler server. [Requires --cobbler-"
"use-distro]"
msgstr ""
+"Aggiungi le opzioni di composizione a un server Cobbler come profilo. [Richiede "
+"--cobbler-use-distro]"
-#: ../revisor/modcobbler/__init__.py:117
+#: ../revisor/modcobbler/__init__.py:118
msgid "Use a Cobbler distro as source for package data."
msgstr "Usa una distribuzione Cobbler come sorgente dati per i pacchetti."
-#: ../revisor/modcobbler/__init__.py:124
+#: ../revisor/modcobbler/__init__.py:125
msgid "Use a Cobbler profile as source for kickstart data."
msgstr "Utilizza un profilo di Cobbler come sorgente per i dati kickstart."
-#: ../revisor/modcobbler/__init__.py:131
+#: ../revisor/modcobbler/__init__.py:132
msgid "List options provided by cobbler."
msgstr "Elenca le opzioni di cobbler."
-#: ../revisor/modcobbler/__init__.py:137
+#: ../revisor/modcobbler/__init__.py:138
msgid "Use remote cobbler server."
msgstr "Usare server cobbler remoto."
-#: ../revisor/modcobbler/__init__.py:143
+#: ../revisor/modcobbler/__init__.py:144
msgid "Remote cobbler server port."
msgstr "Porta del server cobbler remoto."
-#: ../revisor/modcobbler/__init__.py:200
+#: ../revisor/modcobbler/__init__.py:201
msgid ""
"Specifying a Cobbler server is only supported for read-only actions. "
"Currently, --cobbler-use-distro and --cobbler-use-profile."
msgstr ""
+"Specificare un server Cobbler è permesso solo per azioni in sola lettura. "
+"Ad oggi, --cobbler-use-distro e --cobbler-use-profile."
-#: ../revisor/modcobbler/__init__.py:225
+#: ../revisor/modcobbler/__init__.py:226
#, python-format
msgid "The distro '%s' does not exist."
-msgstr "La ditribuzione '%s' non esiste."
+msgstr "La distribuzione '%s' non esiste."
-#: ../revisor/modcobbler/__init__.py:239 ../revisor/modcobbler/__init__.py:262
+#: ../revisor/modcobbler/__init__.py:240 ../revisor/modcobbler/__init__.py:263
#, python-format
msgid "The profile '%s' does not exist."
msgstr "Il profilo '%s' non esiste."
@@ -2937,6 +3148,9 @@ msgid ""
"directory holding Installation Media ISOs named exactly the same as the "
"product."
msgstr ""
+"Genera una immagine ISO delta. Attualmente disponibile solo per un singolo "
+"disco o directory contenente immagini ISO di installazione esattamente con lo "
+"stesso nome del prodotto."
#: ../revisor/modjigdo/__init__.py:46
msgid "Package jigdo not installed"
@@ -2964,7 +3178,7 @@ msgstr ""
#: ../revisor/modgui/build_media.py:89 ../revisor/modgui/build_media.py:199
msgid "Retrieve Software Information"
-msgstr ""
+msgstr "Scaricamento informazioni software"
#: ../revisor/modgui/build_media.py:95 ../revisor/modgui/build_media.py:209
msgid "Select Packages from Kickstart"
@@ -2984,11 +3198,11 @@ msgstr "Collegamento ai pacchetti"
#: ../revisor/modgui/build_media.py:112 ../revisor/modgui/build_media.py:225
msgid "Create Repository Information"
-msgstr ""
+msgstr "Creare informazioni sul repositorio"
#: ../revisor/modgui/build_media.py:113 ../revisor/modgui/build_media.py:226
msgid "Build isolinux and Installer"
-msgstr ""
+msgstr "Creare isolinux e Installer"
#: ../revisor/modgui/build_media.py:114 ../revisor/modgui/build_media.py:227
msgid "Linking in Release Notes"
@@ -3032,7 +3246,7 @@ msgstr "Crea filesystem in RAM"
#: ../revisor/modgui/build_media.py:152 ../revisor/modgui/build_media.py:260
msgid "Relabel System"
-msgstr ""
+msgstr "Etichettatura (relabel) del sistema"
#: ../revisor/modgui/build_media.py:153 ../revisor/modgui/build_media.py:261
msgid "Configure Bootloader"
@@ -3077,14 +3291,12 @@ msgid "Splitting Repository Information for %s Media"
msgstr "Divisione delle informazioni sui repository per i supporti %s"
#: ../revisor/modgui/build_media.py:264
-#, fuzzy
msgid "Launching shell"
-msgstr "Esegui terminale"
+msgstr "Esecuzione del terminale"
#: ../revisor/modgui/build_media.py:274
-#, fuzzy
msgid "Creating Live ISO Image"
-msgstr "Creazione immagine ISO"
+msgstr "Creazione immagine ISO Live"
#: ../revisor/modgui/configuration.py:123
msgid "You have not specified a Base URL or Mirror List"
@@ -3166,7 +3378,7 @@ msgstr "Controllare la directory corrente."
#: ../revisor/modgui/__init__.py:122
msgid "GUI Mode didn't get RevisorBase instance, which is fatal."
-msgstr ""
+msgstr "La modalità GUI non ha determinato l'instanza RevisorBase, errore fatale."
#: ../revisor/modgui/__init__.py:191
#, python-format
@@ -3190,6 +3402,8 @@ msgid ""
"Updating these packages requires additional package changes for proper "
"operation."
msgstr ""
+"L'aggiornamento di questi pacchetti richiede cambiamenti aggiuntivi ad "
+"altri pacchetti per operare correttamente."
#: ../revisor/modgui/__init__.py:350
msgid "Adding for dependencies:\n"
@@ -3207,7 +3421,7 @@ msgstr "In aggiornamento per dipendenze:\n"
#: ../revisor/modgui/lm_basic.py:175 ../revisor/modgui/lm_basic.py:277
#: ../revisor/modgui/lm_usercustomize.py:159
msgid "Using kickstart configuration, edit entry here"
-msgstr ""
+msgstr "Utilizzo della configurazione kickstart, modifica l'entry qui"
#: ../revisor/modgui/lm_basic.py:202 ../revisor/modgui/lm_usercustomize.py:109
msgid "These passwords do not match"
@@ -3413,10 +3627,48 @@ msgstr "No comps no glory"
msgid "Unable to find comps file. No comps no glory"
msgstr "Impossibile trovare il file comps. No comps no glory"
+#: ../revisor/modisolinux/__init__.py:48
+msgid "Custom isolinux.cfg to replace the standard isolinux.cfg with."
+msgstr "isolinux.cfg personalizzato in sostituzione dell'isolinux.cfg standard."
+
+#: ../revisor/modisolinux/__init__.py:57
+msgid ""
+"Both --kickstart-default and --isolinux-cfg have been specified, while they "
+"are mutually exclusive. --isolinux-cfg is going to be used."
+msgstr ""
+"Sia --kickstart-default che --isolinux-cfg sono stati specificati, ma sono "
+"opzioni mutuamente esclusive. Verrà utilizzato solo --isolinux-cfg."
+
+#: ../revisor/modisolinux/__init__.py:69
+#, python-format
+msgid "File %s is not readable"
+msgstr "Il file %s non è accessibile."
+
+#: ../revisor/modisolinux/__init__.py:74
+#, python-format
+msgid "Going to replace isolinux/isolinux.cfg with %s"
+msgstr "Sostituzione di isolinux/isolinux.cfg con %s"
+
+#: ../revisor/modisolinux/__init__.py:77
+msgid "Deleted the old isolinux.cfg"
+msgstr "Vecchio isolinux.cfg eliminato"
+
+#: ../revisor/modisolinux/__init__.py:80
+msgid "Inserted the new isolinux.cfg"
+msgstr "Nuovo isolinux.cfg inserito"
+
+#: ../revisor/modisolinux/__init__.py:82
+msgid "Could not copy in the new isolinux.cfg"
+msgstr "Impossibile copiare il nuovo isolinux.cfg"
+
+#: ../revisor/modisolinux/__init__.py:84
+msgid "Could not unlink the old isolinux.cfg?"
+msgstr "Impossibile eliminare il precedente isolinux.cfg"
+
#: ../revisor/modrebrand/__init__.py:79
-#, fuzzy, python-format
+#, python-format
msgid "Removing package %s-%s:%s-%s.%s for rebranding"
-msgstr "Dai pacchetti: Aggiunta %s-%s:%s-%s.%s alla transazione"
+msgstr "Rimozione del pacchetto %s-%s:%s-%s.%s per rebranding"
#: ../revisor/modrebrand/__init__.py:91
msgid ""
@@ -3426,15 +3678,30 @@ msgstr ""
"Nome per rebrand. Revisor selezionerà i pacchetti <nome>-logos, <nome>-"
"release e <nome>-release-notes, se disponibili."
-#: ../revisor/modserver/__init__.py:88
-msgid "Use the server mode for XML-RPC"
+#: ../revisor/modreuseinstaller/__init__.py:48
+msgid "The URI to a tree we're supposed to reuse the installer images from."
msgstr ""
+"Il percorso URI di un albero di directory che contiene le immagini di"
+"installazione da riutilizzare"
-#: ../revisor/modserver/__init__.py:93
+#: ../revisor/modreuseinstaller/__init__.py:62
+#, python-format
+msgid ""
+"Could not access %s/%s, required for reusing a previous tree. Cancelling the "
+"reuse of installer images"
+msgstr ""
+"Impossibile accedere a %s/%s, necessario per riutilizzare un albero precedente. "
+"Il riuso delle immagini di installazione è stato annullato"
+
+#: ../revisor/modserver/__init__.py:87
+msgid "Use the server mode for XML-RPC"
+msgstr "Utilizza XML-RPC in modalità server"
+
+#: ../revisor/modserver/__init__.py:92
msgid "Port to start Server on."
msgstr "Porta su cui eseguire il server."
-#: ../revisor/modserver/__init__.py:99
+#: ../revisor/modserver/__init__.py:98
msgid "Start the XML-RPC server and fork."
msgstr "Esegui il server XML-RPC e continua."
@@ -3475,6 +3742,8 @@ msgstr ""
#: ../revisor/modvirt/__init__.py:130
msgid "Make virtual machine drive a sparse filesystem. (not implemented yet)"
msgstr ""
+"Rendi il drive della virtual machine uno sparse filesystem (non ancora "
+"implementato)"
#: ../revisor/modvirt/__init__.py:136
msgid ""
@@ -3490,6 +3759,9 @@ msgid ""
"yum. (Doesn't require virt. tech. to be running locally.) (not implemented "
"yet)"
msgstr ""
+"Crea la macchina virtuale come una appliance utilizzando un'immagine disco raw "
+"e yum (non necessita di estensioni per la virtualizzazione eseguite in locale.) "
+"(non ancora implementato)"
#: ../revisor/modvirt/__init__.py:244
msgid "Unable to create virtual machine instance."
@@ -3506,17 +3778,11 @@ msgstr "Impossibile montare '%s' su '%s'"
#: ../revisor/modvirt/__init__.py:519 ../revisor/modvirt/__init__.py:541
msgid "Starting the virtual guest provision..."
-msgstr ""
+msgstr "Inizializzazione costruzione del virtual guest..."
#: ../conf/revisor.desktop.in.h:2
msgid "Revisor, Pimp your distro"
-msgstr ""
-
-#~ msgid "or any other relevant kernel parameters."
-#~ msgstr "o qualsiasi altro parametro rilevante del kernel."
-
-#~ msgid "name"
-#~ msgstr "nome"
+msgstr "Revisor, editor di distro"
#~ msgid "Root passwords do not match."
#~ msgstr "Le password di root non corrispondono."
commit 5a2e3da216db860ff9d36ca5ac651d20142c0def
Merge: c633981... 2db939e...
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Fri Jan 30 03:26:03 2009 +0100
Merge branch 'master' of ssh://git.fedorahosted.org/git/revisor
commit c633981d1b274365554b4749fc9b13bb268b6b74
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Fri Jan 30 03:25:40 2009 +0100
Fix up find-default-groups.py a little
diff --git a/scripts/find-default-groups.py b/scripts/find-default-groups.py
index 021ae9f..3679205 100755
--- a/scripts/find-default-groups.py
+++ b/scripts/find-default-groups.py
@@ -71,12 +71,23 @@ class Yum(yum.YumBase):
for group in self.comps.groups:
if hasattr(group,"default"):
if bool(group.default) and not group.groupid in self.cli_options.skip_list:
- self.selectGroup(group.groupid)
self.total_mandatory += len(group.mandatory_packages.keys())
self.total_default += len(group.default_packages.keys())
pkglist = group.mandatory_packages.keys()
if not self.cli_options.no_defaults:
pkglist += group.default_packages.keys()
+
+ for pkg in pkglist:
+ try:
+ pkgs = self.pkgSack.returnNewestByName(pkg)
+ if len(pkgs) > 1:
+ pkgs = self.bestPackagesFromList(pkgs)
+ # Add to transaction
+ for po in pkgs:
+ self.tsInfo.addInstall(po)
+ except yum.Errors.PackageSackError, e:
+ pass
+
if self.cli_options.verbose:
print "Group %s makes me select the following packages:\n" % group.groupid
print " -> %d MANDATORY: %s" % (len(group.mandatory_packages.keys()),', '.join(group.mandatory_packages.keys()))
commit d9e83dd307751e41e3b9f11e62803a823d8dd258
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Fri Jan 30 03:25:06 2009 +0100
Fix up spec and autofoo for new plugins
diff --git a/configure.ac b/configure.ac
index 99bf47f..eff8bba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,14 +34,15 @@ revisor/modcomposer/Makefile
revisor/moddelta/Makefile
revisor/modgui/Makefile
revisor/modgui/glade/base_screen.glade
+revisor/modhub/Makefile
revisor/modisolinux/Makefile
revisor/modjigdo/Makefile
+revisor/modmock/Makefile
revisor/modrebrand/Makefile
revisor/modreuseinstaller/Makefile
revisor/modserver/Makefile
revisor/modvirt/Makefile
revisor/modwui/Makefile
-revisor/modhub/Makefile
unity/Makefile
])
diff --git a/revisor.spec.in b/revisor.spec.in
index fecf360..c4f8c91 100644
--- a/revisor.spec.in
+++ b/revisor.spec.in
@@ -7,6 +7,7 @@
%define pkg_hub 0
%define pkg_isolinux 1
%define pkg_jigdo 0
+%define pkg_mock 1
%define pkg_rebrand 0
%define pkg_reuseinstaller 1
%define pkg_server 0
@@ -85,6 +86,9 @@ Obsoletes: revisor-isolinux
%if ! %{pkg_jigdo}
Obsoletes: revisor-jigdo
%endif
+%if ! %{pkg_mock}
+Obsoletes: revisor-mock
+%endif
%if ! %{pkg_rebrand}
Obsoletes: revisor-rebrand
%endif
@@ -216,6 +220,19 @@ Pre-Alpha of Revisor Integration with Jigdo for distributing your compose
%endif
##
+## Revisor Mock integration
+##
+%if %{pkg_mock}
+%package mock
+Summary: Revisor Integration with Mock
+Group: Applications/System
+Requires: mock, revisor-cli = %{version}-%{release}
+
+%description mock
+Revisor Integration with Mock for building the installer images
+%endif
+
+##
## Revisor Rebranding plugin
##
%if %{pkg_rebrand}
@@ -334,6 +351,10 @@ make install DESTDIR=$RPM_BUILD_ROOT
rm -rf %{buildroot}/%{python_sitelib}/revisor/modjigdo
%endif
+%if ! %{pkg_mock}
+ rm -rf %{buildroot}/%{python_sitelib}/revisor/modmock
+%endif
+
%if ! %{pkg_rebrand}
rm -rf %{buildroot}/%{python_sitelib}/revisor/modrebrand
%endif
@@ -466,6 +487,15 @@ rm -rf $RPM_BUILD_ROOT
%{python_sitelib}/revisor/modjigdo/*.pyo
%endif
+%if %{pkg_mock}
+%files mock
+%defattr(-,root,root,-)
+%dir %{python_sitelib}/revisor/modmock
+%{python_sitelib}/revisor/modmock/*.py
+%{python_sitelib}/revisor/modmock/*.pyc
+%{python_sitelib}/revisor/modmock/*.pyo
+%endif
+
%if %{pkg_rebrand}
%files rebrand
%defattr(-,root,root,-)
@@ -522,6 +552,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* @DATESTAMP@ Jeroen van Meeuwen <kanarip a fedoraunity.org> @VERSION@-@RELEASE@
+- Add modmock, modhub, modcomposer
- Rebuild for Fedora 10
- Include modisolinux and modreuseinstaller
diff --git a/revisor/Makefile.am b/revisor/Makefile.am
index 76cf61c..e997689 100644
--- a/revisor/Makefile.am
+++ b/revisor/Makefile.am
@@ -24,10 +24,13 @@ py_PYTHON = $(PYTHON_FILES)
SUBDIRS = \
modcobbler \
+ modcomposer \
moddelta \
modgui \
+ modhub \
modisolinux \
modjigdo \
+ modmock \
modrebrand \
modreuseinstaller \
modserver \
diff --git a/revisor/plugins.py b/revisor/plugins.py
index 2451d94..58d0f8e 100644
--- a/revisor/plugins.py
+++ b/revisor/plugins.py
@@ -37,6 +37,7 @@ class RevisorPlugins:
'modgui': False,
'modisolinux': False,
'modjigdo': False,
+ 'modmock': False,
'modrebrand': False,
'modreuseinstaller': False,
'modvirt': False,
commit 179d14866b1a7c82c33a32549c45e29d10c59db1
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Fri Jan 30 03:24:29 2009 +0100
Set the right include_bootiso setting for these releases
diff --git a/unity/conf/f10-install-respin.conf b/unity/conf/f10-install-respin.conf
index bfbba59..5e275f3 100644
--- a/unity/conf/f10-install-respin.conf
+++ b/unity/conf/f10-install-respin.conf
@@ -21,6 +21,7 @@ copy_local = 0
answer_yes = 1
getsource = 1
bugurl = http://bugzilla.redhat.com
+include_bootiso = 1
[f10-i386-respin]
description = Fedora Unity Re-Spin Model for Fedora 10
diff --git a/unity/conf/f9-install-respin.conf b/unity/conf/f9-install-respin.conf
index 6130b7f..3dd02d8 100644
--- a/unity/conf/f9-install-respin.conf
+++ b/unity/conf/f9-install-respin.conf
@@ -21,6 +21,7 @@ copy_local = 0
answer_yes = 1
getsource = 1
bugurl = http://bugzilla.redhat.com
+include_bootiso = 1
[f9-i386-respin]
description = Fedora Unity Re-Spin Model for Fedora 9
commit eaefde65aa07d35c5d82c37126875ede53184800
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Fri Jan 30 03:24:03 2009 +0100
No longer exclude namazu
diff --git a/unity/conf/conf.d/revisor-f10-i386-live-desktop-respin.conf b/unity/conf/conf.d/revisor-f10-i386-live-desktop-respin.conf
index edacdd5..7020f55 100644
--- a/unity/conf/conf.d/revisor-f10-i386-live-desktop-respin.conf
+++ b/unity/conf/conf.d/revisor-f10-i386-live-desktop-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 10 - i386 - Updates
baseurl=http://localrepo/fedora/updates/10/i386/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f10-i386-live-developer-respin.conf b/unity/conf/conf.d/revisor-f10-i386-live-developer-respin.conf
index edacdd5..7020f55 100644
--- a/unity/conf/conf.d/revisor-f10-i386-live-developer-respin.conf
+++ b/unity/conf/conf.d/revisor-f10-i386-live-developer-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 10 - i386 - Updates
baseurl=http://localrepo/fedora/updates/10/i386/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f10-i386-live-education-math-respin.conf b/unity/conf/conf.d/revisor-f10-i386-live-education-math-respin.conf
index edacdd5..7020f55 100644
--- a/unity/conf/conf.d/revisor-f10-i386-live-education-math-respin.conf
+++ b/unity/conf/conf.d/revisor-f10-i386-live-education-math-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 10 - i386 - Updates
baseurl=http://localrepo/fedora/updates/10/i386/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f10-i386-live-electronic-lab-respin.conf b/unity/conf/conf.d/revisor-f10-i386-live-electronic-lab-respin.conf
index edacdd5..7020f55 100644
--- a/unity/conf/conf.d/revisor-f10-i386-live-electronic-lab-respin.conf
+++ b/unity/conf/conf.d/revisor-f10-i386-live-electronic-lab-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 10 - i386 - Updates
baseurl=http://localrepo/fedora/updates/10/i386/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f10-i386-live-games-respin.conf b/unity/conf/conf.d/revisor-f10-i386-live-games-respin.conf
index edacdd5..7020f55 100644
--- a/unity/conf/conf.d/revisor-f10-i386-live-games-respin.conf
+++ b/unity/conf/conf.d/revisor-f10-i386-live-games-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 10 - i386 - Updates
baseurl=http://localrepo/fedora/updates/10/i386/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f10-i386-live-kde-respin.conf b/unity/conf/conf.d/revisor-f10-i386-live-kde-respin.conf
index edacdd5..7020f55 100644
--- a/unity/conf/conf.d/revisor-f10-i386-live-kde-respin.conf
+++ b/unity/conf/conf.d/revisor-f10-i386-live-kde-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 10 - i386 - Updates
baseurl=http://localrepo/fedora/updates/10/i386/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f10-i386-live-sugar-respin.conf b/unity/conf/conf.d/revisor-f10-i386-live-sugar-respin.conf
index edacdd5..7020f55 100644
--- a/unity/conf/conf.d/revisor-f10-i386-live-sugar-respin.conf
+++ b/unity/conf/conf.d/revisor-f10-i386-live-sugar-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 10 - i386 - Updates
baseurl=http://localrepo/fedora/updates/10/i386/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f10-i386-live-xfce-respin.conf b/unity/conf/conf.d/revisor-f10-i386-live-xfce-respin.conf
index edacdd5..7020f55 100644
--- a/unity/conf/conf.d/revisor-f10-i386-live-xfce-respin.conf
+++ b/unity/conf/conf.d/revisor-f10-i386-live-xfce-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 10 - i386 - Updates
baseurl=http://localrepo/fedora/updates/10/i386/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f10-i386-rebrand-testing.conf b/unity/conf/conf.d/revisor-f10-i386-rebrand-testing.conf
index edacdd5..7020f55 100644
--- a/unity/conf/conf.d/revisor-f10-i386-rebrand-testing.conf
+++ b/unity/conf/conf.d/revisor-f10-i386-rebrand-testing.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 10 - i386 - Updates
baseurl=http://localrepo/fedora/updates/10/i386/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f10-i386-single-cd.conf b/unity/conf/conf.d/revisor-f10-i386-single-cd.conf
index edacdd5..7020f55 100644
--- a/unity/conf/conf.d/revisor-f10-i386-single-cd.conf
+++ b/unity/conf/conf.d/revisor-f10-i386-single-cd.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 10 - i386 - Updates
baseurl=http://localrepo/fedora/updates/10/i386/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f10-ppc-live-desktop-respin.conf b/unity/conf/conf.d/revisor-f10-ppc-live-desktop-respin.conf
index 4b3c3fd..eb8e83d 100644
--- a/unity/conf/conf.d/revisor-f10-ppc-live-desktop-respin.conf
+++ b/unity/conf/conf.d/revisor-f10-ppc-live-desktop-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 10 - ppc - Updates
baseurl=http://localrepo/fedora/updates/10/ppc/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f10-ppc-live-developer-respin.conf b/unity/conf/conf.d/revisor-f10-ppc-live-developer-respin.conf
index 4b3c3fd..eb8e83d 100644
--- a/unity/conf/conf.d/revisor-f10-ppc-live-developer-respin.conf
+++ b/unity/conf/conf.d/revisor-f10-ppc-live-developer-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 10 - ppc - Updates
baseurl=http://localrepo/fedora/updates/10/ppc/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f10-ppc-live-education-math-respin.conf b/unity/conf/conf.d/revisor-f10-ppc-live-education-math-respin.conf
index 4b3c3fd..eb8e83d 100644
--- a/unity/conf/conf.d/revisor-f10-ppc-live-education-math-respin.conf
+++ b/unity/conf/conf.d/revisor-f10-ppc-live-education-math-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 10 - ppc - Updates
baseurl=http://localrepo/fedora/updates/10/ppc/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f10-ppc-live-electronic-lab-respin.conf b/unity/conf/conf.d/revisor-f10-ppc-live-electronic-lab-respin.conf
index 4b3c3fd..eb8e83d 100644
--- a/unity/conf/conf.d/revisor-f10-ppc-live-electronic-lab-respin.conf
+++ b/unity/conf/conf.d/revisor-f10-ppc-live-electronic-lab-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 10 - ppc - Updates
baseurl=http://localrepo/fedora/updates/10/ppc/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f10-ppc-live-games-respin.conf b/unity/conf/conf.d/revisor-f10-ppc-live-games-respin.conf
index 4b3c3fd..eb8e83d 100644
--- a/unity/conf/conf.d/revisor-f10-ppc-live-games-respin.conf
+++ b/unity/conf/conf.d/revisor-f10-ppc-live-games-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 10 - ppc - Updates
baseurl=http://localrepo/fedora/updates/10/ppc/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f10-ppc-live-kde-respin.conf b/unity/conf/conf.d/revisor-f10-ppc-live-kde-respin.conf
index 4b3c3fd..eb8e83d 100644
--- a/unity/conf/conf.d/revisor-f10-ppc-live-kde-respin.conf
+++ b/unity/conf/conf.d/revisor-f10-ppc-live-kde-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 10 - ppc - Updates
baseurl=http://localrepo/fedora/updates/10/ppc/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f10-ppc-live-sugar-respin.conf b/unity/conf/conf.d/revisor-f10-ppc-live-sugar-respin.conf
index 4b3c3fd..eb8e83d 100644
--- a/unity/conf/conf.d/revisor-f10-ppc-live-sugar-respin.conf
+++ b/unity/conf/conf.d/revisor-f10-ppc-live-sugar-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 10 - ppc - Updates
baseurl=http://localrepo/fedora/updates/10/ppc/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f10-ppc-live-xfce-respin.conf b/unity/conf/conf.d/revisor-f10-ppc-live-xfce-respin.conf
index 4b3c3fd..eb8e83d 100644
--- a/unity/conf/conf.d/revisor-f10-ppc-live-xfce-respin.conf
+++ b/unity/conf/conf.d/revisor-f10-ppc-live-xfce-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 10 - ppc - Updates
baseurl=http://localrepo/fedora/updates/10/ppc/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f10-ppc-respin.conf b/unity/conf/conf.d/revisor-f10-ppc-respin.conf
index 4b3c3fd..eb8e83d 100644
--- a/unity/conf/conf.d/revisor-f10-ppc-respin.conf
+++ b/unity/conf/conf.d/revisor-f10-ppc-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 10 - ppc - Updates
baseurl=http://localrepo/fedora/updates/10/ppc/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f10-ppc-single-cd.conf b/unity/conf/conf.d/revisor-f10-ppc-single-cd.conf
index 4b3c3fd..eb8e83d 100644
--- a/unity/conf/conf.d/revisor-f10-ppc-single-cd.conf
+++ b/unity/conf/conf.d/revisor-f10-ppc-single-cd.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 10 - ppc - Updates
baseurl=http://localrepo/fedora/updates/10/ppc/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f10-ppc64-live-desktop-respin.conf b/unity/conf/conf.d/revisor-f10-ppc64-live-desktop-respin.conf
index 24cc68e..fd7f509 100644
--- a/unity/conf/conf.d/revisor-f10-ppc64-live-desktop-respin.conf
+++ b/unity/conf/conf.d/revisor-f10-ppc64-live-desktop-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 10 - ppc64 - Updates
baseurl=http://localrepo/fedora/updates/10/ppc64/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f10-ppc64-live-developer-respin.conf b/unity/conf/conf.d/revisor-f10-ppc64-live-developer-respin.conf
index 24cc68e..fd7f509 100644
--- a/unity/conf/conf.d/revisor-f10-ppc64-live-developer-respin.conf
+++ b/unity/conf/conf.d/revisor-f10-ppc64-live-developer-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 10 - ppc64 - Updates
baseurl=http://localrepo/fedora/updates/10/ppc64/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f10-ppc64-live-education-math-respin.conf b/unity/conf/conf.d/revisor-f10-ppc64-live-education-math-respin.conf
index 24cc68e..fd7f509 100644
--- a/unity/conf/conf.d/revisor-f10-ppc64-live-education-math-respin.conf
+++ b/unity/conf/conf.d/revisor-f10-ppc64-live-education-math-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 10 - ppc64 - Updates
baseurl=http://localrepo/fedora/updates/10/ppc64/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f10-ppc64-live-electronic-lab-respin.conf b/unity/conf/conf.d/revisor-f10-ppc64-live-electronic-lab-respin.conf
index 24cc68e..fd7f509 100644
--- a/unity/conf/conf.d/revisor-f10-ppc64-live-electronic-lab-respin.conf
+++ b/unity/conf/conf.d/revisor-f10-ppc64-live-electronic-lab-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 10 - ppc64 - Updates
baseurl=http://localrepo/fedora/updates/10/ppc64/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f10-ppc64-live-games-respin.conf b/unity/conf/conf.d/revisor-f10-ppc64-live-games-respin.conf
index 24cc68e..fd7f509 100644
--- a/unity/conf/conf.d/revisor-f10-ppc64-live-games-respin.conf
+++ b/unity/conf/conf.d/revisor-f10-ppc64-live-games-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 10 - ppc64 - Updates
baseurl=http://localrepo/fedora/updates/10/ppc64/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f10-ppc64-live-kde-respin.conf b/unity/conf/conf.d/revisor-f10-ppc64-live-kde-respin.conf
index 24cc68e..fd7f509 100644
--- a/unity/conf/conf.d/revisor-f10-ppc64-live-kde-respin.conf
+++ b/unity/conf/conf.d/revisor-f10-ppc64-live-kde-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 10 - ppc64 - Updates
baseurl=http://localrepo/fedora/updates/10/ppc64/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f10-ppc64-live-sugar-respin.conf b/unity/conf/conf.d/revisor-f10-ppc64-live-sugar-respin.conf
index 24cc68e..fd7f509 100644
--- a/unity/conf/conf.d/revisor-f10-ppc64-live-sugar-respin.conf
+++ b/unity/conf/conf.d/revisor-f10-ppc64-live-sugar-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 10 - ppc64 - Updates
baseurl=http://localrepo/fedora/updates/10/ppc64/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f10-ppc64-live-xfce-respin.conf b/unity/conf/conf.d/revisor-f10-ppc64-live-xfce-respin.conf
index 24cc68e..fd7f509 100644
--- a/unity/conf/conf.d/revisor-f10-ppc64-live-xfce-respin.conf
+++ b/unity/conf/conf.d/revisor-f10-ppc64-live-xfce-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 10 - ppc64 - Updates
baseurl=http://localrepo/fedora/updates/10/ppc64/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f10-ppc64-respin.conf b/unity/conf/conf.d/revisor-f10-ppc64-respin.conf
index 24cc68e..fd7f509 100644
--- a/unity/conf/conf.d/revisor-f10-ppc64-respin.conf
+++ b/unity/conf/conf.d/revisor-f10-ppc64-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 10 - ppc64 - Updates
baseurl=http://localrepo/fedora/updates/10/ppc64/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f10-ppc64-single-cd.conf b/unity/conf/conf.d/revisor-f10-ppc64-single-cd.conf
index 24cc68e..fd7f509 100644
--- a/unity/conf/conf.d/revisor-f10-ppc64-single-cd.conf
+++ b/unity/conf/conf.d/revisor-f10-ppc64-single-cd.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 10 - ppc64 - Updates
baseurl=http://localrepo/fedora/updates/10/ppc64/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f10-x86_64-live-desktop-respin.conf b/unity/conf/conf.d/revisor-f10-x86_64-live-desktop-respin.conf
index 0e610f8..33a2a0d 100644
--- a/unity/conf/conf.d/revisor-f10-x86_64-live-desktop-respin.conf
+++ b/unity/conf/conf.d/revisor-f10-x86_64-live-desktop-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 10 - x86_64 - Updates
baseurl=http://localrepo/fedora/updates/10/x86_64/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f10-x86_64-live-developer-respin.conf b/unity/conf/conf.d/revisor-f10-x86_64-live-developer-respin.conf
index 0e610f8..33a2a0d 100644
--- a/unity/conf/conf.d/revisor-f10-x86_64-live-developer-respin.conf
+++ b/unity/conf/conf.d/revisor-f10-x86_64-live-developer-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 10 - x86_64 - Updates
baseurl=http://localrepo/fedora/updates/10/x86_64/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f10-x86_64-live-education-math-respin.conf b/unity/conf/conf.d/revisor-f10-x86_64-live-education-math-respin.conf
index 0e610f8..33a2a0d 100644
--- a/unity/conf/conf.d/revisor-f10-x86_64-live-education-math-respin.conf
+++ b/unity/conf/conf.d/revisor-f10-x86_64-live-education-math-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 10 - x86_64 - Updates
baseurl=http://localrepo/fedora/updates/10/x86_64/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f10-x86_64-live-electronic-lab-respin.conf b/unity/conf/conf.d/revisor-f10-x86_64-live-electronic-lab-respin.conf
index 0e610f8..33a2a0d 100644
--- a/unity/conf/conf.d/revisor-f10-x86_64-live-electronic-lab-respin.conf
+++ b/unity/conf/conf.d/revisor-f10-x86_64-live-electronic-lab-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 10 - x86_64 - Updates
baseurl=http://localrepo/fedora/updates/10/x86_64/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f10-x86_64-live-games-respin.conf b/unity/conf/conf.d/revisor-f10-x86_64-live-games-respin.conf
index 0e610f8..33a2a0d 100644
--- a/unity/conf/conf.d/revisor-f10-x86_64-live-games-respin.conf
+++ b/unity/conf/conf.d/revisor-f10-x86_64-live-games-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 10 - x86_64 - Updates
baseurl=http://localrepo/fedora/updates/10/x86_64/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f10-x86_64-live-kde-respin.conf b/unity/conf/conf.d/revisor-f10-x86_64-live-kde-respin.conf
index 0e610f8..33a2a0d 100644
--- a/unity/conf/conf.d/revisor-f10-x86_64-live-kde-respin.conf
+++ b/unity/conf/conf.d/revisor-f10-x86_64-live-kde-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 10 - x86_64 - Updates
baseurl=http://localrepo/fedora/updates/10/x86_64/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f10-x86_64-live-sugar-respin.conf b/unity/conf/conf.d/revisor-f10-x86_64-live-sugar-respin.conf
index 0e610f8..33a2a0d 100644
--- a/unity/conf/conf.d/revisor-f10-x86_64-live-sugar-respin.conf
+++ b/unity/conf/conf.d/revisor-f10-x86_64-live-sugar-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 10 - x86_64 - Updates
baseurl=http://localrepo/fedora/updates/10/x86_64/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f10-x86_64-live-xfce-respin.conf b/unity/conf/conf.d/revisor-f10-x86_64-live-xfce-respin.conf
index 0e610f8..33a2a0d 100644
--- a/unity/conf/conf.d/revisor-f10-x86_64-live-xfce-respin.conf
+++ b/unity/conf/conf.d/revisor-f10-x86_64-live-xfce-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 10 - x86_64 - Updates
baseurl=http://localrepo/fedora/updates/10/x86_64/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f10-x86_64-respin.conf b/unity/conf/conf.d/revisor-f10-x86_64-respin.conf
index 0e610f8..33a2a0d 100644
--- a/unity/conf/conf.d/revisor-f10-x86_64-respin.conf
+++ b/unity/conf/conf.d/revisor-f10-x86_64-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 10 - x86_64 - Updates
baseurl=http://localrepo/fedora/updates/10/x86_64/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f10-x86_64-single-cd.conf b/unity/conf/conf.d/revisor-f10-x86_64-single-cd.conf
index 0e610f8..33a2a0d 100644
--- a/unity/conf/conf.d/revisor-f10-x86_64-single-cd.conf
+++ b/unity/conf/conf.d/revisor-f10-x86_64-single-cd.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 10 - x86_64 - Updates
baseurl=http://localrepo/fedora/updates/10/x86_64/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f8-ppc-respin.conf b/unity/conf/conf.d/revisor-f8-ppc-respin.conf
index 7dc72e8..d402912 100644
--- a/unity/conf/conf.d/revisor-f8-ppc-respin.conf
+++ b/unity/conf/conf.d/revisor-f8-ppc-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 8 - ppc - Updates
baseurl=http://localrepo/fedora/updates/8/ppc/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f8-ppc-single-cd.conf b/unity/conf/conf.d/revisor-f8-ppc-single-cd.conf
index 7dc72e8..d402912 100644
--- a/unity/conf/conf.d/revisor-f8-ppc-single-cd.conf
+++ b/unity/conf/conf.d/revisor-f8-ppc-single-cd.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 8 - ppc - Updates
baseurl=http://localrepo/fedora/updates/8/ppc/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f8-ppc64-respin.conf b/unity/conf/conf.d/revisor-f8-ppc64-respin.conf
index a42d56c..5189fc2 100644
--- a/unity/conf/conf.d/revisor-f8-ppc64-respin.conf
+++ b/unity/conf/conf.d/revisor-f8-ppc64-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 8 - ppc64 - Updates
baseurl=http://localrepo/fedora/updates/8/ppc64/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f8-ppc64-single-cd.conf b/unity/conf/conf.d/revisor-f8-ppc64-single-cd.conf
index a42d56c..5189fc2 100644
--- a/unity/conf/conf.d/revisor-f8-ppc64-single-cd.conf
+++ b/unity/conf/conf.d/revisor-f8-ppc64-single-cd.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 8 - ppc64 - Updates
baseurl=http://localrepo/fedora/updates/8/ppc64/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f8-x86_64-respin.conf b/unity/conf/conf.d/revisor-f8-x86_64-respin.conf
index 4f95ed9..d2503e6 100644
--- a/unity/conf/conf.d/revisor-f8-x86_64-respin.conf
+++ b/unity/conf/conf.d/revisor-f8-x86_64-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 8 - x86_64 - Updates
baseurl=http://localrepo/fedora/updates/8/x86_64/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f8-x86_64-single-cd.conf b/unity/conf/conf.d/revisor-f8-x86_64-single-cd.conf
index 4f95ed9..d2503e6 100644
--- a/unity/conf/conf.d/revisor-f8-x86_64-single-cd.conf
+++ b/unity/conf/conf.d/revisor-f8-x86_64-single-cd.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 8 - x86_64 - Updates
baseurl=http://localrepo/fedora/updates/8/x86_64/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f9-i386-live-desktop-respin.conf b/unity/conf/conf.d/revisor-f9-i386-live-desktop-respin.conf
index d23d8f6..c6be01f 100644
--- a/unity/conf/conf.d/revisor-f9-i386-live-desktop-respin.conf
+++ b/unity/conf/conf.d/revisor-f9-i386-live-desktop-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 9 - i386 - Updates
baseurl=http://localrepo/fedora/updates/9/i386/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f9-i386-live-developer-respin.conf b/unity/conf/conf.d/revisor-f9-i386-live-developer-respin.conf
index d23d8f6..c6be01f 100644
--- a/unity/conf/conf.d/revisor-f9-i386-live-developer-respin.conf
+++ b/unity/conf/conf.d/revisor-f9-i386-live-developer-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 9 - i386 - Updates
baseurl=http://localrepo/fedora/updates/9/i386/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f9-i386-live-education-math-respin.conf b/unity/conf/conf.d/revisor-f9-i386-live-education-math-respin.conf
index d23d8f6..c6be01f 100644
--- a/unity/conf/conf.d/revisor-f9-i386-live-education-math-respin.conf
+++ b/unity/conf/conf.d/revisor-f9-i386-live-education-math-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 9 - i386 - Updates
baseurl=http://localrepo/fedora/updates/9/i386/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f9-i386-live-electronic-lab-respin.conf b/unity/conf/conf.d/revisor-f9-i386-live-electronic-lab-respin.conf
index d23d8f6..c6be01f 100644
--- a/unity/conf/conf.d/revisor-f9-i386-live-electronic-lab-respin.conf
+++ b/unity/conf/conf.d/revisor-f9-i386-live-electronic-lab-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 9 - i386 - Updates
baseurl=http://localrepo/fedora/updates/9/i386/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f9-i386-live-games-respin.conf b/unity/conf/conf.d/revisor-f9-i386-live-games-respin.conf
index d23d8f6..c6be01f 100644
--- a/unity/conf/conf.d/revisor-f9-i386-live-games-respin.conf
+++ b/unity/conf/conf.d/revisor-f9-i386-live-games-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 9 - i386 - Updates
baseurl=http://localrepo/fedora/updates/9/i386/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f9-i386-live-kde-respin.conf b/unity/conf/conf.d/revisor-f9-i386-live-kde-respin.conf
index d23d8f6..c6be01f 100644
--- a/unity/conf/conf.d/revisor-f9-i386-live-kde-respin.conf
+++ b/unity/conf/conf.d/revisor-f9-i386-live-kde-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 9 - i386 - Updates
baseurl=http://localrepo/fedora/updates/9/i386/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f9-i386-live-xfce-respin.conf b/unity/conf/conf.d/revisor-f9-i386-live-xfce-respin.conf
index d23d8f6..c6be01f 100644
--- a/unity/conf/conf.d/revisor-f9-i386-live-xfce-respin.conf
+++ b/unity/conf/conf.d/revisor-f9-i386-live-xfce-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 9 - i386 - Updates
baseurl=http://localrepo/fedora/updates/9/i386/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f9-i386-rebrand-testing.conf b/unity/conf/conf.d/revisor-f9-i386-rebrand-testing.conf
index d23d8f6..c6be01f 100644
--- a/unity/conf/conf.d/revisor-f9-i386-rebrand-testing.conf
+++ b/unity/conf/conf.d/revisor-f9-i386-rebrand-testing.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 9 - i386 - Updates
baseurl=http://localrepo/fedora/updates/9/i386/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f9-i386-respin.conf b/unity/conf/conf.d/revisor-f9-i386-respin.conf
index d23d8f6..c6be01f 100644
--- a/unity/conf/conf.d/revisor-f9-i386-respin.conf
+++ b/unity/conf/conf.d/revisor-f9-i386-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 9 - i386 - Updates
baseurl=http://localrepo/fedora/updates/9/i386/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f9-i386-single-cd.conf b/unity/conf/conf.d/revisor-f9-i386-single-cd.conf
index d23d8f6..c6be01f 100644
--- a/unity/conf/conf.d/revisor-f9-i386-single-cd.conf
+++ b/unity/conf/conf.d/revisor-f9-i386-single-cd.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 9 - i386 - Updates
baseurl=http://localrepo/fedora/updates/9/i386/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f9-ppc-live-desktop-respin.conf b/unity/conf/conf.d/revisor-f9-ppc-live-desktop-respin.conf
index 48cd3e9..02ad476 100644
--- a/unity/conf/conf.d/revisor-f9-ppc-live-desktop-respin.conf
+++ b/unity/conf/conf.d/revisor-f9-ppc-live-desktop-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 9 - ppc - Updates
baseurl=http://localrepo/fedora/updates/9/ppc/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f9-ppc-live-developer-respin.conf b/unity/conf/conf.d/revisor-f9-ppc-live-developer-respin.conf
index 48cd3e9..02ad476 100644
--- a/unity/conf/conf.d/revisor-f9-ppc-live-developer-respin.conf
+++ b/unity/conf/conf.d/revisor-f9-ppc-live-developer-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 9 - ppc - Updates
baseurl=http://localrepo/fedora/updates/9/ppc/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f9-ppc-live-education-math-respin.conf b/unity/conf/conf.d/revisor-f9-ppc-live-education-math-respin.conf
index 48cd3e9..02ad476 100644
--- a/unity/conf/conf.d/revisor-f9-ppc-live-education-math-respin.conf
+++ b/unity/conf/conf.d/revisor-f9-ppc-live-education-math-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 9 - ppc - Updates
baseurl=http://localrepo/fedora/updates/9/ppc/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f9-ppc-live-electronic-lab-respin.conf b/unity/conf/conf.d/revisor-f9-ppc-live-electronic-lab-respin.conf
index 48cd3e9..02ad476 100644
--- a/unity/conf/conf.d/revisor-f9-ppc-live-electronic-lab-respin.conf
+++ b/unity/conf/conf.d/revisor-f9-ppc-live-electronic-lab-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 9 - ppc - Updates
baseurl=http://localrepo/fedora/updates/9/ppc/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f9-ppc-live-games-respin.conf b/unity/conf/conf.d/revisor-f9-ppc-live-games-respin.conf
index 48cd3e9..02ad476 100644
--- a/unity/conf/conf.d/revisor-f9-ppc-live-games-respin.conf
+++ b/unity/conf/conf.d/revisor-f9-ppc-live-games-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 9 - ppc - Updates
baseurl=http://localrepo/fedora/updates/9/ppc/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f9-ppc-live-kde-respin.conf b/unity/conf/conf.d/revisor-f9-ppc-live-kde-respin.conf
index 48cd3e9..02ad476 100644
--- a/unity/conf/conf.d/revisor-f9-ppc-live-kde-respin.conf
+++ b/unity/conf/conf.d/revisor-f9-ppc-live-kde-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 9 - ppc - Updates
baseurl=http://localrepo/fedora/updates/9/ppc/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f9-ppc-live-xfce-respin.conf b/unity/conf/conf.d/revisor-f9-ppc-live-xfce-respin.conf
index 48cd3e9..02ad476 100644
--- a/unity/conf/conf.d/revisor-f9-ppc-live-xfce-respin.conf
+++ b/unity/conf/conf.d/revisor-f9-ppc-live-xfce-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 9 - ppc - Updates
baseurl=http://localrepo/fedora/updates/9/ppc/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f9-ppc-respin.conf b/unity/conf/conf.d/revisor-f9-ppc-respin.conf
index 48cd3e9..02ad476 100644
--- a/unity/conf/conf.d/revisor-f9-ppc-respin.conf
+++ b/unity/conf/conf.d/revisor-f9-ppc-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 9 - ppc - Updates
baseurl=http://localrepo/fedora/updates/9/ppc/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f9-ppc-single-cd.conf b/unity/conf/conf.d/revisor-f9-ppc-single-cd.conf
index 48cd3e9..02ad476 100644
--- a/unity/conf/conf.d/revisor-f9-ppc-single-cd.conf
+++ b/unity/conf/conf.d/revisor-f9-ppc-single-cd.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 9 - ppc - Updates
baseurl=http://localrepo/fedora/updates/9/ppc/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f9-ppc64-live-desktop-respin.conf b/unity/conf/conf.d/revisor-f9-ppc64-live-desktop-respin.conf
index 4f74e2b..e5348b4 100644
--- a/unity/conf/conf.d/revisor-f9-ppc64-live-desktop-respin.conf
+++ b/unity/conf/conf.d/revisor-f9-ppc64-live-desktop-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 9 - ppc64 - Updates
baseurl=http://localrepo/fedora/updates/9/ppc64/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f9-ppc64-live-developer-respin.conf b/unity/conf/conf.d/revisor-f9-ppc64-live-developer-respin.conf
index 4f74e2b..e5348b4 100644
--- a/unity/conf/conf.d/revisor-f9-ppc64-live-developer-respin.conf
+++ b/unity/conf/conf.d/revisor-f9-ppc64-live-developer-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 9 - ppc64 - Updates
baseurl=http://localrepo/fedora/updates/9/ppc64/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f9-ppc64-live-education-math-respin.conf b/unity/conf/conf.d/revisor-f9-ppc64-live-education-math-respin.conf
index 4f74e2b..e5348b4 100644
--- a/unity/conf/conf.d/revisor-f9-ppc64-live-education-math-respin.conf
+++ b/unity/conf/conf.d/revisor-f9-ppc64-live-education-math-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 9 - ppc64 - Updates
baseurl=http://localrepo/fedora/updates/9/ppc64/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f9-ppc64-live-electronic-lab-respin.conf b/unity/conf/conf.d/revisor-f9-ppc64-live-electronic-lab-respin.conf
index 4f74e2b..e5348b4 100644
--- a/unity/conf/conf.d/revisor-f9-ppc64-live-electronic-lab-respin.conf
+++ b/unity/conf/conf.d/revisor-f9-ppc64-live-electronic-lab-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 9 - ppc64 - Updates
baseurl=http://localrepo/fedora/updates/9/ppc64/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f9-ppc64-live-games-respin.conf b/unity/conf/conf.d/revisor-f9-ppc64-live-games-respin.conf
index 4f74e2b..e5348b4 100644
--- a/unity/conf/conf.d/revisor-f9-ppc64-live-games-respin.conf
+++ b/unity/conf/conf.d/revisor-f9-ppc64-live-games-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 9 - ppc64 - Updates
baseurl=http://localrepo/fedora/updates/9/ppc64/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f9-ppc64-live-kde-respin.conf b/unity/conf/conf.d/revisor-f9-ppc64-live-kde-respin.conf
index 4f74e2b..e5348b4 100644
--- a/unity/conf/conf.d/revisor-f9-ppc64-live-kde-respin.conf
+++ b/unity/conf/conf.d/revisor-f9-ppc64-live-kde-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 9 - ppc64 - Updates
baseurl=http://localrepo/fedora/updates/9/ppc64/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f9-ppc64-live-xfce-respin.conf b/unity/conf/conf.d/revisor-f9-ppc64-live-xfce-respin.conf
index 4f74e2b..e5348b4 100644
--- a/unity/conf/conf.d/revisor-f9-ppc64-live-xfce-respin.conf
+++ b/unity/conf/conf.d/revisor-f9-ppc64-live-xfce-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 9 - ppc64 - Updates
baseurl=http://localrepo/fedora/updates/9/ppc64/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f9-ppc64-respin.conf b/unity/conf/conf.d/revisor-f9-ppc64-respin.conf
index 4f74e2b..e5348b4 100644
--- a/unity/conf/conf.d/revisor-f9-ppc64-respin.conf
+++ b/unity/conf/conf.d/revisor-f9-ppc64-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 9 - ppc64 - Updates
baseurl=http://localrepo/fedora/updates/9/ppc64/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f9-ppc64-single-cd.conf b/unity/conf/conf.d/revisor-f9-ppc64-single-cd.conf
index 4f74e2b..e5348b4 100644
--- a/unity/conf/conf.d/revisor-f9-ppc64-single-cd.conf
+++ b/unity/conf/conf.d/revisor-f9-ppc64-single-cd.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 9 - ppc64 - Updates
baseurl=http://localrepo/fedora/updates/9/ppc64/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f9-x86_64-live-desktop-respin.conf b/unity/conf/conf.d/revisor-f9-x86_64-live-desktop-respin.conf
index 0151d18..3903160 100644
--- a/unity/conf/conf.d/revisor-f9-x86_64-live-desktop-respin.conf
+++ b/unity/conf/conf.d/revisor-f9-x86_64-live-desktop-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 9 - x86_64 - Updates
baseurl=http://localrepo/fedora/updates/9/x86_64/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f9-x86_64-live-developer-respin.conf b/unity/conf/conf.d/revisor-f9-x86_64-live-developer-respin.conf
index 0151d18..3903160 100644
--- a/unity/conf/conf.d/revisor-f9-x86_64-live-developer-respin.conf
+++ b/unity/conf/conf.d/revisor-f9-x86_64-live-developer-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 9 - x86_64 - Updates
baseurl=http://localrepo/fedora/updates/9/x86_64/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f9-x86_64-live-education-math-respin.conf b/unity/conf/conf.d/revisor-f9-x86_64-live-education-math-respin.conf
index 0151d18..3903160 100644
--- a/unity/conf/conf.d/revisor-f9-x86_64-live-education-math-respin.conf
+++ b/unity/conf/conf.d/revisor-f9-x86_64-live-education-math-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 9 - x86_64 - Updates
baseurl=http://localrepo/fedora/updates/9/x86_64/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f9-x86_64-live-electronic-lab-respin.conf b/unity/conf/conf.d/revisor-f9-x86_64-live-electronic-lab-respin.conf
index 0151d18..3903160 100644
--- a/unity/conf/conf.d/revisor-f9-x86_64-live-electronic-lab-respin.conf
+++ b/unity/conf/conf.d/revisor-f9-x86_64-live-electronic-lab-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 9 - x86_64 - Updates
baseurl=http://localrepo/fedora/updates/9/x86_64/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f9-x86_64-live-games-respin.conf b/unity/conf/conf.d/revisor-f9-x86_64-live-games-respin.conf
index 0151d18..3903160 100644
--- a/unity/conf/conf.d/revisor-f9-x86_64-live-games-respin.conf
+++ b/unity/conf/conf.d/revisor-f9-x86_64-live-games-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 9 - x86_64 - Updates
baseurl=http://localrepo/fedora/updates/9/x86_64/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f9-x86_64-live-kde-respin.conf b/unity/conf/conf.d/revisor-f9-x86_64-live-kde-respin.conf
index 0151d18..3903160 100644
--- a/unity/conf/conf.d/revisor-f9-x86_64-live-kde-respin.conf
+++ b/unity/conf/conf.d/revisor-f9-x86_64-live-kde-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 9 - x86_64 - Updates
baseurl=http://localrepo/fedora/updates/9/x86_64/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f9-x86_64-live-xfce-respin.conf b/unity/conf/conf.d/revisor-f9-x86_64-live-xfce-respin.conf
index 0151d18..3903160 100644
--- a/unity/conf/conf.d/revisor-f9-x86_64-live-xfce-respin.conf
+++ b/unity/conf/conf.d/revisor-f9-x86_64-live-xfce-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 9 - x86_64 - Updates
baseurl=http://localrepo/fedora/updates/9/x86_64/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f9-x86_64-respin.conf b/unity/conf/conf.d/revisor-f9-x86_64-respin.conf
index 0151d18..3903160 100644
--- a/unity/conf/conf.d/revisor-f9-x86_64-respin.conf
+++ b/unity/conf/conf.d/revisor-f9-x86_64-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 9 - x86_64 - Updates
baseurl=http://localrepo/fedora/updates/9/x86_64/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-f9-x86_64-single-cd.conf b/unity/conf/conf.d/revisor-f9-x86_64-single-cd.conf
index 0151d18..3903160 100644
--- a/unity/conf/conf.d/revisor-f9-x86_64-single-cd.conf
+++ b/unity/conf/conf.d/revisor-f9-x86_64-single-cd.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 9 - x86_64 - Updates
baseurl=http://localrepo/fedora/updates/9/x86_64/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-os9-i386-single-cd.conf b/unity/conf/conf.d/revisor-os9-i386-single-cd.conf
index d23d8f6..c6be01f 100644
--- a/unity/conf/conf.d/revisor-os9-i386-single-cd.conf
+++ b/unity/conf/conf.d/revisor-os9-i386-single-cd.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 9 - i386 - Updates
baseurl=http://localrepo/fedora/updates/9/i386/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-os9-ppc-single-cd.conf b/unity/conf/conf.d/revisor-os9-ppc-single-cd.conf
index 48cd3e9..02ad476 100644
--- a/unity/conf/conf.d/revisor-os9-ppc-single-cd.conf
+++ b/unity/conf/conf.d/revisor-os9-ppc-single-cd.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 9 - ppc - Updates
baseurl=http://localrepo/fedora/updates/9/ppc/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-os9-ppc64-single-cd.conf b/unity/conf/conf.d/revisor-os9-ppc64-single-cd.conf
index 4f74e2b..e5348b4 100644
--- a/unity/conf/conf.d/revisor-os9-ppc64-single-cd.conf
+++ b/unity/conf/conf.d/revisor-os9-ppc64-single-cd.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 9 - ppc64 - Updates
baseurl=http://localrepo/fedora/updates/9/ppc64/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
diff --git a/unity/conf/conf.d/revisor-os9-x86_64-single-cd.conf b/unity/conf/conf.d/revisor-os9-x86_64-single-cd.conf
index 0151d18..3903160 100644
--- a/unity/conf/conf.d/revisor-os9-x86_64-single-cd.conf
+++ b/unity/conf/conf.d/revisor-os9-x86_64-single-cd.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 9 - x86_64 - Updates
baseurl=http://localrepo/fedora/updates/9/x86_64/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
commit b3b281b961aef8f2a71ace32da582581fcf52b34
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Fri Jan 30 03:21:35 2009 +0100
No longer exclude namazu
diff --git a/unity/conf/conf.d/revisor-f10-i386-respin.conf b/unity/conf/conf.d/revisor-f10-i386-respin.conf
index edacdd5..a3c62cc 100644
--- a/unity/conf/conf.d/revisor-f10-i386-respin.conf
+++ b/unity/conf/conf.d/revisor-f10-i386-respin.conf
@@ -33,7 +33,7 @@ gpgcheck=1
name=Fedora 10 - i386 - Updates
baseurl=http://localrepo/fedora/updates/10/i386/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-release…
-exclude=namazu
+exclude=
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
@@ -85,3 +85,4 @@ enabled=1
name=Fedora Unity Anaconda Updates for Fedora 10 - Sources
baseurl=http://www.kanarip.com/anaconda/f10/SRPMS/
enabled=0
+
commit fdcf76c1530faabf6861b51e6f28686f6c01bc34
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Fri Jan 30 03:21:10 2009 +0100
Use the self.cfg.include_bootiso setting
diff --git a/revisor/pungi.py b/revisor/pungi.py
index 6d3ad7b..584a4a2 100644
--- a/revisor/pungi.py
+++ b/revisor/pungi.py
@@ -422,6 +422,7 @@ cost=500
# Hey I get size in bytes but I want MBytes
timber = splittree.Timber()
+ timber.cfg = self.cfg
timber.log = self.log
timber.arch = self.cfg.architecture
timber.disc_size = float(media_size / 1024 / 1024)
@@ -573,7 +574,11 @@ cost=500
if mt["discs"] > 1:
volume = "%s%d" % (volume, disc)
- extraargs.extend(['"%s"' % volume, '-o', isofile])
+ extraargs.extend(['"%s"' % volume])
+ extraargs.extend(['-o', isofile])
+
+ if not self.cfg.include_bootiso:
+ extraargs.extend(['-m', '*.iso'])
if disc == 0:
extraargs.append(self.topdir)
diff --git a/revisor/splittree.py b/revisor/splittree.py
index f8970c9..21b0fd5 100755
--- a/revisor/splittree.py
+++ b/revisor/splittree.py
@@ -168,7 +168,11 @@ self.reserve_size : Additional size needed to be reserved on the first disc.
for i in range(self.bin_list[0], self.bin_list[-1] + 1):
if i == 1:
- p = os.popen('find %s/ -type f -not -name .discinfo -not -name "*\.rpm"' % self.dist_dir, 'r')
+ if self.cfg.include_bootiso:
+ p = os.popen('find %s/ -type f -not -name .discinfo -not -name "*\.rpm"' % self.dist_dir, 'r')
+ else:
+ p = os.popen('find %s/ -type f -not -name .discinfo -not -name "*\.rpm" -not -name "boot.iso"' % self.dist_dir, 'r')
+
filelist = p.read()
p.close()
filelist = string.split(filelist)
commit e48bf30b28825dccdc98b66f9c360d7de9960b7e
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Fri Jan 30 03:20:21 2009 +0100
Add a setting on whether to include the boot.iso on the .iso files
diff --git a/revisor/cfg.py b/revisor/cfg.py
index 2e0ca16..bfc75f3 100644
--- a/revisor/cfg.py
+++ b/revisor/cfg.py
@@ -1051,6 +1051,9 @@ class Defaults:
# Installation Media Options
# Append this when kickstart is set to boot by default:
self.im_append = ''
+ # Whether or not to include boot.iso on the optical media
+ # The default is to not include it
+ self.include_bootiso = 0
# Live Media options
self.lm_use_shadow = True
commit cbcfea619e95dc3a4ca059c610a94c1a3edd5426
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Wed Jan 28 02:33:50 2009 +0100
Remove trailing whitespace
diff --git a/unity/Makefile.am b/unity/Makefile.am
index 896261e..559c81a 100644
--- a/unity/Makefile.am
+++ b/unity/Makefile.am
@@ -25,7 +25,7 @@ revisorconf_DATA = \
conf/conf.d/revisor-f9-ppc-single-cd.conf \
conf/conf.d/revisor-f9-x86_64-single-cd.conf \
conf/conf.d/revisor-f9-i386-live-desktop-respin.conf \
- conf/conf.d/revisor-f9-i386-live-developer-respin.conf \
+ conf/conf.d/revisor-f9-i386-live-developer-respin.conf \
conf/conf.d/revisor-f9-i386-live-education-math-respin.conf \
conf/conf.d/revisor-f9-i386-live-electronic-lab-respin.conf \
conf/conf.d/revisor-f9-i386-live-games-respin.conf \
@@ -61,7 +61,7 @@ revisorconf_DATA = \
conf/conf.d/revisor-f10-ppc-single-cd.conf \
conf/conf.d/revisor-f10-x86_64-single-cd.conf \
conf/conf.d/revisor-f10-i386-live-desktop-respin.conf \
- conf/conf.d/revisor-f10-i386-live-developer-respin.conf \
+ conf/conf.d/revisor-f10-i386-live-developer-respin.conf \
conf/conf.d/revisor-f10-i386-live-education-math-respin.conf \
conf/conf.d/revisor-f10-i386-live-electronic-lab-respin.conf \
conf/conf.d/revisor-f10-i386-live-games-respin.conf \
commit 2ef62d646826e9c33a9b36aec409c3c17cc4cc0d
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Tue Jan 27 13:05:01 2009 +0100
warning: value "revisor.png" for key "Icon" in group "Desktop Entry" is an icon name with an extension, but there should be no extension as described in the Icon Theme Specification if the value is not an absolute path
diff --git a/conf/revisor.desktop.in b/conf/revisor.desktop.in
index b521d82..108d13c 100644
--- a/conf/revisor.desktop.in
+++ b/conf/revisor.desktop.in
@@ -6,6 +6,6 @@ Categories=System;X-Red-Hat-Base;X-Fedora;PackageManager;GNOME;GTK;
Exec=/usr/bin/revisor
Terminal=false
Type=Application
-Icon=revisor.png
+Icon=revisor
Encoding=UTF-8
StartupNotify=true
commit c9ff9f1e5beacf029c4d866b46b04529ddbaeaae
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Tue Jan 27 12:47:25 2009 +0100
First add the @core group, only then add the @base group
diff --git a/revisor/base.py b/revisor/base.py
index 912358d..701c6e4 100644
--- a/revisor/base.py
+++ b/revisor/base.py
@@ -1680,7 +1680,8 @@ class RevisorBase:
self.log.debug(_("Appending group core and base"), level=7)
- ds.addGroups(["core", "base"])
+ ds.addGroups(["core"])
+ ds.addGroups(["base"])
for group in self.cfg.yumobj.comps.groups:
# Do not do this because the installer still has all the groups available
commit 2db939edc25733d56f77d062d199dfd705c480f0
Author: noik <noik00(a)gmail.com>
Date: Mon Jan 26 11:07:08 2009 +0100
Duckrevisor class added, logger cleaned up
added a test .ks
diff --git a/revisor/modcomposer/__init__.py b/revisor/modcomposer/__init__.py
index ad399fe..5b89ad4 100755
--- a/revisor/modcomposer/__init__.py
+++ b/revisor/modcomposer/__init__.py
@@ -45,7 +45,7 @@ class RevisorComposer():
return 1
def composer_logon(self):
- print "Logging on..."
+ self.base.log.info("Logging on...")
try:
print "1"
hub = Connection("http://localhost:9321")
@@ -146,12 +146,11 @@ class RevisorComposer():
#Threads
def thread_start_compose(composer, job_id, kickstart_file):
- print "Starting Spin: test.ks"
- time.sleep(15)
try:
- print "#######################################################"
- print kickstart_file
- print "#######################################################"
+ revisor = DuckRevisor()
+ revisor.kickstart_file = kickstart_file
+ print "Starting Compose..."
+ revisor.start_compose()
except Exception, e:
#base.log.info("Spin creation process interrupted...")
raise e
@@ -193,4 +192,77 @@ class RevisorXMLRPCInterface(object):
return 1
def progress_update(self):
- return "99.934%"
\ No newline at end of file
+ return "99.934%"
+
+
+class DuckRevisor(revisor.Revisor):
+ """This class can quack like a Revisor - it is really just a stripped down version"""
+
+ def __init__(self):
+ """
+ self.args == Arguments passed on the CLI
+ self.cli_options == Parser results (again, CLI)
+ self.parser == The actual Parser (from OptionParser)
+ self.plugins == Our Plugins from Revisor
+ """
+
+ revisor.Revisor.__init__(self)
+
+ self.base = revisor.base.RevisorBase(self)
+
+ # Cheater! We have a cheater!
+ self.base.cfg.cli_mode = True
+ self.base.cfg.gui_mode = False
+ self.base.cfg.server_mode = False
+
+ def start_compose(self):
+ # Bwuhahaha
+ self.base.cfg.load_model(config=self.base.cfg.check_config("/etc/revisor/revisor.conf"),model=self.model)
+
+ self.base.cfg.media_installation_dvd = 1
+
+ # Set answer_yes to 1
+ self.base.cfg.answer_yes = 1
+
+ self.base.cfg.load_kickstart(self.kickstart_file)
+
+ self.base.cfg.check_options()
+
+ # Let's check for the existance of the directories we are going to work with:
+ # Since there may be mounts in there, if it fails we *need* to cancel
+ self.base.cfg.check_working_directory()
+
+ # Let's check for the existance of the directories in which our products go:
+ self.base.cfg.check_destination_directory()
+
+ self.base.setup_yum()
+
+ # FIXME: The following needs to happen here;
+ # 1) Check if the versions for related packages have been
+ # used before to compose the installer images.
+ # Since the compose of the installer images takes a
+ # relatively long time, and a lot of processing.
+ # If, somewhere in cache on the filesystem or something, the
+ # results of a previous compose are available, use
+ # cfg.reuse /path/to/installtree
+ #
+
+ self.base.lift_off()
+
+ #self.cli_options = copy(host.cli_options)
+ #self.cli_options.server_mode = False
+ #self.cli_options.gui_mode = False
+ #self.cli_options.cli_mode = False
+ #self.cli_options.headless_mode = True
+
+ #self.plugins = host.plugins
+
+ # Create me a RevisorBase instance
+# self.base = revisor.base.RevisorBase(self)
+
+ # Then run it.
+ # Do so after base.__init__() has completed or it'll fail
+ # Run from a function that lives here, because we can catch exceptions here,
+ # throw error codes, sys.exit(1) or just start all over again (if only just to
+ # unmount stuff).
+# self.run()
diff --git a/revisor/modhub/__init__.py b/revisor/modhub/__init__.py
index 361867c..8142c73 100644
--- a/revisor/modhub/__init__.py
+++ b/revisor/modhub/__init__.py
@@ -24,42 +24,44 @@ class RevisorHub():
pass
def run(self, base):
+ self.base = base
self.thread_count += 2
try:
+ self.base.log.info("Starting Threads...")
thread.start_new_thread(thread_do_polling,(base.cfg, self))
thread.start_new_thread(thread_do_xmlrpc,(base.cfg, self))
while self.thread_count > 1:
pass
- except KeyboardInterrupt:
- #base.log.info("Shutting Down...")
+ except Exception, e:
+ self.base.log.info("Shutting Down...")
pass
def db_get_ks(self): #Private function?
- print "Getting test.ks from Database."
- return open('revisor/modhub/test.ks', 'rb')
+ self.base.log.info("* Getting test.ks from Database.")
+ return open('revisor/modhub/anaconda-ks.cfg', 'rb')
def db_check_jobs(self):
# Wake the Composer, send Job_id and kickstart_file
# check jobs in DB
- print "Checking Database for Jobs"
+ self.base.log.info("* Checking Database for Jobs")
# get KS from DB if any found
return self.db_get_ks()
def db_add_composer(self, composer_host, composer_port):
self.count_composers += 1
- print "New composer added. ComposerID:", self.count_composers, "\nComposerHost:", composer_host, "ComposerPort:", composer_port
+ self.base.log.info("New composer added.")
+ print "* ComposerHost:", composer_host, "ComposerPort:", composer_port
return self.count_composers
def db_remove_composer(self, composer_id):
self.count_composers -= 1
- print "Composer removed. ComposerID:", composer_id
+ self.base.log.info("Composer removed. ComposerID:")
return self.count_composers
def do_xmlrpc(self, cfg):
xinterface = RevisorXMLRPCInterface(self, cfg)
server = RevisorXMLRPCServer(('', int(cfg.hub_port)))
server.register_introspection_functions()
- cfg.log.info("Hub XMLRPC Server running on port %s..." % cfg.hub_port)
server.register_instance(xinterface)
while True:
try:
@@ -73,23 +75,27 @@ class RevisorHub():
while True:
time.sleep(3)
# Check DB for new KS file.
- binary_ks_file = xmlrpclib.Binary(self.db_check_jobs().read())
if self.count_composers > 0:
# Check if a Composer is present. Check if it's not busy
try:
composer = Connection("http://localhost:9322") # Make connection with the chosen Composer
- if not composer.con.are_you_awake():
- # Wake the Composer, send Job_id and kicckstart_file
- job_id += 1
- print "Ready Composer found! Sending Job#", job_id
- composer.con.wake_composer(job_id, binary_ks_file)
- else:
- print "No ready Composer found! Retry-ing in 7 seconds"
- time.sleep(7)
except Exception, e:
- raise e
+ raise e
+ if not composer.con.are_you_awake():
+ job_id += 1
+ try:
+ self.base.log.info("* Ready Composer found! Getting kickstart file...")
+ binary_ks_file = xmlrpclib.Binary(self.db_check_jobs().read())
+ self.base.log.info("* Waking Composer. Sending File...")
+ composer.con.wake_composer(job_id, binary_ks_file)
+ self.base.log.info("* File sent.")
+ except Exception, e:
+ raise e
+ else:
+ self.base.log.info("Can't start Job. No ready Composer found.")
+ time.sleep(7)
else:
- print "Can't start Job. No Composer logged in!"
+ self.base.log.info("Can't start Job. No Composer logged in.")
def add_options(self, parser):
modhub_group = parser.add_option_group("Hub Options")
@@ -103,6 +109,7 @@ class RevisorHub():
action = "store",
default = "9321",
help = _("Port to start Hub mode on."),
+
metavar = "[hub-port]")
def check_options(self, cfg, cli_options):
@@ -126,11 +133,11 @@ class RevisorHub():
# Threads
def thread_do_xmlrpc(cfg, revisorHub):
- print "Hub XML-RPC Thread Started..."
+ revisorHub.base.log.info( "* Hub XML-RPC Thread Started...")
revisorHub.do_xmlrpc(cfg)
def thread_do_polling(cfg, revisorHub):
- print "Hub Polling Thread Started..."
+ revisorHub.base.log.info("* Hub Polling Thread Started...")
revisorHub.do_polling(cfg)
@@ -205,4 +212,4 @@ class ComposerList:
pass
except NameError:
pass
- pass
\ No newline at end of file
+ pass
diff --git a/revisor/modhub/anaconda-ks.cfg b/revisor/modhub/anaconda-ks.cfg
new file mode 100644
index 0000000..8caf9a3
--- /dev/null
+++ b/revisor/modhub/anaconda-ks.cfg
@@ -0,0 +1,20 @@
+# Kickstart file automatically generated by anaconda.
+
+#version=DEVEL
+install
+lang en_US.UTF-8
+keyboard us-acentos
+rootpw --iscrypted $6$SC8xYH7EL8atn/b4$/A8nHX4cW0rfMAq1x32V3YRSasFZIi/WE/c6CK2am2sjy8Ae85lgsKnz15o7CmhfT4UXSCTE93R4Sm17kQxvh1
+firewall --service=ssh
+authconfig --enableshadow --passalgo=sha512
+selinux --enforcing
+timezone --utc Europe/Amsterdam
+bootloader --location=mbr --driveorder=sda --append="rhgb quiet"
+# The following is the partition information you requested
+# Note that any partitions you deleted are not expressed
+# here so unless you clear all partitions first, this is
+# not guaranteed to work
+#clearpart --linux
+#part / --fstype ext3 --onpart sda2
+#part /home --fstype ext3 --noformat --onpart sda3
+#part swap --onpart sda4
commit 890741860994d1d6461b27d3ff4d2b86124a95cd
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Sat Jan 24 18:15:22 2009 +0100
Fix modisolinux to also listen to the configuration file setting, instead
of just the command-line option
diff --git a/revisor/modisolinux/__init__.py b/revisor/modisolinux/__init__.py
index 6667611..7357e98 100644
--- a/revisor/modisolinux/__init__.py
+++ b/revisor/modisolinux/__init__.py
@@ -52,13 +52,17 @@ class RevisorIsolinux:
"""This function checks the option rebrand"""
self.cfg = cfg
self.log = cfg.log
- if not cli_options.isolinux_cfg == "":
+ if not cli_options.isolinux_cfg == self.cfg.defaults.isolinux_cfg:
if self.cfg.kickstart_default:
self.log.warning(_("Both --kickstart-default and --isolinux-cfg have been specified, while they are mutually exclusive. --isolinux-cfg is going to be used."))
self.cfg.kickstart_default = False
# FIXME: Test if the file is readable
self.cfg.isolinux_cfg = cli_options.isolinux_cfg
+ elif not cli_options.isolinux_cfg == self.cfg.isolinux_cfg:
+ if self.cfg.kickstart_default:
+ self.log.warning(_("Both --kickstart-default and --isolinux-cfg have been specified, while they are mutually exclusive. --isolinux-cfg is going to be used."))
+ self.cfg.kickstart_default = False
else:
self.cfg.isolinux_cfg = False
@@ -70,6 +74,12 @@ class RevisorIsolinux:
return False
def post_exec_buildinstall(self):
+ if self.cfg.isolinux_cfg == False:
+ self.log.debug(_("How come isolinux_cfg is set to False?"),level=9)
+
+ if self.cfg.isolinux_cfg == "":
+ self.log.debug(_("How come isolinux_cfg is an empty string?"),level=9)
+
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:
@@ -82,3 +92,5 @@ class RevisorIsolinux:
self.log.warning(_("Could not copy in the new isolinux.cfg"))
except:
self.log.warning(_("Could not unlink the old isolinux.cfg?"))
+ else:
+ self.log.debug(_("Not replacing isolinux.cfg"),level=9)
commit f3abe6062952d7b51a7f55ecf70551a5a3ff153b
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Sat Jan 24 18:14:52 2009 +0100
Increment progress bar for packages being downloaded already in cache as well
diff --git a/revisor/base.py b/revisor/base.py
index 498a86f..912358d 100644
--- a/revisor/base.py
+++ b/revisor/base.py
@@ -1069,8 +1069,18 @@ class RevisorBase:
dlCb = revisor.progress.dlcb(pbar, dlpkgs, log=self.log, cfg=self.cfg)
self.cfg.yumobj.repos.setProgressBar(dlCb)
+
+ # Packages already downloaded
+ real_dlpkgs = []
+ for po in dlpkgs:
+ if os.path.exists(po.localPkg()) and os.path.getsize(po.localPkg()) == int(po.returnSimple('packagesize')):
+ self.log.debug(_("Using local copy of %s-%s-%s.%s at %s") % (po.name, po.version, po.release, po.arch, po.localPkg()), level=9)
+ dlCb._do_end(1)
+ else:
+ real_dlpkgs.append(po)
+
try:
- probs = self.cfg.yumobj.downloadPkgs(dlpkgs, dlCb)
+ probs = self.cfg.yumobj.downloadPkgs(real_dlpkgs, dlCb)
except yum.Errors.RepoError, errmsg:
self.log.error(errmsg)
except IndexError:
commit f400beed1095e2c0c48692332568b3c0ac926f19
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Wed Jan 14 19:25:38 2009 +0100
Add fedora-10-gold to git repo
diff --git a/conf/conf.d/fedora-10-gold.cfg b/conf/conf.d/fedora-10-gold.cfg
new file mode 100644
index 0000000..80d2293
--- /dev/null
+++ b/conf/conf.d/fedora-10-gold.cfg
@@ -0,0 +1,181 @@
+# Kickstart file for composing the "Fedora" spin of Fedora (rawhide)
+# Maintained by the Fedora Release Engineering team:
+# https://fedoraproject.org/wiki/ReleaseEngineering
+# mailto:rel-eng@lists.fedoraproject.org
+
+# Use a part of 'iso' to define how large you want your isos.
+# Only used when composing to more than one iso.
+# Default is 695 (megs), CD size.
+# Listed below is the size of a DVD if you wanted to split higher.
+#part iso --size=4998
+
+# Add the repos you wish to use to compose here. At least one of them needs group data.
+repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
+repo --name=rawhide-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch
+
+# Package manifest for the compose. Uses repo group metadata to translate groups.
+# (@base is added by default unless you add --nobase to %packages)
+# (default groups for the configured repos are added by --default)
+%packages --default
+# core
+tcsh
+kernel*
+-kernel*debug*
+-kernel-kdump*
+-syslog-ng
+# Desktop Packages
+@kde-desktop
+echo-icon-theme
+tracker
+swfdec
+libflashsupport
+nspluginwrapper
+liferea
+esc
+thunderbird
+# apps
+@authoring-and-publishing
+@eclipse
+joe
+emacs
+k3b
+@system-tools
+wireshark-gnome
+# Devel packages
+@development-libs
+@development-tools
+@fedora-packager
+@gnome-software-development
+@java-development
+@kde-software-development
+@web-development
+@x-software-development
+# Server packages
+@dns-server
+@ftp-server
+@mail-server
+@mysql
+@network-server
+@news-server
+@server-cfg
+@smb-server
+@sql-server
+@web-server --optional
+# Keep dap off the install media, makes Eng & Sci show up
+-dap-server-cgi
+# Virt group
+@virtualization --optional
+# filesystem stuff
+reiserfs-utils
+xfsprogs
+jfsutils
+# Languages
+@afrikaans-support
+@albanian-support
+@arabic-support
+@armenian-support
+@assamese-support
+@basque-support
+@belarusian-support
+@bengali-support
+@bhutanese-support
+@burmese-support
+@bosnian-support
+@brazilian-support
+@breton-support
+@british-support
+@bulgarian-support
+@catalan-support
+@chinese-support
+@croatian-support
+@czech-support
+@danish-support
+@dutch-support
+@esperanto-support
+@estonian-support
+@ethiopic-support
+@faeroese-support
+@filipino-support
+@finnish-support
+@french-support
+@gaelic-support
+@galician-support
+@georgian-support
+@german-support
+@greek-support
+@gujarati-support
+@hebrew-support
+@hindi-support
+@hungarian-support
+@icelandic-support
+@indonesian-support
+@inuktitut-support
+@irish-support
+@italian-support
+@japanese-support
+@kannada-support
+@kashmiri-support
+@kashubian-support
+@khmer-support
+@konkani-support
+@korean-support
+@lao-support
+@latvian-support
+@lithuanian-support
+@low-saxon-support
+@macedonian-support
+@malay-support
+@malayalam-support
+@maori-support
+@marathi-support
+@mongolian-support
+@nepali-support
+@northern-sami-support
+@northern-sotho-support
+@norwegian-support
+@oriya-support
+@persian-support
+@polish-support
+@portuguese-support
+@punjabi-support
+@romanian-support
+@russian-support
+@samoan-support
+@serbian-support
+@sindhi-support
+@sinhala-support
+@slovak-support
+@slovenian-support
+@somali-support
+@southern-ndebele-support
+@southern-sotho-support
+@spanish-support
+@swati-support
+@swedish-support
+@tagalog-support
+@tamil-support
+@telugu-support
+@thai-support
+@tibetan-support
+@tonga-support
+@tsonga-support
+@tswana-support
+@turkish-support
+@ukrainian-support
+@urdu-support
+@venda-support
+@vietnamese-support
+@walloon-support
+@welsh-support
+@xhosa-support
+@zulu-support
+# Size removals
+-gimp-help
+-java-1.6.0-openjdk-src
+-xorg-x11-docs
+-kernel-doc
+-java-1.5.0-gcj-src
+-java-1.5.0-gcj-devel
+-libgcj-src
+-*javadoc*
+%end
commit 829e73675f2c04ceb217722e391cc514bce038d3
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Tue Jan 13 04:09:54 2009 -0500
Revamp modrebrand based on our new cheat in DEVEL-buildinstall, independent of anaconda
diff --git a/revisor/modrebrand/__init__.py b/revisor/modrebrand/__init__.py
index 8d76fa3..d952fa3 100644
--- a/revisor/modrebrand/__init__.py
+++ b/revisor/modrebrand/__init__.py
@@ -31,54 +31,40 @@ from rhpl.translate import _
class RevisorRebrand:
def __init__(self):
- """Builds rebranded packages"""
+ """This module allows rebranding"""
pass
def set_defaults(self, defaults):
- defaults.rebrand_packages = "fedora-release fedora-release-notes fedora-logos"
-
- def buildinstall_append(self):
- """Ensure that buildinstall includes the appropriate logos package"""
- if not self.cfg.rebrand:
- return
-
- self.cfg.buildinstall_append = ["--logopkg", "generic-logos"]
+ defaults.rebrand_packages = "system-release system-release-notes system-logos"
def pre_resolve_dependencies(self):
- """Ensure that packages related to rebranding are actually being replaced:
- - Remove fedora-logos
- - Add <rebrand-name>-logos if available
- - Add generic-logos if <rebrand-name>-logos not available
- """
+ """Ensure that packages related to rebranding are actually being replaced."""
if not self.cfg.rebrand:
+ self.log.debug(_("Not rebranding pre_resolve_dependencies"), level=9)
return
- ## Search for all these packages
- #matches = []
- #for pkg_search in ["*-logos", "*-release", "*-release-notes"]:
- #try:
- #pkglist = self.cfg.yumobj.pkgSack.simplePkgList()
-
- #if re.match('.*[\*,\[,\],\{,\},\?].*', pkg_search):
- #restring = fnmatch.translate(pkg_search)
- #regex = re.compile(restring, flags=re.I) # case insensitive
- #for item in pkglist:
- #if regex.match(item[0]):
- #matches.append(item[0])
- #except yum.Errors.PackageSackError, e:
- #if self.cfg.ksobj._get("packages","handleMissing") != kickstart.constants.KS_MISSING_IGNORE:
- #self.log.warning(e.value)
+ # Find what provides the capabilities listed in self.cfg.rebrand_packages
+ # Trim their names to brand names
+ # Remove all packages <brand>-*
+ # Add the brand from self.cfg.rebrand.lower().replace(' ','').strip()
+ # Add the brand from generic if that fails
- #print str(matches)
+ for capability in self.cfg.rebrand_packages.split():
+ pkgs = self.cfg.yumobj.whatProvides(capability, None, None).returnPackages()
+ for po in pkgs:
+ try:
+ if po.name.startswith(self.cfg.rebrand):
+ self.log.debug(_("Adding %s-%s-%s.%s") % (po.name, po.version, po.release, po.arch), level=9)
+ self.cfg.yumobj.addInstall(po)
+ else:
+ self.log.debug(_("Removing %s-%s-%s.%s") % (po.name, po.version, po.release, po.arch), level=9)
+ self.cfg.yumobj.tsInfo.remove(po)
+ except:
+ pass
- for pkg in revisor.misc.resolve_pkgs(self.cfg.yumobj, self.cfg.rebrand_packages.split(), log=self.log):
- try:
- pkgs = self.cfg.yumobj.pkgSack.returnNewestByName(pkg)
- for po in pkgs:
- self.cfg.yumobj.tsInfo.remove(po)
- self.log.debug(_("Removing package %s-%s:%s-%s.%s for rebranding") % (po.name, po.epoch, po.version, po.release, po.arch))
- except:
- pass
+ def post_resolve_dependencies(self):
+ """Ensure that no branded packages have been pulled in by dependency resolving"""
+ pass
def add_options(self, parser):
"""Adds a Rebrand Options group to the OptionParser instance you give it (parser),
@@ -96,13 +82,10 @@ class RevisorRebrand:
self.cfg = cfg
self.log = cfg.log
if not cli_options.rebrand == "":
+ self.log.debug(_("Setting rebrand to %s") % cli_options.rebrand, level=9)
+ # Check if there's a space in the brand name
self.cfg.rebrand = cli_options.rebrand
- else:
+ # FIXME: Maybe set iso_label, iso_basename and product_name from this string right now as well
+ # Consider these values have been deliberitly set to different values
+ elif not self.cfg.rebrand:
self.cfg.rebrand = False
-
-class MakeCallback:
- def __init__(self):
- pass
-
- def parse_line(self, msg):
- print msg
commit 160e5010a7a5c794efaad3060ccfba85ee94430c
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Tue Jan 13 04:07:25 2009 -0500
Update DEVEL-buildinstall to the latest version in rawhide
Fix indentation in DEVEL-buildinstall
Add the rebranding cheat
diff --git a/scripts/DEVEL-buildinstall b/scripts/DEVEL-buildinstall
index 97eaf61..614623f 100755
--- a/scripts/DEVEL-buildinstall
+++ b/scripts/DEVEL-buildinstall
@@ -18,68 +18,76 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
+die() {
+ [ -n "$TREEDIR" ] && rm -rf $TREEDIR
+ [ -n "$BUILDINSTDIR" ] && rm -rf $BUILDINSTDIR
+ [ -n "$yumconf" ] && rm -rf $yumconf
+ echo "Aborting buildinstall"
+ echo "$@"
+ exit 1
+}
+
usage() {
- echo "Usage: buildinstall --version <version> --product <product> --release <comment> [--output outputdir] [--discs <discstring>] <root>" >&2
- exit 1
+ echo "Usage: buildinstall --version <version> --product <product> --release <comment> [--output outputdir] [--discs <discstring>] <root>" >&2
+ exit 1
}
PRODUCTPATH="anaconda"
while [ $# -gt 0 ]; do
case $1 in
- # general options affecting how we build things
- --nogr)
- NOGRSTR="--nogr"
- shift
- ;;
- --debug)
- DEBUGSTR="--debug"
- shift
- ;;
-
- # release information
- --version)
- VERSION=$2
- shift; shift
- ;;
- --release)
- RELEASESTR=$2
- shift; shift
- ;;
+ # general options affecting how we build things
+ --nogr)
+ NOGRSTR="--nogr"
+ shift
+ ;;
+ --debug)
+ DEBUGSTR="--debug"
+ shift
+ ;;
+
+ # release information
+ --version)
+ VERSION=$2
+ shift; shift
+ ;;
+ --release)
+ RELEASESTR=$2
+ shift; shift
+ ;;
--product)
- PRODUCTSTR=$2
- shift; shift
- ;;
- --variant)
- VARIANT=$2
- shift; shift
- ;;
- --bugurl)
- BUGURL=$2
- shift; shift
- ;;
-
- --output)
- OUTPUT=$2
- shift; shift
- ;;
- --updates)
- UPDATES=$2
- shift; shift
- ;;
- --mirrorlist)
- MIRRORLIST="$MIRRORLIST $2"
- shift; shift
- ;;
-
- *)
- if [ -z "$REPO" ]; then
- REPO=$1
- else
- EXTRA_REPOS="$EXTRA_REPOS $1"
- fi
- shift
- ;;
+ PRODUCTSTR=$2
+ shift; shift
+ ;;
+ --variant)
+ VARIANT=$2
+ shift; shift
+ ;;
+ --bugurl)
+ BUGURL=$2
+ shift; shift
+ ;;
+ --output)
+ OUTPUT=$2
+ shift; shift
+ ;;
+ --updates)
+ UPDATES=$2
+ shift; shift
+ ;;
+ --mirrorlist)
+ MIRRORLIST="$MIRRORLIST $2"
+ shift; shift
+ ;;
+
+ *)
+ if [ -z "$REPO" ]; then
+ REPO=$1
+ else
+ EXTRA_REPOS="$EXTRA_REPOS $1"
+ fi
+ shift
+ ;;
esac
done
@@ -120,6 +128,17 @@ BUILDINSTDIR=$(mktemp -d ${TMPDIR:-/tmp}/buildinstall.tree.XXXXXX)
TREEDIR=$(mktemp -d ${TMPDIR:-/tmp}/treedir.XXXXXX)
CACHEDIR=$(mktemp -d ${TMPDIR:-/tmp}/yumcache.XXXXXX)
+# The first -release and -logos package we are going to look for is the lowercase
+# equivalent of the PRODUCTSTR
+export brandpkgname="`echo $PRODUCTSTR | tr '[:upper:]' '[:lower:]'`"
+
+# The other -release and -logos packages will need to be excluded
+for pkg in fedora redhat generic; do
+ if [ "$pkg" != "$brandpkgname" ]; then
+ EXCLUDEPKGS="$EXCLUDEPKGS ${pkg}-release ${pkg}-logos"
+ fi
+done
+
yumconf=$(mktemp ${TMPDIR:-/tmp}/yum.conf.XXXXXX)
cat > $yumconf <<EOF
[main]
@@ -129,6 +148,7 @@ gpgcheck=0
plugins=0
reposdir=
tsflags=nodocs
+exclude=$EXCLUDEPKGS
[anacondarepo]
name=anaconda repo
@@ -180,11 +200,11 @@ BUILDINSTALL=./buildinstall
for f in $UPD_INSTROOT $MK_IMAGES $MK_STAMP $MK_TREEINFO $BUILDINSTALL; do
if [ -n "$UPDATES" -a -f $UPDATES/usr/lib/anaconda-runtime/$f ]; then
- cp -a $UPDATES/usr/lib/anaconda-runtime/$f* $BUILDINSTDIR/
+ cp -a $UPDATES/usr/lib/anaconda-runtime/$f* $BUILDINSTDIR/
elif [ ! -f $f ]; then
- cp -a $BUILDINSTDIR/usr/lib/anaconda-runtime/$f* $BUILDINSTDIR/
+ cp -a $BUILDINSTDIR/usr/lib/anaconda-runtime/$f* $BUILDINSTDIR/
else
- cp -a $f* $BUILDINSTDIR/
+ cp -a $f* $BUILDINSTDIR/
fi
done
@@ -197,14 +217,14 @@ BUILDINSTALL=$BUILDINSTDIR/buildinstall
if [ -n "$UPDATES" ]; then UPDATES="--updates $UPDATES"; fi
echo "Building images..."
-$UPD_INSTROOT $DEBUGSTR $NOGRSTR --arch $BUILDARCH $UPDATES --imgdir $TREEDIR/install $yumconf
+$UPD_INSTROOT $DEBUGSTR $NOGRSTR --arch $BUILDARCH $UPDATES --imgdir $TREEDIR/install $yumconf || die "upd-instroot failed"
echo "Writing .treeinfo file..."
$MK_TREEINFO --family="$PRODUCTSTR" ${VARIANT:+--variant="$VARIANT"} --version=$VERSION --arch=$BUILDARCH --outfile=$OUTPUT/.treeinfo
# FIXME: need to update mk-images to take the yumconf
echo "Making images..."
-$MK_IMAGES $DEBUGSTR $NOGRSTR --imgdir $TREEDIR/install --arch $BUILDARCH --product "$PRODUCTSTR" --version $VERSION --bugurl "$BUGURL" --output $OUTPUT $yumconf
+$MK_IMAGES $DEBUGSTR $NOGRSTR --imgdir $TREEDIR/install --arch $BUILDARCH --product "$PRODUCTSTR" --version $VERSION --bugurl "$BUGURL" --output $OUTPUT $yumconf || die "image creation failed"
echo "Writing .discinfo file"
$MK_STAMP --releasestr="$RELEASESTR" --arch=$BUILDARCH --discNum="ALL" --outfile=$OUTPUT/.discinfo
commit 24da8806da09550d49d0795d7ce7f3f6db72cc20
Author: Piotr Drąg <piotrdrag(a)gmail.com>
Date: Fri Dec 19 23:47:32 2008 +0000
Updated Polish translation
Transmitted-via: Transifex (translate.fedoraproject.org)
diff --git a/po/Changelog b/po/Changelog
index 03833d9..ced8a09 100644
--- a/po/Changelog
+++ b/po/Changelog
@@ -2,6 +2,8 @@ Updated Polish translation
Transmitted-via: Transifex (translate.fedoraproject.org)Updated Polish translation
+Transmitted-via: Transifex (translate.fedoraproject.org)Updated Polish translation
+
Transmitted-via: Transifex (translate.fedoraproject.org)Updated German translation
Transmitted-via: Transifex (translate.fedoraproject.org)Updatet brazilian portuguese translation
diff --git a/po/pl.po b/po/pl.po
index caf27e2..8706fdf 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: pl\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-14 23:56+0100\n"
-"PO-Revision-Date: 2008-12-14 23:58+0100\n"
+"POT-Creation-Date: 2008-12-20 00:07+0100\n"
+"PO-Revision-Date: 2008-12-20 00:46+0100\n"
"Last-Translator: Piotr Drąg <piotrdrag(a)gmail.com>\n"
"Language-Team: Polish <pl(a)li.org>\n"
"MIME-Version: 1.0\n"
@@ -1242,49 +1242,53 @@ msgid "Running Revisor in Hub mode..."
msgstr "Uruchamianie Revisora w trybie huba..."
#: ../revisor/base.py:117
+msgid "Running Revisor in Composer mode..."
+msgstr "Uruchamianie Revisora w trybie kompozytora..."
+
+#: ../revisor/base.py:122
msgid "Running Revisor in RPC Server mode..."
msgstr "Uruchamianie Revisora w trybie serwera RPC..."
-#: ../revisor/base.py:121 ../revisor/base.py:127
+#: ../revisor/base.py:126 ../revisor/base.py:132
msgid "Running Revisor in GUI mode..."
msgstr "Uruchamianie Revisora w trybie GUI..."
-#: ../revisor/base.py:182
+#: ../revisor/base.py:187
#, python-format
msgid "Opening up /usr/bin/htmlview %s%s"
msgstr "Otwieranie /usr/bin/htmlview %s%s"
#. self.mode.base_buttons_xml.get_widget("button_information").set_sensitive(True)
-#: ../revisor/base.py:186
+#: ../revisor/base.py:191
#, python-format
msgid "Cannot fork process showing help, please use %s%s"
msgstr "Nie można rozdzielić procesu wyświetlania pomocy, użyj %s%s"
-#: ../revisor/base.py:188
+#: ../revisor/base.py:193
#, python-format
msgid "Cannot show Help in CLI mode, use %s%s"
msgstr "Nie można wyświetlić pomocy w trybie CLI, użyj %s%s"
-#: ../revisor/base.py:196
+#: ../revisor/base.py:201
msgid "Loading Repositories"
msgstr "Wczytywanie repozytoriów"
-#: ../revisor/base.py:198
+#: ../revisor/base.py:203
#, python-format
msgid "Getting configuration from %s"
msgstr "Pobieranie konfiguracji z %s"
-#: ../revisor/base.py:205 ../revisor/base.py:266 ../revisor/base.py:273
-#: ../revisor/base.py:283 ../revisor/base.py:293 ../revisor/cfg.py:473
-#: ../revisor/cfg.py:484 ../revisor/cfg.py:497 ../revisor/pkgorder.py:178
-#: ../revisor/pkgorder.py:183 ../revisor/pkgorder.py:194
-#: ../revisor/pkgorder.py:197 ../revisor/pkgorder.py:206
-#: ../revisor/pkgorder.py:215
+#: ../revisor/base.py:210 ../revisor/base.py:271 ../revisor/base.py:278
+#: ../revisor/base.py:288 ../revisor/base.py:298 ../revisor/cfg.py:473
+#: ../revisor/cfg.py:484 ../revisor/cfg.py:497 ../revisor/pkgorder.py:190
+#: ../revisor/pkgorder.py:195 ../revisor/pkgorder.py:206
+#: ../revisor/pkgorder.py:209 ../revisor/pkgorder.py:218
+#: ../revisor/pkgorder.py:227
#, python-format
msgid "Using deprecated YUM function: %s()"
msgstr "Używanie przestarzałej funkcji yuma: %s()"
-#: ../revisor/base.py:207
+#: ../revisor/base.py:212
#, python-format
msgid ""
"yum.YumBase.doConfigSetup failed, probably an invalid configuration file %s"
@@ -1292,33 +1296,33 @@ msgstr ""
"yum.YumBase.doConfigSetup nie powiodło się, prawdopodobnie plik konfiguracji "
"%s jest nieprawidłowy"
-#: ../revisor/base.py:210
+#: ../revisor/base.py:215
#, python-format
msgid "Bumping YUMs debuglevel (%d) to our debuglevel (%d)"
msgstr "Podnoszenie poziomu raportowania błędów yuma (%d) na nasz poziom (%d)"
-#: ../revisor/base.py:212
+#: ../revisor/base.py:217
#, python-format
msgid "YUMs debuglevel now %d"
msgstr "Poziom raportowania błędów yuma wynosi teraz %d"
-#: ../revisor/base.py:247
+#: ../revisor/base.py:252
msgid "Another application is running which is accessing software information."
msgstr "Inna uruchomiona aplikacja ma dostęp do informacji o oprogramowaniu."
-#: ../revisor/base.py:252
+#: ../revisor/base.py:257
msgid "Fatal Error: Unable to retrieve software information.\n"
msgstr "Fatalny błąd: nie można pobierać informacji o oprogramowaniu.\n"
-#: ../revisor/base.py:262
+#: ../revisor/base.py:267
msgid "Setting up a Transaction Set"
msgstr "Ustawianie zestawu transakcji"
-#: ../revisor/base.py:269
+#: ../revisor/base.py:274
msgid "Getting myself a piece of the RPMDB"
msgstr "Pobieranie fragmentu RPMDB"
-#: ../revisor/base.py:276
+#: ../revisor/base.py:281
msgid ""
"Apparently we're running on an Enterprise Linux system (we can tell from the "
"way yum sets up the RPM Database)"
@@ -1326,38 +1330,38 @@ msgstr ""
"Działamy na systemie Enterprise Linux (możemy tak wywnioskować ze sposobu, w "
"jaki yum ustawia bazę danych RPM)"
-#: ../revisor/base.py:279
+#: ../revisor/base.py:284
msgid "Getting Repository Information"
msgstr "Pobieranie informacji o repozytoriach"
-#: ../revisor/base.py:286
+#: ../revisor/base.py:291
#, python-format
msgid "Arch list = %s"
msgstr "Lista architektur = %s"
-#: ../revisor/base.py:288
+#: ../revisor/base.py:293
msgid "Getting the Package Sacks"
msgstr "Pobieranie zestawów pakietów"
-#: ../revisor/base.py:298
+#: ../revisor/base.py:303
#, python-format
msgid "All OK so far, %d packages in the Package Sack"
msgstr "Jak na razie wszystko w porządku, %d pakietów w zestawie"
-#: ../revisor/base.py:311
+#: ../revisor/base.py:316
msgid ""
"Building a nice package list from ksdata, and adding it to the transaction"
msgstr "Budowanie ładnej listy pakietów z ksdata i dodawanie jej do transakcji"
-#: ../revisor/base.py:316
+#: ../revisor/base.py:321
msgid "Kickstart mode: respin"
msgstr "Tryb kickstart: ponowne komponowanie"
-#: ../revisor/base.py:319
+#: ../revisor/base.py:324
msgid "Kickstart mode: normal"
msgstr "Tryb kickstart: normalny"
-#: ../revisor/base.py:327
+#: ../revisor/base.py:332
#, python-format
msgid ""
"What we're getting from pykickstart is: %d groups, %d packages and %d "
@@ -1366,120 +1370,120 @@ msgstr ""
"Od pykickstart pobrano: %d grup, %d pakietów i %d wyłączonych pakietów. %d "
"pakietów zostało całkowicie zignorowanych."
-#: ../revisor/base.py:337 ../revisor/base.py:633
+#: ../revisor/base.py:342 ../revisor/base.py:638
msgid "Select kickstart packages"
msgstr "Wybierz pakiety kickstart"
-#: ../revisor/base.py:345
+#: ../revisor/base.py:350
#, python-format
msgid "Using pkgsack excludes, the list of packages to exclude is now: %r"
msgstr ""
"Używanie wykluczania pkgsack, lista pakietów do wykluczenia to teraz: %r"
-#: ../revisor/base.py:362 ../revisor/base.py:661
+#: ../revisor/base.py:367 ../revisor/base.py:666
msgid "Appending group @core"
msgstr "Dołączanie grupy @core"
-#: ../revisor/base.py:377 ../revisor/base.py:676
+#: ../revisor/base.py:382 ../revisor/base.py:681
msgid "Appending group @base"
msgstr "Dołączanie grupy @base"
-#: ../revisor/base.py:396 ../revisor/base.py:687
+#: ../revisor/base.py:401 ../revisor/base.py:698
#, python-format
msgid "Found group: %s"
msgstr "Znaleziono grupę: %s"
-#: ../revisor/base.py:402
+#: ../revisor/base.py:407
#, python-format
msgid "Repository metadata cannot be found: %s: %s"
msgstr "Nie można znaleźć metadanych repozytorium: %s: %s"
-#: ../revisor/base.py:405
+#: ../revisor/base.py:410
#, python-format
msgid "Group not found: %s"
msgstr "Nie znaleziono grupy: %s"
-#: ../revisor/base.py:417
+#: ../revisor/base.py:422
#, python-format
msgid "Selecting required packages for group %s"
msgstr "Wybieranie wymaganych pakietów dla grupy %s"
-#: ../revisor/base.py:421 ../revisor/base.py:442 ../revisor/base.py:463
-#: ../revisor/base.py:482
+#: ../revisor/base.py:426 ../revisor/base.py:447 ../revisor/base.py:468
+#: ../revisor/base.py:487
#, python-format
msgid "Including %s"
msgstr "Dołączanie %s"
-#: ../revisor/base.py:431
+#: ../revisor/base.py:436
#, python-format
msgid "From Groups (required): Adding %s-%s:%s-%s.%s to transaction"
msgstr "Z grup (wymagane): dodawanie %s-%s:%s-%s.%s do transakcji"
-#: ../revisor/base.py:438
+#: ../revisor/base.py:443
#, python-format
msgid "Selecting default packages for group %s"
msgstr "Wybieranie domyślnych pakietów dla grupy %s"
-#: ../revisor/base.py:451
+#: ../revisor/base.py:456
#, python-format
msgid "From Groups (default): Adding %s-%s:%s-%s.%s to transaction"
msgstr "Z grup (domyślne): dodawanie %s-%s:%s-%s.%s do transakcji"
-#: ../revisor/base.py:458
+#: ../revisor/base.py:463
#, python-format
msgid "Selecting optional packages for group %s"
msgstr "Wybieranie opcjonalnych pakietów dla grupy %s"
-#: ../revisor/base.py:472 ../revisor/base.py:491
+#: ../revisor/base.py:477 ../revisor/base.py:496
#, python-format
msgid "From Groups (optional): Adding %s-%s:%s-%s.%s to transaction"
msgstr "Z grup (opcjonalne): dodawanie %s-%s:%s-%s.%s do transakcji"
-#: ../revisor/base.py:478
+#: ../revisor/base.py:483
#, python-format
msgid "No include parameter for group %s, using defaults"
msgstr "Brak parametru dołączania dla grupy %s, używanie domyślnych"
-#: ../revisor/base.py:500 ../revisor/base.py:704
+#: ../revisor/base.py:505 ../revisor/base.py:715
#, python-format
msgid "Testing condition: %s / %s"
msgstr "Testowanie warunków: %s/%s"
-#: ../revisor/base.py:514
+#: ../revisor/base.py:519
#, python-format
msgid "From package list, including: %s"
msgstr "Z listy pakietów, dołączanie: %s"
-#: ../revisor/base.py:517
+#: ../revisor/base.py:522
#, python-format
msgid "Package %s is in excludeList, continuing"
msgstr "Pakiet %s znajduje się na liście wyłączonych, kontynuowanie"
-#: ../revisor/base.py:525
+#: ../revisor/base.py:530
msgid "No packages found!"
msgstr "Nie znaleziono pakietów!"
-#: ../revisor/base.py:530 ../revisor/base.py:559
+#: ../revisor/base.py:535 ../revisor/base.py:564
#, python-format
msgid "From Packages: Adding %s-%s:%s-%s.%s to transaction"
msgstr "Z pakietów: dodawanie %s-%s:%s-%s.%s do transakcji"
-#: ../revisor/base.py:537
+#: ../revisor/base.py:542
#, python-format
msgid "Could not find package '%s', searching..."
msgstr "Nie można znaleźć pakietu \"%s\", wyszukiwanie..."
-#: ../revisor/base.py:550
+#: ../revisor/base.py:555
#, python-format
msgid "Found packages matching '%s': %s"
msgstr "Znaleziono pakiety pasujące do \"%s\": %s"
-#: ../revisor/base.py:561
+#: ../revisor/base.py:566
#, python-format
msgid "From Packages: Not adding %s now because it is in the ignore list"
msgstr "Z pakietów: nie dodano teraz %s, ponieważ jest na liście ignorowanych"
-#: ../revisor/base.py:572
+#: ../revisor/base.py:577
#, python-format
msgid ""
"More then one package found for %s-%s-%s.%s - going to add them all to the "
@@ -1488,22 +1492,22 @@ msgstr ""
"Znaleziono więcej niż jeden pakiet dla %s-%s-%s.%s - wszystkie zostaną "
"dodane do transakcji"
-#: ../revisor/base.py:574
+#: ../revisor/base.py:579
#, python-format
msgid "Could not find package %s-%s-%s.%s"
msgstr "Nie można znaleźć pakietu %s-%s-%s.%s"
-#: ../revisor/base.py:577
+#: ../revisor/base.py:582
#, python-format
msgid "From Packages (exact string %s-%s-%s.%s), selecting %s-%s-%s.%s"
msgstr "Z pakietów: (dokładny łańcuch %s-%s-%s.%s), wybieranie %s-%s-%s.%s"
-#: ../revisor/base.py:597 ../revisor/base.py:752
+#: ../revisor/base.py:602 ../revisor/base.py:763
#, python-format
msgid "From Excludes: Removing %s-%s:%s-%s.%s from transaction"
msgstr "Z wykluczonych: usuwanie %s-%s:%s-%s.%s z transakcji"
-#: ../revisor/base.py:600 ../revisor/base.py:755
+#: ../revisor/base.py:605 ../revisor/base.py:766
#, python-format
msgid ""
"Apparently trying to exclude a package that is not available in the "
@@ -1512,7 +1516,7 @@ msgstr ""
"Próbujesz wykluczyć pakiet, który nie jest dostępny we wczytanych "
"repozytoriach lub nie został dodany do transakcji: %s"
-#: ../revisor/base.py:606
+#: ../revisor/base.py:611
#, python-format
msgid ""
"\n"
@@ -1532,11 +1536,11 @@ msgstr ""
"Można kontynuować z tymi małymi błędami, ale wynik może zdecydowanie różnić "
"się od oczekiwanego."
-#: ../revisor/base.py:612
+#: ../revisor/base.py:617
msgid "This is what was selected to be installed:"
msgstr "Wybrane do zainstalowania:"
-#: ../revisor/base.py:625
+#: ../revisor/base.py:630
#, python-format
msgid ""
"What we're getting from pykickstart is: %d groups, %d packages and %d "
@@ -1544,54 +1548,54 @@ msgid ""
msgstr ""
"Od pykickstart pobrano: %d grup, %d pakietów i %d wyłączonych pakietów."
-#: ../revisor/base.py:644
+#: ../revisor/base.py:649
#, python-format
msgid "Using pkgsack excludes, excluded packages is now: %r"
msgstr "Używanie wykluczania pkgsack, wykluczone pakiety to teraz: %r"
-#: ../revisor/base.py:684
+#: ../revisor/base.py:695
#, python-format
msgid "No such group %s"
msgstr "Brak grupy %s"
-#: ../revisor/base.py:741
+#: ../revisor/base.py:752
#, python-format
msgid "Adding %s-%s:%s-%s.%s"
msgstr "Dodawanie %s-%s:%s-%s.%s"
-#: ../revisor/base.py:773
+#: ../revisor/base.py:784
msgid "Initting progress bar for "
msgstr "Rozpoczynanie paska postępu dla "
-#: ../revisor/base.py:780
+#: ../revisor/base.py:791
msgid "Apparently we have not yet entered the Build Media stage"
msgstr "Najwyraźniej nie przeszliśmy jeszcze do etapu budowania nośnika"
-#: ../revisor/base.py:809 ../revisor/misc.py:158
+#: ../revisor/base.py:820 ../revisor/misc.py:181
#, python-format
msgid "Checking dependencies for %s.%s"
msgstr "Sprawdzanie zależności %s.%s"
#. pbar.cur_task += 1.0
-#: ../revisor/base.py:831 ../revisor/misc.py:185
+#: ../revisor/base.py:842 ../revisor/misc.py:207
#, 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:838 ../revisor/misc.py:192
+#: ../revisor/base.py:849 ../revisor/misc.py:214
#, 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:841 ../revisor/misc.py:198
+#: ../revisor/base.py:852 ../revisor/misc.py:155
msgid "Checking dependencies - allowing conflicts within the package set"
msgstr "Sprawdzanie zależności - pozwalanie na konflikty w zestawie pakietów"
-#: ../revisor/base.py:842 ../revisor/base.py:871
+#: ../revisor/base.py:853 ../revisor/base.py:882
msgid "Resolving Dependencies"
msgstr "Rozwiązywanie zależności"
-#: ../revisor/base.py:864
+#: ../revisor/base.py:875
#, python-format
msgid ""
"The following packages were excluded using the kickstart package manifest, "
@@ -1602,13 +1606,13 @@ msgstr ""
"kickstart, ale zostały dołączone, aby rozwiązać zależności:\n"
" - %s"
-#: ../revisor/base.py:870
+#: ../revisor/base.py:881
msgid ""
"Checking dependencies - not allowing any conflicts within the package set"
msgstr ""
"Sprawdzanie zależności - nie pozwalanie na konflikty w zestawie pakietów"
-#: ../revisor/base.py:898
+#: ../revisor/base.py:909
#, python-format
msgid ""
"Unable to resolve dependencies for some packages selected:\n"
@@ -1620,16 +1624,16 @@ msgstr ""
"%s"
#. End of dependency resolving
-#: ../revisor/base.py:902 ../revisor/image.py:97
+#: ../revisor/base.py:913 ../revisor/image.py:97
msgid "Unable to build transaction"
msgstr "Nie można zbudować transakcji"
-#: ../revisor/base.py:907 ../revisor/image.py:102
+#: ../revisor/base.py:918 ../revisor/image.py:102
#, python-format
msgid "Succesfully built transaction: ret %s, msg %s"
msgstr "Pomyślnie zbudowano transakcję: ret %s, komunikat %s"
-#: ../revisor/base.py:913
+#: ../revisor/base.py:924
#, python-format
msgid ""
"Errors where encountered while downloading package headers:\n"
@@ -1640,7 +1644,7 @@ msgstr ""
"\n"
"%s"
-#: ../revisor/base.py:922
+#: ../revisor/base.py:933
msgid ""
"The package set after dependency resolving does not match the packages "
"selected in the kickstart manifest"
@@ -1648,203 +1652,203 @@ msgstr ""
"Zestaw pakietów po rozwiązaniu zależności nie zgadza się z pakietami "
"wybranymi w manifeście kickstart"
-#: ../revisor/base.py:949
+#: ../revisor/base.py:960
#, python-format
msgid "No such repository: %s"
msgstr "Brak repozytorium: %s"
-#: ../revisor/base.py:951
+#: ../revisor/base.py:962
#, python-format
msgid "Enabling %s repository"
msgstr "Włączanie repozytorium %s"
-#: ../revisor/base.py:970
+#: ../revisor/base.py:981
#, python-format
msgid "Disabling %s repository"
msgstr "Wyłączanie repozytorium %s"
-#: ../revisor/base.py:977
+#: ../revisor/base.py:988
msgid "Creating a list of SRPMs"
msgstr "Tworzenie listy źródłowych pakietów RPM"
-#: ../revisor/base.py:992
+#: ../revisor/base.py:1003
msgid "Source RPM PO already in the list"
msgstr "PO źródłowego pakietu RPM jest już na liście"
-#: ../revisor/base.py:994
+#: ../revisor/base.py:1005
#, python-format
msgid "Source RPM found in non-source repository %s"
msgstr "Źródłowy pakiet RPM znaleziono w repozytorium nieźródłowym %s"
-#: ../revisor/base.py:996
+#: ../revisor/base.py:1007
#, python-format
msgid "Error: Cannot find a source rpm for %s"
msgstr "Błąd: nie można znaleźć źródłowego RPM-a dla %s"
-#: ../revisor/base.py:998 ../revisor/modgui/build_media.py:106
+#: ../revisor/base.py:1009 ../revisor/modgui/build_media.py:106
#: ../revisor/modgui/build_media.py:142 ../revisor/modgui/build_media.py:219
msgid "Downloading Source Packages"
msgstr "Pobieranie pakietów źródłowych"
-#: ../revisor/base.py:1027 ../revisor/progress.py:441
+#: ../revisor/base.py:1038 ../revisor/progress.py:441
#, python-format
msgid "Downloading %s"
msgstr "Pobieranie %s"
-#: ../revisor/base.py:1057 ../revisor/modgui/build_media.py:101
+#: ../revisor/base.py:1068 ../revisor/modgui/build_media.py:101
#: ../revisor/modgui/build_media.py:214
msgid "Downloading Packages"
msgstr "Pobieranie pakietów"
-#: ../revisor/base.py:1066
+#: ../revisor/base.py:1077
msgid "Unable to find a suitable mirror."
msgstr "Nie można znaleźć odpowiedniego serwera lustrzanego."
-#: ../revisor/base.py:1078
+#: ../revisor/base.py:1089
#, python-format
msgid "Errors were encountered while downloading packages: %s"
msgstr "Podczas pobierania pakietów pakietów wystąpiły błędy: %s"
-#: ../revisor/base.py:1119
+#: ../revisor/base.py:1131
#, python-format
msgid "Overriding auto package selection with user package selection for %s..."
msgstr ""
"Zastępowanie automatycznego wyboru pakietów pakietami wybranymi przez "
"użytkownika dla %s..."
-#: ../revisor/base.py:1132
+#: ../revisor/base.py:1144
#, python-format
msgid "Adding required package %s-%s:%s-%s.%s"
msgstr "Dodawanie wymaganego pakietu %s-%s:%s-%s.%s"
#. This list has already been resolved
-#: ../revisor/base.py:1135
+#: ../revisor/base.py:1147
#, python-format
msgid "%s. This is a required package."
msgstr "%s. Ten pakiet jest wymagany."
-#: ../revisor/base.py:1147
+#: ../revisor/base.py:1159
#, python-format
msgid "Adding suggested package %s-%s:%s-%s.%s"
msgstr "Dodawanie sugerowanego pakietu %s-%s:%s-%s.%s"
-#: ../revisor/base.py:1157
+#: ../revisor/base.py:1169
#, python-format
msgid "Packages that do not need to be on the media: %s"
msgstr "Pakiety, które nie muszą być na nośniku: %s"
-#: ../revisor/base.py:1182 ../revisor/base.py:1208
+#: ../revisor/base.py:1194 ../revisor/base.py:1220
msgid "Did not succeed in adding in all required packages"
msgstr "Dodanie wszystkich wymaganych pakietów nie powiodło się"
-#: ../revisor/base.py:1216
+#: ../revisor/base.py:1228
msgid "Populating statistics"
msgstr "Tworzenie statystyk"
-#: ../revisor/base.py:1232
+#: ../revisor/base.py:1244
#, python-format
msgid "Package %s-%s:%s-%s.%s does not seem to have a archivesize header"
msgstr ""
"Wydaje się, że pakiet %s-%s:%s-%s.%s nie posiada nagłówka rozmiaru archiwum"
-#: ../revisor/base.py:1240
+#: ../revisor/base.py:1252
#, python-format
msgid "Package %s-%s:%s-%s.%s does not seem to have a installedsize header"
msgstr ""
"Wydaje się, że pakiet %s-%s:%s-%s.%s nie posiada nagłówka rozmiaru po "
"zainstalowaniu"
-#: ../revisor/base.py:1248
+#: ../revisor/base.py:1260
#, python-format
msgid "Package %s-%s:%s-%s.%s does not seem to have a packagesize header"
msgstr ""
"Wydaje się, że pakiet %s-%s:%s-%s.%s nie posiada nagłówka rozmiaru pakietu"
-#: ../revisor/base.py:1258
+#: ../revisor/base.py:1270
#, python-format
msgid "Total size of all packages (archivesize): %s %s"
msgstr "Całkowity rozmiar wszystkich pakietów (rozmiar archiwum): %s %s"
-#: ../revisor/base.py:1259
+#: ../revisor/base.py:1271
#, python-format
msgid "Total size of all packages, (installedsize): %s %s"
msgstr ""
"Całkowity rozmiar wszystkich pakietów (rozmiar po zainstalowaniu): %s %s"
-#: ../revisor/base.py:1260
+#: ../revisor/base.py:1272
#, python-format
msgid "Total size of all packages, (packagesize): %s %s"
msgstr "Całkowity rozmiar wszystkich pakietów (rozmiar pakietu): %s %s"
-#: ../revisor/base.py:1295
+#: ../revisor/base.py:1307
#, python-format
msgid "Report of the %d most space consuming packages"
msgstr "Zgłoś %d pakietów zajmujących najwięcej miejsca"
-#: ../revisor/base.py:1390 ../revisor/base.py:1404 ../revisor/base.py:2025
+#: ../revisor/base.py:1402 ../revisor/base.py:1416 ../revisor/base.py:2043
#, python-format
msgid "Creating pkgdir: %s"
msgstr "Tworzenie pkgdir: %s"
#. Now for each txmbr in
#. Link the localPkg() result into the build tree
-#: ../revisor/base.py:1413
+#: ../revisor/base.py:1425
msgid "Linking in packages"
msgstr "Dowiązywanie pakietów"
-#: ../revisor/base.py:1432 ../revisor/base.py:2049
+#: ../revisor/base.py:1444 ../revisor/base.py:2067
#, python-format
msgid "Package hard link failed: %s: %s"
msgstr "Twarde dowiązanie pakietów nie powiodło się: %s: %s"
-#: ../revisor/base.py:1437 ../revisor/base.py:2054
+#: ../revisor/base.py:1449 ../revisor/base.py:2072
#, python-format
msgid "Copying: %s to %s"
msgstr "Kopiowanie: %s do %s"
-#: ../revisor/base.py:1440 ../revisor/base.py:2057
+#: ../revisor/base.py:1452 ../revisor/base.py:2075
#, python-format
msgid "Symlinking: %s to %s"
msgstr "Dowiązywanie symboliczne: %s do %s"
-#: ../revisor/base.py:1443 ../revisor/base.py:2060
+#: ../revisor/base.py:1455 ../revisor/base.py:2078
msgid "Package symlink succeeded"
msgstr "Dowiązanie symboliczne pakietów powiodło się"
-#: ../revisor/base.py:1445 ../revisor/base.py:1452 ../revisor/base.py:2062
-#: ../revisor/base.py:2069
+#: ../revisor/base.py:1457 ../revisor/base.py:1464 ../revisor/base.py:2080
+#: ../revisor/base.py:2087
#, python-format
msgid "Package link failed, trying copy: %s: %s"
msgstr "Dowiązanie pakietów nie powiodło się, próbowanie skopiowania: %s: %s"
-#: ../revisor/base.py:1462
+#: ../revisor/base.py:1474
msgid "Creating Repository Information"
msgstr "Tworzenie informacji o repozytoriach"
#. FIXME: Optionally recompose installer images
-#: ../revisor/base.py:1477
+#: ../revisor/base.py:1489
msgid "Building Installation Images"
msgstr "Budowanie obrazów instalacyjnych"
-#: ../revisor/base.py:1483
+#: ../revisor/base.py:1506
msgid "Using already existing installer images"
msgstr "Używanie już istniejących obrazów instalatora"
-#: ../revisor/base.py:1497
+#: ../revisor/base.py:1520
msgid "Linking in release notes"
msgstr "Dowiązywanie informacji o wydaniu"
-#: ../revisor/base.py:1509
+#: ../revisor/base.py:1532
#, python-format
msgid "Copying updates.img from %s to %s"
msgstr "Kopiowanie updates.img z %s do %s"
-#: ../revisor/base.py:1518 ../revisor/pungi.py:417
+#: ../revisor/base.py:1541 ../revisor/pungi.py:417
#, python-format
msgid "copy_dir '%s' not accessible"
msgstr "Nie można uzyskać dostępu do copy_dir \"%s\""
-#: ../revisor/base.py:1529
+#: ../revisor/base.py:1552
#, python-format
msgid "Size of the installation tree is %s MB"
msgstr "Rozmiar drzewa instalacyjnego wynosi %s MB"
@@ -1853,103 +1857,119 @@ msgstr "Rozmiar drzewa instalacyjnego wynosi %s MB"
#. That makes our lives difficult, hihi
#. So, make sure that if we're on el_linux, the repository gets
#. bind mounted and configured appropriately
-#: ../revisor/base.py:1579
+#: ../revisor/base.py:1602
msgid "Running pkgorder"
msgstr "Wykonywanie pkgorder"
-#: ../revisor/base.py:1642
+#: ../revisor/base.py:1661
+#, python-format
+msgid "Running with grouplist: %r"
+msgstr "Uruchamianie z grouplist: %r"
+
+#: ../revisor/base.py:1664
+#, python-format
+msgid "Running with packagelist: %r"
+msgstr "Uruchamianie z packagelist: %r"
+
+#: ../revisor/base.py:1671
msgid "Appending group core and base"
msgstr "Dołączanie grup core i base"
-#: ../revisor/base.py:1649
+#: ../revisor/base.py:1682
#, python-format
msgid "Appending default group %s"
msgstr "Dołączanie domyślnej grupy %s"
-#: ../revisor/base.py:1689
+#. Do not do this because the installer still has all the groups available
+#. if group not in groupList:
+#. continue
+#: ../revisor/base.py:1704
#, python-format
msgid "Appending non-default group %s"
msgstr "Dołączanie nie domyślnej grupy %s"
-#: ../revisor/base.py:1695
+#. Do not do this because the installer still has all the groups available
+#. if group not in groupList:
+#. continue
+#: ../revisor/base.py:1714
#, python-format
msgid "Appending non-default support group %s"
msgstr "Dołączanie nie domyślnych grup obsługi %s"
-#: ../revisor/base.py:1762
+#: ../revisor/base.py:1780
#, 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:1764
+#: ../revisor/base.py:1782
msgid "Not running package ordering"
msgstr "Porządkowanie kolejności pakietów nie zostanie wykonane"
-#: ../revisor/base.py:1796
+#: ../revisor/base.py:1814
msgid "^Install using kickstart"
msgstr "^Zainstaluj używając kickstart"
#. Split Tree
-#: ../revisor/base.py:1819
+#: ../revisor/base.py:1837
#, python-format
msgid "Splitting Build Tree (%s)"
msgstr "Rozdzielanie drzewa budowania (%s)"
#. Split repo
-#: ../revisor/base.py:1825
+#: ../revisor/base.py:1843
#, python-format
msgid "Splitting Repository (%s)"
msgstr "Rozdzielanie repozytorium (%s)"
-#: ../revisor/base.py:1839 ../revisor/modgui/build_media.py:244
+#: ../revisor/base.py:1857 ../revisor/modgui/build_media.py:244
#, python-format
msgid "Creating %s ISO Image #%d"
msgstr "Tworzenie %s obrazu ISO #%d"
-#: ../revisor/base.py:1844 ../revisor/modgui/build_media.py:248
+#: ../revisor/base.py:1862 ../revisor/modgui/build_media.py:248
#, python-format
msgid "Creating %s ISO Image"
msgstr "Tworzenie %s obrazu ISO"
#. For all images but source images; implant the md5 into the ISO for the media check
#. FIXME: Well, it seems we don't deal with source images here.
-#: ../revisor/base.py:1858
+#: ../revisor/base.py:1876
msgid "Implanting MD5 into ISO Images"
msgstr "Wprowadzanie MD5 do obrazów ISO"
#. mediatype = built_image["mediatype"]
#. if not mediatype == 'source':
-#: ../revisor/base.py:1866
+#: ../revisor/base.py:1884
#, python-format
msgid "Implanting md5 into ISO Image: %s"
msgstr "Wprowadzanie MD5 do obrazu ISO: %s"
-#: ../revisor/base.py:1872
+#: ../revisor/base.py:1890
msgid "Cannot implant ISO md5sum"
msgstr "Nie można wprowadzić md5sum ISO"
#. Do some SHA1SUMMONING
-#: ../revisor/base.py:1880
+#: ../revisor/base.py:1898
msgid "Creating SHA1SUMs for Images"
msgstr "Tworzenie plików SHA1SUM dla obrazów"
-#: ../revisor/base.py:1896
+#: ../revisor/base.py:1914
msgid "Creating Rescue ISO Image"
msgstr "Tworzenie ratunkowego obrazu ISO"
-#: ../revisor/base.py:1956
+#: ../revisor/base.py:1974
#, python-format
msgid "Copying %s to %s (%d files)"
msgstr "Kopiowanie %s do %s (%d plików)"
-#: ../revisor/base.py:1960
+#: ../revisor/base.py:1978
#, python-format
msgid "Moving %s to %s (%d files)"
msgstr "Przenoszenie %s do %s (%d plików)"
-#: ../revisor/base.py:1963
+#: ../revisor/base.py:1981
#, python-format
msgid ""
"Moving of the source tree failed (trying copy):\n"
@@ -1960,7 +1980,7 @@ msgstr ""
"\n"
"%s"
-#: ../revisor/base.py:1966
+#: ../revisor/base.py:1984
#, python-format
msgid ""
"Copying of the source tree failed:\n"
@@ -1971,12 +1991,12 @@ msgstr ""
"\n"
"%s"
-#: ../revisor/base.py:1971 ../revisor/pungi.py:413
+#: ../revisor/base.py:1989 ../revisor/pungi.py:413
#, python-format
msgid "Copying %s to %s"
msgstr "Kopiowanie %s do %s"
-#: ../revisor/base.py:1975
+#: ../revisor/base.py:1993
#, python-format
msgid ""
"Copying of the installation tree failed:\n"
@@ -1987,41 +2007,41 @@ msgstr ""
"\n"
"%s"
-#: ../revisor/base.py:1981
+#: ../revisor/base.py:1999
msgid "Creating ext3 filesystem"
msgstr "Tworzenie systemu plików ext3"
-#: ../revisor/base.py:1988
+#: ../revisor/base.py:2006
msgid "Configuring System"
msgstr "Konfigurowanie systemu"
#. Now for each txmbr in
#. Link the localPkg() result into the build tree
-#: ../revisor/base.py:2034
+#: ../revisor/base.py:2052
msgid "Linking in Source packages"
msgstr "Dowiązywanie pakietów źródłowych"
-#: ../revisor/base.py:2089
+#: ../revisor/base.py:2107
#, python-format
msgid "Setting rundir to %s"
msgstr "Ustawianie rundir na %s"
-#: ../revisor/base.py:2095
+#: ../revisor/base.py:2113
#, python-format
msgid "Directory %s could not be created. Aborting"
msgstr "Nie można utworzyć folderu %s. Przerywanie"
-#: ../revisor/base.py:2097
+#: ../revisor/base.py:2115
#, python-format
msgid "Running command: %s"
msgstr "Wykonywanie polecenia: %s"
-#: ../revisor/base.py:2098
+#: ../revisor/base.py:2116
#, python-format
msgid "Extra information: %s %s %s"
msgstr "Dodatkowe informacje: %s %s %s"
-#: ../revisor/base.py:2126
+#: ../revisor/base.py:2144
#, python-format
msgid "Got an error from %s (return code %s)"
msgstr "Otrzymano błąd z %s (kod zwrotny %s)"
@@ -2320,7 +2340,7 @@ msgstr ""
"Ustawienie %s na %r nie zostanie wykonane (wiersz poleceń zgadza się z "
"ustawieniem domyślnym)"
-#: ../revisor/cfg.py:892
+#: ../revisor/cfg.py:893
msgid ""
"Updates.img is only usable with installation media. Please remove --updates-"
"img or also build installation media."
@@ -2328,30 +2348,30 @@ msgstr ""
"Updates.img można używać tylko za pomocą nośnika instalacyjnego. Usuń --"
"updates-img lub zbuduj także nośnik instalacyjny."
-#: ../revisor/cfg.py:896
+#: ../revisor/cfg.py:897
msgid "Kickstart failed"
msgstr "Kickstart nie powiodło się"
-#: ../revisor/cfg.py:903 ../revisor/cfg.py:908
+#: ../revisor/cfg.py:904 ../revisor/cfg.py:909
#, python-format
msgid "Kickstart file %s not readable"
msgstr "Nie można odczytać pliku kickstart %s"
-#: ../revisor/cfg.py:905 ../revisor/cfg.py:910
+#: ../revisor/cfg.py:906 ../revisor/cfg.py:911
#, python-format
msgid "Kickstart file %s fails to load, continuing with defaults"
msgstr ""
"Wczytanie pliku kickstart %s nie powiodło się, kontynuowanie z domyślnymi"
-#: ../revisor/cfg.py:913
+#: ../revisor/cfg.py:914
msgid "No kickstart file specified"
msgstr "Nie podano pliku kickstart"
-#: ../revisor/cfg.py:916 ../revisor/cfg.py:937
+#: ../revisor/cfg.py:917 ../revisor/cfg.py:938
msgid "No media specified"
msgstr "Nie podano nośnika."
-#: ../revisor/cfg.py:919
+#: ../revisor/cfg.py:920
msgid ""
"When composing in respin mode, you can only select one type of media "
"install, live or virtual. You can however select multiple media such as cd, "
@@ -2361,21 +2381,21 @@ msgstr ""
"jeden typ nośnika: instalacyjny, Live lub wirtualny. Można jednak wybrać "
"wiele nośników, takich jak CD, DVD itp."
-#: ../revisor/cfg.py:964
+#: ../revisor/cfg.py:965
#, python-format
msgid "pulling self.packages_list[%r][%r][%r][%r]"
msgstr "wybieranie self.packages_list[%r][%r][%r][%r]"
-#: ../revisor/cfg.py:969
+#: ../revisor/cfg.py:970
#, python-format
msgid "returning pkg_list: %r"
msgstr "zwracanie pkg_list: %r"
-#: ../revisor/cfg.py:1088
+#: ../revisor/cfg.py:1089
msgid "Run from image"
msgstr "Uruchom z obrazu"
-#: ../revisor/cfg.py:1089
+#: ../revisor/cfg.py:1090
msgid "Run from RAM - requires 1 GB+"
msgstr "Uruchom z pamięci RAM - wymaga 1 GB+"
@@ -2563,26 +2583,31 @@ msgstr ""
"Utwórz instalacyjne dwuwarstwowe nośniki DVD (pojemność jednej płyty: 8.5GB)"
#: ../revisor/__init__.py.in:239
-msgid "Create Installation Media Blu-Ray Discs (Capacity per disc: 50GB)"
-msgstr "Utwórz instalacyjne nośniki Blu-Ray (pojemność jednej płyty: 50GB) "
+msgid "Create Installation Media Blu-Ray Discs (Capacity per disc: 25GB)"
+msgstr "Utwórz instalacyjne nośniki Blu-Ray (pojemność jednej płyty: 25GB)"
#: ../revisor/__init__.py.in:244
+msgid ""
+"Create Installation Media Duallayer Blu-Ray Discs (Capacity per disc: 50GB)"
+msgstr "Utwórz instalacyjne nośniki Blu-Ray (pojemność jednej płyty: 50GB)"
+
+#: ../revisor/__init__.py.in:249
msgid "Create Unified ISO from install tree"
msgstr "Utwórz obraz ISO z drzewa instalacji"
-#: ../revisor/__init__.py.in:255
+#: ../revisor/__init__.py.in:260
msgid "Create the Installation Tree."
msgstr "Utwórz drzewo instalacyjne."
-#: ../revisor/__init__.py.in:260
+#: ../revisor/__init__.py.in:265
msgid "Create Media without graphical installer."
msgstr "Utwórz nośnik bez instalatora graficznego."
-#: ../revisor/__init__.py.in:265
+#: ../revisor/__init__.py.in:270
msgid "Include kickstart file on media or in the tree"
msgstr "Dołącz plik kickstart do nośnika lub w drzewie"
-#: ../revisor/__init__.py.in:270
+#: ../revisor/__init__.py.in:275
msgid ""
"In the bootloader menu (isolinux.cfg), set kickstart to boot by default "
"(works with --kickstart-include)"
@@ -2590,32 +2615,32 @@ msgstr ""
"W menu programu startowego (isolinux.cfg) ustaw domyślne uruchamianie "
"kickstart (działa z --kickstart-include)"
-#: ../revisor/__init__.py.in:275
+#: ../revisor/__init__.py.in:280
msgid "Filter anything from comps that is not in the package set"
msgstr "Filtruj z comps wszystko, co nie znajduje się w zestawie pakietów"
-#: ../revisor/__init__.py.in:280
+#: ../revisor/__init__.py.in:285
msgid "Use Revisor's comps file instead of those from the repositories"
msgstr "Użyj pliku comps Revisora zamiast pliku comps z repozytoriów"
-#: ../revisor/__init__.py.in:285
+#: ../revisor/__init__.py.in:290
msgid "Comps file to include on the installation media"
msgstr "Plik comps do dołączenia do nośnika instalacyjnego"
-#: ../revisor/__init__.py.in:290
+#: ../revisor/__init__.py.in:295
msgid "Include specified updates.img on installation media."
msgstr "Dołącz określony updates.img do nośnika instalacyjnego."
-#: ../revisor/__init__.py.in:296
+#: ../revisor/__init__.py.in:301
msgid "Product Name"
msgstr "Nazwa produktu"
-#: ../revisor/__init__.py.in:301
+#: ../revisor/__init__.py.in:306
msgid ""
"Product Path (e.g. Fedora/ or Packages/ -but without the appending slash)"
msgstr "Ścieżka do produktu (np. Fedora/ lub Packages/ - ale bez ukośnika)"
-#: ../revisor/__init__.py.in:306
+#: ../revisor/__init__.py.in:311
msgid ""
"ISO Label Base. Note that other things are appended but that the length can "
"be 32 chars maximum."
@@ -2623,15 +2648,15 @@ msgstr ""
"Podstawa etykiety ISO. Zauważ, że mogą występować inne rzeczy, ale nie może "
"mieć więcej niż 32 znaki."
-#: ../revisor/__init__.py.in:311
+#: ../revisor/__init__.py.in:316
msgid "The base name for the ISOs"
msgstr "Podstawowa nazwa dla ISO"
-#: ../revisor/__init__.py.in:316
+#: ../revisor/__init__.py.in:321
msgid "Product Version"
msgstr "Wersja produktu"
-#: ../revisor/__init__.py.in:321
+#: ../revisor/__init__.py.in:326
msgid ""
"Base Product Version - relevant to required packages and pykickstart "
"compatibility"
@@ -2642,50 +2667,50 @@ msgstr ""
#. #
#. # Utility Media Options
#. #
-#: ../revisor/__init__.py.in:326
+#: ../revisor/__init__.py.in:331
msgid "Utility Media Options"
msgstr "Opcje nośników narzędziowych"
-#: ../revisor/__init__.py.in:331
+#: ../revisor/__init__.py.in:336
msgid "Create Rescue Media"
msgstr "Utwórz nośnik ratunkowy"
#. #
#. # Live Media Options
#. #
-#: ../revisor/__init__.py.in:336
+#: ../revisor/__init__.py.in:341
msgid "Live Media Options"
msgstr "Opcje nośników Live"
-#: ../revisor/__init__.py.in:341
+#: ../revisor/__init__.py.in:346
msgid "Create Live Media CD/DVD"
msgstr "Utwórz nośnik CD/DVD Live"
-#: ../revisor/__init__.py.in:346
+#: ../revisor/__init__.py.in:351
msgid "Create Live Media Thumb Drive Image (will be depreciated)"
msgstr "Utwórz obraz nośnika Live dla dysku USB (przestarzałe)"
-#: ../revisor/__init__.py.in:351
+#: ../revisor/__init__.py.in:356
msgid "Create Live Media Hard Disk Image (will be depreciated)"
msgstr "Utwórz obraz nośnika Live dla dysku twardego (przestarzałe)"
-#: ../revisor/__init__.py.in:356
+#: ../revisor/__init__.py.in:361
msgid "Create Live Media Raw Hard Disk Image"
msgstr "Utwórz surowy obraz nośnika Live dla dysku twardego"
-#: ../revisor/__init__.py.in:361
+#: ../revisor/__init__.py.in:366
msgid "Interactively work in the live image before building the ISO image."
msgstr "Działania interaktywne w obrazie Live przed budowaniem obrazu ISO."
-#: ../revisor/__init__.py.in:366
+#: ../revisor/__init__.py.in:371
msgid "Skip file system compression."
msgstr "Pomiń kompresję systemu plików."
-#: ../revisor/__init__.py.in:371
+#: ../revisor/__init__.py.in:376
msgid "Skip prelinking the contents of the filesystem."
msgstr "Pomiń prekonsolidowanie zawartości systemu plików."
-#: ../revisor/__init__.py.in:376
+#: ../revisor/__init__.py.in:381
msgid ""
"Ignore filesystem overhead. Useless blocks will not be removed from the "
"filesystem."
@@ -2693,20 +2718,20 @@ msgstr ""
"Zignoruj wyższy system plików. Mimo to bloki nie zostaną usunięte z systemu "
"plików."
-#: ../revisor/__init__.py.in:381
+#: ../revisor/__init__.py.in:386
msgid "Set the preferred kernel. One of normal, PAE, xen or debug."
msgstr "Ustaw preferowane jądro: normal, PAE, xen lub debug."
-#: ../revisor/__init__.py.in:422
+#: ../revisor/__init__.py.in:427
#, python-format
msgid " %s - No Description"
msgstr "%s - brak opisu"
-#: ../revisor/__init__.py.in:448
+#: ../revisor/__init__.py.in:453
msgid "Interrupted by user"
msgstr "Przerwano przez użytkownika"
-#: ../revisor/__init__.py.in:454
+#: ../revisor/__init__.py.in:459
msgid ""
"Traceback occurred, please report a bug at http://fedorahosted.org/revisor"
msgstr "Wystąpił błąd, proszę zgłosić błąd na http://fedorahosted.org/revisor"
@@ -2727,12 +2752,12 @@ msgstr "Czy chcesz kontynuować? [Y/n]"
msgid "Abort! Abort! Abort!"
msgstr "Przerwij!"
-#: ../revisor/misc.py:38
+#: ../revisor/misc.py:39
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:49
+#: ../revisor/misc.py:50
msgid ""
"SELinux is in enforcing mode on this host. Composing media will fail. Please "
"set SELinux to permissive mode."
@@ -2740,7 +2765,7 @@ msgstr ""
"SElinux jest ustawiony w trybie wymuszania na tym komputerze. Skomponowanie "
"nośnika nie powiedzie się. Ustaw SELinuksa na tryb zezwalania."
-#: ../revisor/misc.py:54
+#: ../revisor/misc.py:55
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 "
@@ -2750,12 +2775,12 @@ msgstr ""
"posiadały SELinuksa, a w rezultacie system zainstalowany z tego nośnika "
"również nie będzie posiadał SELinuksa."
-#: ../revisor/misc.py:136 ../revisor/misc.py:143
+#: ../revisor/misc.py:137 ../revisor/misc.py:144
#, python-format
msgid "Resolved %s"
msgstr "Rozwiązano %s"
-#: ../revisor/misc.py:146
+#: ../revisor/misc.py:147
#, python-format
msgid ""
"Looking to resolve package %s to a Provides, but we still can't find it."
@@ -2763,99 +2788,117 @@ msgstr ""
"Próbowanie rozwiązania pakietu %s do dostarczanych, ale wciąż nie można go "
"znaleźć."
-#: ../revisor/pkgorder.py:78
+#. If the group is not in the kickstart groups, skip it
+#. if not group in self.cfg.ksobj._get("packages","groupList"):
+#. continue
+#: ../revisor/pkgorder.py:85
#, python-format
-msgid "Adding group(s): %r"
-msgstr "Dodawanie grup: %r"
+msgid "Adding group: %s"
+msgstr "Dodawanie grupy: %s"
-#: ../revisor/pkgorder.py:85
+#: ../revisor/pkgorder.py:93
+#, python-format
+msgid "Adding conditional: %s / %s"
+msgstr "Testowanie warunku: %s/%s"
+
+#: ../revisor/pkgorder.py:96
+#, python-format
+msgid "The following packages are in group %s: %r"
+msgstr "Następujące pakiety znajdują się w grupie %s: %r"
+
+#: ../revisor/pkgorder.py:103
+#, python-format
+msgid "Adding %s-%s:%s-%s.%s to transaction"
+msgstr "Dodawanie %s-%s:%s-%s.%s do transakcji"
+
+#: ../revisor/pkgorder.py:110
#, python-format
msgid "%d dependencies already resolved"
msgstr "%d zależności zostało już rozwiązanych"
-#: ../revisor/pkgorder.py:96
+#: ../revisor/pkgorder.py:120
#, python-format
msgid "Adding package(s): %r"
msgstr "Dodawanie pakietów: %r"
-#: ../revisor/pkgorder.py:141
+#: ../revisor/pkgorder.py:165
#, python-format
msgid "Unable to create yum configuration file for package ordering at %s"
msgstr ""
"Nie można utworzyć pliku konfiguracji yuma dla porządkowania pakietów w %s"
-#: ../revisor/pkgorder.py:160
+#: ../revisor/pkgorder.py:173
#, python-format
msgid "-> package %s"
msgstr "-> pakiet %s"
-#: ../revisor/plugins.py:58 ../revisor/plugins.py:75
+#: ../revisor/plugins.py:59 ../revisor/plugins.py:76
#, python-format
msgid "Plugin %s failed to load (%s: %s)"
msgstr "Wczytanie wtyczki %s nie powiodło się (%s: %s)"
-#: ../revisor/plugins.py:69
+#: ../revisor/plugins.py:70
#, python-format
msgid "ImportError for plugin %s: %s"
msgstr "Błąd importowania wtyczki %s: %s"
-#: ../revisor/plugins.py:72
+#: ../revisor/plugins.py:73
#, python-format
msgid "RuntimeError for plugin %s: %s"
msgstr "Błąd wykonywania wtyczki %s: %s"
-#: ../revisor/plugins.py:92 ../revisor/plugins.py:94
+#: ../revisor/plugins.py:93 ../revisor/plugins.py:95
#, python-format
msgid "Cannot set defaults for plugin %s: %s"
msgstr "Nie można ustawić domyślnych dla wtyczki %s: %s"
-#: ../revisor/plugins.py:96
+#: ../revisor/plugins.py:97
#, python-format
msgid "Cannot set defaults for plugin %s: Unknown Error"
msgstr "Nie można ustawić domyślnych dla wtyczki %s: nieznany błąd"
-#: ../revisor/plugins.py:99
+#: ../revisor/plugins.py:100
#, python-format
msgid "Not setting defaults for plugin %s: No function 'set_defaults()'"
msgstr ""
"Domyślne nie zostaną ustawione dla wtyczki %s: brak funkcji \"set_defaults()"
"\""
-#: ../revisor/plugins.py:116
+#: ../revisor/plugins.py:117
#, python-format
msgid "Cannot set runtime for plugin %s: %s"
msgstr "Nie można ustawić środowiska wykonawczego dla wtyczki %s: %s"
-#: ../revisor/plugins.py:118
+#: ../revisor/plugins.py:119
#, python-format
msgid "Not setting runtime for plugin %s: No function 'set_runtime()'"
msgstr ""
"Środowisko wykonawcze nie zostanie ustawione dla wtyczki %s: brak funkcji "
"\"set_runtime()\""
-#: ../revisor/plugins.py:135
+#: ../revisor/plugins.py:136
#, python-format
msgid "Cannot add options for plugin %s: %s"
msgstr "Nie można dodać opcji dla wtyczki %s: %s"
-#: ../revisor/plugins.py:137
+#: ../revisor/plugins.py:138
#, python-format
msgid "Not adding options for plugin %s: No function 'add_options()'"
msgstr ""
"Opcje nie zostaną ustawione dla wtyczki %s: brak funkcji \"add_options()\""
-#: ../revisor/plugins.py:155
+#: ../revisor/plugins.py:156
#, python-format
msgid "Cannot check options for plugin %s: %s"
msgstr "Nie można sprawdzić opcji dla wtyczki %s: %s"
-#: ../revisor/plugins.py:157
+#: ../revisor/plugins.py:158
#, python-format
msgid "Not checking options for plugin %s: No function 'check_options()'"
msgstr ""
"Opcje nie zostaną sprawdzone dla wtyczki %s: brak funkcji \"check_options()\""
-#: ../revisor/plugins.py:193
+#: ../revisor/plugins.py:194
#, python-format
msgid "Cannot execute hook %s for plugin %s: %s"
msgstr "Nie można wykonać haka %s dla wtyczki %s: %s"
@@ -2998,22 +3041,22 @@ msgstr "Nie można utworzyć folderu files/: %s"
msgid "Creating %s"
msgstr "Tworzenie %s"
-#: ../revisor/pungi.py:457
+#: ../revisor/pungi.py:459
#, python-format
msgid "Disc %s #%d is oversized (%r > %r)"
msgstr "Płyta %s #%d ma za duży rozmiar (%r > %r)"
-#: ../revisor/pungi.py:461
+#: ../revisor/pungi.py:463
#, python-format
msgid "Removing tree %s"
msgstr "Usuwanie drzewa %s"
-#: ../revisor/pungi.py:469
+#: ../revisor/pungi.py:471
#, python-format
msgid "Disc %s #%d is OK in size (%r <= %r)"
msgstr "Płyta %s #%d ma prawidłowy rozmiar (%r <= %r)"
-#: ../revisor/pungi.py:520
+#: ../revisor/pungi.py:522
msgid ""
"Hacking anaconda's .discinfo because it'll shit itself if it reads it's own "
"output"
@@ -3638,7 +3681,7 @@ msgstr ""
msgid "The URI to a tree we're supposed to reuse the installer images from."
msgstr "URI drzewa, z którego ma zostać ponownie użyty instalator."
-#: ../revisor/modreuseinstaller/__init__.py:62
+#: ../revisor/modreuseinstaller/__init__.py:67
#, python-format
msgid ""
"Could not access %s/%s, required for reusing a previous tree. Cancelling the "
@@ -3647,6 +3690,21 @@ 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
+#, python-format
+msgid "Copying %s/%s to %s/%s"
+msgstr "Kopiowanie %s/%s do %s/%s"
+
+#: ../revisor/modreuseinstaller/__init__.py:88
+#, python-format
+msgid "Copying %s/.discinfo to %s/.discinfo"
+msgstr "Kopiowanie %s/.discinfo do %s/.discinfo"
+
+#: ../revisor/modreuseinstaller/__init__.py:91
+#, python-format
+msgid "Copying %s/.treeinfo to %s/.treeinfo"
+msgstr "Kopiowanie %s/.treeinfo do %s/.treeinfo"
+
#: ../revisor/modserver/__init__.py:87
msgid "Use the server mode for XML-RPC"
msgstr "Użyj trybu serwera dla XML-RPC"
commit ffeda34e20b832daba7c86b48c5bcd14b41e294a
Author: root <root(a)portapc.localdomain>
Date: Thu Dec 18 15:49:59 2008 +0100
Thread added to composer for distributed operation.
Moved test-lines from modcomposer to modhub's do_polling thread.
diff --git a/revisor/modcomposer/__init__.py b/revisor/modcomposer/__init__.py
index 32fbfa7..ad399fe 100755
--- a/revisor/modcomposer/__init__.py
+++ b/revisor/modcomposer/__init__.py
@@ -17,24 +17,21 @@ class RevisorComposer():
""" Composer Mode """
def __init__(self):
+ self.composer_occupied = 0
self.composer_id = 0
self.job_id = 0
pass
def run(self, base):
+ self.base = base
try:
self.composer_id = self.composer_logon()
- print "composer_id:", self.composer_id
- # TEST: multiple jobs
- time.sleep(2)
- self.do_job()
- time.sleep(6)
- self.do_job()
- time.sleep(6)
- self.do_job()
- time.sleep(6)
- self.do_job()
- #self.do_xmlrpc(base.cfg)
+ print "Logged in. Composer id:", self.composer_id
+ except Exception, e:
+ base.log.info("Login failed. Shutting down...")
+ raise e
+ try:
+ self.do_xmlrpc(base)
except Exception, e:
self.composer_logoff()
base.log.info("Shutting down...")
@@ -50,11 +47,14 @@ class RevisorComposer():
def composer_logon(self):
print "Logging on..."
try:
+ print "1"
hub = Connection("http://localhost:9321")
+ print "2"
self.composer_id = hub.con.composer_logon("localhost", 9322)
- #hub.close()
+ print "3"
except Exception, e:
raise e
+ print "4"
return self.composer_id
def composer_logoff(self):
@@ -77,17 +77,14 @@ class RevisorComposer():
raise e
return self.kickstart_file
- def start_compose(self, job_id):
- print "Starting Spin: test.ks"
+ def start_compose(self, job_id, kickstart_file):
try:
- print "########"
- print self.kickstart_file
- print "########"
- except Exception, e:
- base.log.info("Spin creation process interrupted...")
- raise e
+ thread.start_new_thread(thread_start_compose,(self, job_id, kickstart_file))
+ except KeyboardInterrupt:
+ #base.log.info("Shutting Down...")
+ pass
+ return job_id
-# XMLRPC Methods
def do_xmlrpc(self, base):
print "Composer XML-RPC Server Started..."
xinterface = RevisorXMLRPCInterface(self, base.cfg)
@@ -146,7 +143,22 @@ class RevisorComposer():
#defaults.dbname = "revisor-hubdb"
#defaults.configfile = "blaat"
pass
-
+
+ #Threads
+def thread_start_compose(composer, job_id, kickstart_file):
+ print "Starting Spin: test.ks"
+ time.sleep(15)
+ try:
+ print "#######################################################"
+ print kickstart_file
+ print "#######################################################"
+ except Exception, e:
+ #base.log.info("Spin creation process interrupted...")
+ raise e
+ composer.composer_occupied = 0
+ print "Composer", composer.composer_id, "sleeping..."
+ return job_id
+
# The actual XMLRPC Object Server
class RevisorXMLRPCServer(SimpleXMLRPCServer.SimpleXMLRPCServer):
@@ -170,16 +182,15 @@ class RevisorXMLRPCInterface(object):
except NameError:
pass
self.composer = composer
- self.composer_occupied = 0
- pass
- def are_you_busy(self):
- return self.composer_occupied
+ def are_you_awake(self):
+ return self.composer.composer_occupied
def wake_composer(self, job_id, kickstart_file):
print "Composer", self.composer.composer_id, "has awakened!"
- self.composer_occupied
- self.composer.start_composer(job_id, kickstart_file)
+ self.composer.composer_occupied = 1
+ self.composer.start_compose(job_id, kickstart_file)
+ return 1
def progress_update(self):
return "99.934%"
\ No newline at end of file
diff --git a/revisor/modhub/__init__.py b/revisor/modhub/__init__.py
index c27352a..361867c 100644
--- a/revisor/modhub/__init__.py
+++ b/revisor/modhub/__init__.py
@@ -18,11 +18,13 @@ class RevisorHub():
""" Hub Mode """
def __init__(self):
+ self.count_composers = 0
+ self.thread_count = 0
+ self.composers = 0
pass
def run(self, base):
- self.thread_count = 2
- self.hub = HubMode()
+ self.thread_count += 2
try:
thread.start_new_thread(thread_do_polling,(base.cfg, self))
thread.start_new_thread(thread_do_xmlrpc,(base.cfg, self))
@@ -31,9 +33,30 @@ class RevisorHub():
except KeyboardInterrupt:
#base.log.info("Shutting Down...")
pass
+
+ def db_get_ks(self): #Private function?
+ print "Getting test.ks from Database."
+ return open('revisor/modhub/test.ks', 'rb')
+
+ def db_check_jobs(self):
+ # Wake the Composer, send Job_id and kickstart_file
+ # check jobs in DB
+ print "Checking Database for Jobs"
+ # get KS from DB if any found
+ return self.db_get_ks()
+
+ def db_add_composer(self, composer_host, composer_port):
+ self.count_composers += 1
+ print "New composer added. ComposerID:", self.count_composers, "\nComposerHost:", composer_host, "ComposerPort:", composer_port
+ return self.count_composers
+
+ def db_remove_composer(self, composer_id):
+ self.count_composers -= 1
+ print "Composer removed. ComposerID:", composer_id
+ return self.count_composers
def do_xmlrpc(self, cfg):
- xinterface = RevisorXMLRPCInterface(self.hub, cfg)
+ xinterface = RevisorXMLRPCInterface(self, cfg)
server = RevisorXMLRPCServer(('', int(cfg.hub_port)))
server.register_introspection_functions()
cfg.log.info("Hub XMLRPC Server running on port %s..." % cfg.hub_port)
@@ -46,14 +69,27 @@ class RevisorHub():
time.sleep(0.5)
def do_polling(self, cfg):
+ job_id = 0
while True:
- time.sleep(5)
- print "Poll...!"
+ time.sleep(3)
# Check DB for new KS file.
- # Check if a Composer is present.
- # Check if it's not busy
- # Wake the Composer (Composer will ask for a new file)
- # or... send a *.ks to the Composer
+ binary_ks_file = xmlrpclib.Binary(self.db_check_jobs().read())
+ if self.count_composers > 0:
+ # Check if a Composer is present. Check if it's not busy
+ try:
+ composer = Connection("http://localhost:9322") # Make connection with the chosen Composer
+ if not composer.con.are_you_awake():
+ # Wake the Composer, send Job_id and kicckstart_file
+ job_id += 1
+ print "Ready Composer found! Sending Job#", job_id
+ composer.con.wake_composer(job_id, binary_ks_file)
+ else:
+ print "No ready Composer found! Retry-ing in 7 seconds"
+ time.sleep(7)
+ except Exception, e:
+ raise e
+ else:
+ print "Can't start Job. No Composer logged in!"
def add_options(self, parser):
modhub_group = parser.add_option_group("Hub Options")
@@ -143,30 +179,30 @@ class RevisorXMLRPCInterface(object):
print "Composer ID", composer_id, "is at", process, "%."
return 1
-
-# Our Hub Methods
-class HubMode():
- def __init__(self):
- # FIXME: Load a config file (db information, general settings)
- self.count_composers = 0
+
+# Our Data Classes
+class ComposerList:
+ def __init__(self, composer_id=None, composer_host=None, composer_port=None):
+ self.list = 0
+ try:
+ if composer_id:
+ self.list.append([composer_id, composer_host, composer_port])
+ else:
+ pass
+ except NameError:
+ pass
pass
-
- def db_get_ks(self): #Private function?
- print "Getting test.ks from Database."
- return open('revisor/modhub/test.ks', 'rb')
-
- def db_check_jobs(self):
- #check jobs in DB
- print "Checking Database for Jobs"
- #get KS from DB if any found
- return self.db_get_ks()
-
- def db_add_composer(self, composer_host, composer_port):
- self.count_composers += 1
- print "New composer added. ComposerID:", self.count_composers, "\nComposerHost:", composer_host, "ComposerPort:", composer_port
- return self.count_composers
+
+ def __repr__(self):
+ for i in self.list:
+ print i[0], ",", i[1], ".", i[2], "."
- def db_remove_composer(self, composer_id):
- self.count_composers -= 1
- print "Composer removed. ComposerID:", composer_id
- return self.count_composers
\ No newline at end of file
+ def __add__(self, composer_id, composer_host, composer_port):
+ try:
+ if composer_id:
+ self.list.append([composer_id, composer_host, composer_port])
+ else:
+ pass
+ except NameError:
+ pass
+ pass
\ No newline at end of file
commit 466ca2ae8c78f2d4a887645da25883e6d68dc161
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Wed Dec 17 20:25:01 2008 +0100
Reapply the changes to base.py that were reverted
diff --git a/revisor/base.py b/revisor/base.py
index f8ab413..498a86f 100644
--- a/revisor/base.py
+++ b/revisor/base.py
@@ -1116,7 +1116,8 @@ class RevisorBase:
required_pkgs.extend(['grub'])
if self.cfg.version_from not in [ "F10", "DEVEL" ]:
- required_pkgs.extend(['kernel-xen'])
+ if self.cfg.architecture not in [ "ppc", "ppc64" ]:
+ required_pkgs.extend(['kernel-xen'])
suggested_pkgs = []
@@ -1487,7 +1488,18 @@ class RevisorBase:
# FIXME: Optionally recompose installer images
pbar = self.progress_bar(_("Building Installation Images"))
- if not os.access(os.path.join(self.cfg.working_directory, "revisor-pungi", self.cfg.version, self.cfg.model, self.cfg.architecture, "os", "isolinux", "initrd.img"), os.R_OK):
+ if self.cfg.architecture in [ "ppc", "ppc64" ]:
+ files = [ "images/boot.iso", "ppc/ppc32/vmlinuz", "ppc/ppc64/vmlinuz" ]
+ else:
+ files = [ "isolinux/isolinux.cfg", "isolinux/isolinux.bin", "isolinux/vmlinuz", "isolinux/initrd.img", "images/boot.iso" ]
+
+ 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):
+
+ run_buildinstall = True
+
+ if run_buildinstall:
pungicallback = revisor.progress.PungiCallback(pbar, pungi=mypungi, cfg=self.cfg)
mypungi.doBuildinstall(callback=pungicallback)
else:
@@ -1679,8 +1691,10 @@ class RevisorBase:
groups_nondefault.append(group.groupid)
# Now, make sure that any packages listed in the kickstart end
- # up on the first possible disc as well
- ds.addPackages(packageList)
+ # up on the first possible disc as well. But not when composing
+ # the everything spin, please
+ if not self.cfg.everything_spin:
+ ds.addPackages(packageList)
for group in groups_nondefault:
# Do not do this because the installer still has all the groups available
commit d8130e92a2ba5bc38b7b336c85b33233d8113f74
Merge: 013def8... 8f1995f...
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Wed Dec 17 20:23:47 2008 +0100
Merge branch 'master' of ssh://git.fedorahosted.org/git/revisor
commit 013def8e45af872a53e2b93291726632e0f30b32
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Wed Dec 17 20:21:58 2008 +0100
Update f10-install-single-cd.conf
diff --git a/unity/conf/f10-install-single-cd.conf b/unity/conf/f10-install-single-cd.conf
index c009ded..b544ff2 100644
--- a/unity/conf/f10-install-single-cd.conf
+++ b/unity/conf/f10-install-single-cd.conf
@@ -6,95 +6,56 @@
##
[revisor]
-media_installation_dvd = 1
+media_installation_dvd = 0
media_installation_cd = 1
-media_installation_tree = 1
-media_utility_rescue = 1
+media_installation_tree = 0
+media_utility_rescue = 0
media_live_optical = 0
media_live_thumb = 0
-dependency_resolve_allow_conflicts = 1
-mode_respin = 1
+# Set these to the absolute minimum
+dependency_resolve_allow_conflicts = 0
+mode_respin = 0
copy_local = 0
answer_yes = 1
-getsource = 1
+getsource = 0
+
bugurl = http://bugzilla.redhat.com
-[f10-i386-single-cd]
-description = Fedora Unity Custom Spin Model for Single CD Installers
-main = /etc/revisor-unity/conf.d/revisor-f10-i386-single-cd.conf
+# Defaults for all models in this file
product_name = Fedora
product_path = Packages
iso_basename = Fedora-Single
iso_label = Fedora
-architecture = i386
version = 10
version_from = F10
-media_installation_dvd=0
-media_installation_cd=1
-media_installation_tree=0
-media_utility_rescue=0
-dependency_resolve_allow_conflicts=0
-mode_respin=0
comps_filter = 1
kickstart_file = /etc/revisor-unity/conf.d/fedora-10-single-cd.cfg
+kickstart_include = 1
+
+[f10-i386-single-cd]
+description = Fedora Unity Custom Spin Model for Single CD Installers
+main = /etc/revisor-unity/conf.d/revisor-f10-i386-single-cd.conf
+architecture = i386
+reuse = /net/localrepo/data/os/distr/fedora/releases/10/Fedora/i386/os/
[f10-x86_64-single-cd]
description = Fedora Unity Custom Spin Model for Single CD Installers
main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-single-cd.conf
-product_name = Fedora
-product_path = Packages
-iso_basename = Fedora-Single
-iso_label = Fedora
architecture = x86_64
-version = 10
-version_from = F10
-media_installation_dvd=0
-media_installation_cd=1
-media_installation_tree=0
-media_utility_rescue=0
-dependency_resolve_allow_conflicts=0
-mode_respin=0
-comps_filter = 1
-kickstart_file = /etc/revisor-unity/conf.d/fedora-10-single-cd.cfg
+reuse = /net/localrepo/data/os/distr/fedora/releases/10/Fedora/x86_64/os/
[f10-ppc-single-cd]
description = Fedora Unity Custom Spin Model for Single CD Installers
main = /etc/revisor-unity/conf.d/revisor-f10-ppc-single-cd.conf
-product_name = Fedora
-product_path = Packages
-iso_basename = Fedora-Single
-iso_label = Fedora
architecture = ppc
-version = 10
-version_from = F10
-media_installation_dvd=0
-media_installation_cd=1
-media_installation_tree=0
-media_utility_rescue=0
-dependency_resolve_allow_conflicts=0
-mode_respin=0
-comps_filter = 1
-kickstart_file = /etc/revisor-unity/conf.d/fedora-10-single-cd.cfg
+reuse = /net/localrepo/data/os/distr/fedora/releases/10/Fedora/ppc/os/
[f10-ppc64-single-cd]
description = Fedora Unity Custom Spin Model for Single CD Installers
main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-single-cd.conf
-product_name = Fedora
-product_path = Packages
-iso_basename = Fedora-Single
-iso_label = Fedora
architecture = ppc64
-version = 10
-version_from = F10
-media_installation_dvd=0
-media_installation_cd=1
-media_installation_tree=0
-media_utility_rescue=0
-dependency_resolve_allow_conflicts=0
-mode_respin=0
-comps_filter = 1
-kickstart_file = /etc/revisor-unity/conf.d/fedora-10-single-cd.cfg
+reuse = /net/localrepo/data/os/distr/fedora/releases/10/Fedora/ppc64/os/
commit 8f1995f5a87ceda262b41e2b3a5e372e868bccab
Author: noik <noik00(a)gmail.com>
Date: Wed Dec 17 18:37:18 2008 +0100
Added modcomposer, in testphase(for interaction with modhub).
Added method in modhub for communication with modcompser and a frame for connecting with the database.
diff --git a/configure.ac b/configure.ac
index 0c9a226..99bf47f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,6 +30,7 @@ revisor.spec
revisor/Makefile
revisor/__init__.py
revisor/modcobbler/Makefile
+revisor/modcomposer/Makefile
revisor/moddelta/Makefile
revisor/modgui/Makefile
revisor/modgui/glade/base_screen.glade
diff --git a/revisor.spec.in b/revisor.spec.in
index 12f0901..fecf360 100644
--- a/revisor.spec.in
+++ b/revisor.spec.in
@@ -2,6 +2,7 @@
%define pkg_cobbler 1
%define pkg_comps 1
+%define pkg_composer 0
%define pkg_delta 0
%define pkg_hub 0
%define pkg_isolinux 1
@@ -69,6 +70,9 @@ Obsoletes: revisor-comps
%if ! %{pkg_cobbler}
Obsoletes: revisor-cobbler
%endif
+%if ! %{pkg_composer}
+Obsoletes: revisor-composer
+%endif
%if ! %{pkg_delta}
Obsoletes: revisor-delta
%endif
@@ -135,6 +139,19 @@ Xen and KVM stuff.
%endif
##
+## Revisor Composer plugin
+##
+%if %{pkg_composer}
+%package composer
+Summary: Revisor Composer, for use with the Hub
+Group: Applications/System
+Requires: revisor-cli = %{version}-%{release}
+
+%description composer
+Revisor build farms need Composers. This is it.
+%endif
+
+##
## Revisor DeltaRPM/DeltaISO plugin
##
%if %{pkg_delta}
@@ -169,7 +186,7 @@ Group: Applications/System
Requires: revisor-cli = %{version}-%{release}
%description hub
-Revisor build farms need a hub. This is it.
+Revisor build farms need a Hub. This is it.
%endif
##
@@ -297,8 +314,8 @@ make install DESTDIR=$RPM_BUILD_ROOT
rm -rf %{buildroot}/%{python_sitelib}/revisor/modcobbler
%endif
-%if ! %{pkg_cobbler}
- rm -rf %{buildroot}/%{python_sitelib}/revisor/modcobbler
+%if ! %{pkg_composer}
+ rm -rf %{buildroot}/%{python_sitelib}/revisor/modcomposer
%endif
%if ! %{pkg_delta}
@@ -391,6 +408,15 @@ rm -rf $RPM_BUILD_ROOT
%{python_sitelib}/revisor/modcobbler/*.pyo
%endif
+%if %{pkg_composer}
+%files composer
+%defattr(-,root,root,-)
+%dir %{python_sitelib}/revisor/modcomposer
+%{python_sitelib}/revisor/modcomposer/*.py
+%{python_sitelib}/revisor/modcomposer/*.pyc
+%{python_sitelib}/revisor/modcomposer/*.pyo
+%endif
+
%if %{pkg_delta}
%files delta
%defattr(-,root,root,-)
diff --git a/revisor/base.py b/revisor/base.py
index ae3b1ad..f8ab413 100644
--- a/revisor/base.py
+++ b/revisor/base.py
@@ -113,6 +113,11 @@ class RevisorBase:
self.hub = self.plugins.modhub
self.cfg.gui_mode = False #hack!
self.hub.run(base=self)
+ elif self.cfg.composer_mode:
+ self.log.debug(_("Running Revisor in Composer mode..."), level=1)
+ self.composer = self.plugins.modcomposer
+ self.cfg.gui_mode = False #hack!
+ self.composer.run(base=self)
elif self.cfg.server_mode:
self.log.debug(_("Running Revisor in RPC Server mode..."), level=1)
self.server = self.plugins.modserver
@@ -1111,8 +1116,7 @@ class RevisorBase:
required_pkgs.extend(['grub'])
if self.cfg.version_from not in [ "F10", "DEVEL" ]:
- if self.cfg.architecture not in [ "ppc", "ppc64" ]:
- required_pkgs.extend(['kernel-xen'])
+ required_pkgs.extend(['kernel-xen'])
suggested_pkgs = []
@@ -1483,18 +1487,7 @@ class RevisorBase:
# FIXME: Optionally recompose installer images
pbar = self.progress_bar(_("Building Installation Images"))
- if self.cfg.architecture in [ "ppc", "ppc64" ]:
- files = [ "images/boot.iso", "ppc/ppc32/vmlinuz", "ppc/ppc64/vmlinuz" ]
- else:
- files = [ "isolinux/isolinux.cfg", "isolinux/isolinux.bin", "isolinux/vmlinuz", "isolinux/initrd.img", "images/boot.iso" ]
-
- 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):
-
- run_buildinstall = True
-
- if run_buildinstall:
+ if not os.access(os.path.join(self.cfg.working_directory, "revisor-pungi", self.cfg.version, self.cfg.model, self.cfg.architecture, "os", "isolinux", "initrd.img"), os.R_OK):
pungicallback = revisor.progress.PungiCallback(pbar, pungi=mypungi, cfg=self.cfg)
mypungi.doBuildinstall(callback=pungicallback)
else:
@@ -1686,10 +1679,8 @@ class RevisorBase:
groups_nondefault.append(group.groupid)
# Now, make sure that any packages listed in the kickstart end
- # up on the first possible disc as well. But not when composing
- # the everything spin, please
- if not self.cfg.everything_spin:
- ds.addPackages(packageList)
+ # up on the first possible disc as well
+ ds.addPackages(packageList)
for group in groups_nondefault:
# Do not do this because the installer still has all the groups available
diff --git a/revisor/modcomposer/Makefile.am b/revisor/modcomposer/Makefile.am
new file mode 100755
index 0000000..52d8c0b
--- /dev/null
+++ b/revisor/modcomposer/Makefile.am
@@ -0,0 +1,8 @@
+PYTHON_FILES = \
+ __init__.py
+
+EXTRA_DIST = \
+ $(PYTHON_FILES)
+
+pydir = $(pythondir)/revisor/modcomposer
+py_PYTHON = $(PYTHON_FILES)
diff --git a/revisor/modcomposer/__init__.py b/revisor/modcomposer/__init__.py
new file mode 100755
index 0000000..32fbfa7
--- /dev/null
+++ b/revisor/modcomposer/__init__.py
@@ -0,0 +1,185 @@
+# Translation
+from rhpl.translate import _, N_, getDefaultLangs
+
+import revisor
+import revisor.base
+import revisor.cfg
+from revisor.client import *
+
+import SimpleXMLRPCServer
+import xmlrpclib
+import os
+import thread
+import time
+
+# Composing Module
+class RevisorComposer():
+ """ Composer Mode """
+
+ def __init__(self):
+ self.composer_id = 0
+ self.job_id = 0
+ pass
+
+ def run(self, base):
+ try:
+ self.composer_id = self.composer_logon()
+ print "composer_id:", self.composer_id
+ # TEST: multiple jobs
+ time.sleep(2)
+ self.do_job()
+ time.sleep(6)
+ self.do_job()
+ time.sleep(6)
+ self.do_job()
+ time.sleep(6)
+ self.do_job()
+ #self.do_xmlrpc(base.cfg)
+ except Exception, e:
+ self.composer_logoff()
+ base.log.info("Shutting down...")
+ raise e
+ self.composer_logoff()
+
+ def do_job(self):
+ self.get_kickstart_file()
+ self.job_id += 1
+ self.start_compose(self.job_id)
+ return 1
+
+ def composer_logon(self):
+ print "Logging on..."
+ try:
+ hub = Connection("http://localhost:9321")
+ self.composer_id = hub.con.composer_logon("localhost", 9322)
+ #hub.close()
+ except Exception, e:
+ raise e
+ return self.composer_id
+
+ def composer_logoff(self):
+ print "Logging off..."
+ try:
+ hub = Connection("http://localhost:9321")
+ hub.con.composer_logoff(self.composer_id)
+ #hub.close()
+ except Exception, e:
+ raise e
+ return self.composer_id
+
+ def get_kickstart_file(self):
+ print "Getting kickstart file."
+ try:
+ hub = Connection("http://localhost:9321")
+ self.kickstart_file = hub.con.get_kickstart_file(self.composer_id)
+ #hub.close()
+ except Exception, e:
+ raise e
+ return self.kickstart_file
+
+ def start_compose(self, job_id):
+ print "Starting Spin: test.ks"
+ try:
+ print "########"
+ print self.kickstart_file
+ print "########"
+ except Exception, e:
+ base.log.info("Spin creation process interrupted...")
+ raise e
+
+# XMLRPC Methods
+ def do_xmlrpc(self, base):
+ print "Composer XML-RPC Server Started..."
+ xinterface = RevisorXMLRPCInterface(self, base.cfg)
+ server = RevisorXMLRPCServer(('', int(base.cfg.composer_port)))
+ server.register_introspection_functions()
+ base.cfg.log.info("Composer XMLRPC Server running on port %s..." % base.cfg.composer_port)
+ server.register_instance(xinterface)
+ while True:
+ try:
+ server.serve_forever()
+ except IOError:
+ # interrupted? try to serve again
+ time.sleep(0.5)
+
+ def add_options(self, parser):
+ modcomposer_group = parser.add_option_group("Composer Options")
+ modcomposer_group.add_option( "--composer",
+ dest = "composer_mode",
+ action = "store_true",
+ default = False,
+ help = _("Use the Composer mode for distributed composing. Use as a client for modhub"))
+ modcomposer_group.add_option( "--composer-port",
+ dest = "composer_port",
+ action = "store",
+ default = "9322",
+ help = _("Port to start Composer mode on."),
+ metavar = "[composer-port]")
+ modcomposer_group.add_option( "--master-ip",
+ dest = "master_ip",
+ action = "store",
+ default = "localhost",
+ help = _("IP Address of where the Revisor Hub is running."),
+ metavar = "[master-ip]")
+ modcomposer_group.add_option( "--master-port",
+ dest = "master_port",
+ action = "store",
+ default = "9321",
+ help = _("Port of where the Revisor Hub is running."),
+ metavar = "[master-port]")
+
+ def check_options(self, cfg, cli_options):
+ # Cheater! Found a cheater!
+ if cli_options.composer_mode:
+ cfg.server_mode = False
+ cfg.composer_mode = True
+ cfg.hub_mode = False
+ cfg.gui_mode = False
+ cfg.cli_mode = False
+
+ def set_defaults(self, defaults):
+ #defaults.db_server = x.x.x.x
+ #defaults.db_type = mysql #for later development
+ #defaults.setport = "3306"
+ #defaults.username = "blaat"
+ #defaults.password = "pass"
+ #defaults.dbname = "revisor-hubdb"
+ #defaults.configfile = "blaat"
+ pass
+
+
+# The actual XMLRPC Object Server
+class RevisorXMLRPCServer(SimpleXMLRPCServer.SimpleXMLRPCServer):
+ """ The actual XML-RPC Server object"""
+ def __init__(self, args):
+ self.allow_reuse_address = True
+ SimpleXMLRPCServer.SimpleXMLRPCServer.__init__(self, args)
+
+
+# XMLRPC Methods: Accessable by the Hub
+class RevisorXMLRPCInterface(object):
+ """ Functionality to expose to the XML-RPC interface. """
+
+ def __init__(self, composer, cfg=None):
+ try:
+ if cfg:
+ self.cfg = cfg
+ else:
+ # FIXME: Initialize ConfigStore or return Error
+ pass
+ except NameError:
+ pass
+ self.composer = composer
+ self.composer_occupied = 0
+ pass
+
+ def are_you_busy(self):
+ return self.composer_occupied
+
+ def wake_composer(self, job_id, kickstart_file):
+ print "Composer", self.composer.composer_id, "has awakened!"
+ self.composer_occupied
+ self.composer.start_composer(job_id, kickstart_file)
+
+ def progress_update(self):
+ return "99.934%"
\ No newline at end of file
diff --git a/revisor/modhub/__init__.py b/revisor/modhub/__init__.py
index db55a7a..c27352a 100644
--- a/revisor/modhub/__init__.py
+++ b/revisor/modhub/__init__.py
@@ -4,10 +4,13 @@ from rhpl.translate import _, N_, getDefaultLangs
import revisor
import revisor.base
import revisor.cfg
+from revisor.client import *
import SimpleXMLRPCServer
import xmlrpclib
import os
+import thread
+import time
#import logger.Logger
@@ -17,32 +20,40 @@ class RevisorHub():
def __init__(self):
pass
+ def run(self, base):
+ self.thread_count = 2
+ self.hub = HubMode()
+ try:
+ thread.start_new_thread(thread_do_polling,(base.cfg, self))
+ thread.start_new_thread(thread_do_xmlrpc,(base.cfg, self))
+ while self.thread_count > 1:
+ pass
+ except KeyboardInterrupt:
+ #base.log.info("Shutting Down...")
+ pass
+
def do_xmlrpc(self, cfg):
- """ Get our xmlrpc hub running. """
- xinterface = RevisorXMLRPCInterface(cfg)
- hub = RevisorXMLRPCServer(('', int(cfg.hub_port)))
- hub.register_introspection_functions()
- cfg.log.info("XMLRPC Server running on port %s" % cfg.hub_port)
- hub.register_instance(xinterface)
+ xinterface = RevisorXMLRPCInterface(self.hub, cfg)
+ server = RevisorXMLRPCServer(('', int(cfg.hub_port)))
+ server.register_introspection_functions()
+ cfg.log.info("Hub XMLRPC Server running on port %s..." % cfg.hub_port)
+ server.register_instance(xinterface)
while True:
try:
- hub.serve_forever()
+ server.serve_forever()
except IOError:
# interrupted? try to serve again
time.sleep(0.5)
-
- def run(self, base):
- print "HUB mode started!"
- if base.cfg.fork_mode:
- pid = os.fork()
- self.do_xmlrpc(base.cfg)
- else:
- try:
- self.do_xmlrpc(base.cfg)
- pass
- except KeyboardInterrupt:
- #base.log.info("Shutting down...")
- pass
+
+ def do_polling(self, cfg):
+ while True:
+ time.sleep(5)
+ print "Poll...!"
+ # Check DB for new KS file.
+ # Check if a Composer is present.
+ # Check if it's not busy
+ # Wake the Composer (Composer will ask for a new file)
+ # or... send a *.ks to the Composer
def add_options(self, parser):
modhub_group = parser.add_option_group("Hub Options")
@@ -57,12 +68,6 @@ class RevisorHub():
default = "9321",
help = _("Port to start Hub mode on."),
metavar = "[hub-port]")
- modhub_group.add_option("--forkhub",
- dest = "forkhub_mode",
- action = "store",
- default = False,
- help = _("Start the Hub mode and fork."),
- metavar = "[boolean]")
def check_options(self, cfg, cli_options):
# Cheater! Found a cheater!
@@ -83,10 +88,29 @@ class RevisorHub():
pass
+# Threads
+def thread_do_xmlrpc(cfg, revisorHub):
+ print "Hub XML-RPC Thread Started..."
+ revisorHub.do_xmlrpc(cfg)
+
+def thread_do_polling(cfg, revisorHub):
+ print "Hub Polling Thread Started..."
+ revisorHub.do_polling(cfg)
+
+
+# The actual XMLRPC Object Server
+class RevisorXMLRPCServer(SimpleXMLRPCServer.SimpleXMLRPCServer):
+ """ The actual XML-RPC Server object"""
+ def __init__(self, args):
+ self.allow_reuse_address = True
+ SimpleXMLRPCServer.SimpleXMLRPCServer.__init__(self, args)
+
+
+# XMLRPC Methods: Accessable to the Composers
class RevisorXMLRPCInterface(object):
""" Functionality to expose to the XML-RPC interface. """
- def __init__(self, cfg=None):
+ def __init__(self, hub, cfg=None):
try:
if cfg:
self.cfg = cfg
@@ -95,45 +119,54 @@ class RevisorXMLRPCInterface(object):
pass
except NameError:
pass
-
- self.sessions = dict()
- self.next_session = 0
+ self.hub = hub
pass
-
-class Session(object):
- def __init__(self, id):
- self.id = id
- print "Hub session initted"
- self.revisor = HubMode()
-
- def set_status(self, id, status):
- if id == self.id:
- self.revisor.set_status(id, status)
-
-class RevisorXMLRPCServer(SimpleXMLRPCServer.SimpleXMLRPCServer):
- """ The actual XML-RPC Server object"""
- def __init__(self, args):
- self.allow_reuse_address = True
- SimpleXMLRPCServer.SimpleXMLRPCServer.__init__(self, args)
-
-
+
+ def get_kickstart_file(self, composer_id):
+ print "Fetching kickstart file for Composer#", composer_id, "."
+ #Test line!
+ #ks_file = xmlrpclib.Binary(open('revisor/modhub/test.ks', 'rb').read())
+ binary_ks_file = xmlrpclib.Binary(self.hub.db_check_jobs().read())
+ return binary_ks_file
+
+ def composer_logon(self, composer_host, composer_port):
+ composer_id = self.hub.db_add_composer(composer_host, composer_port)
+ print "Composer ID:", composer_id, "logging on..."
+ return composer_id
+
+ def composer_logoff(self, composer_id):
+ print "Composer ID:", composer_id, "logging off..."
+ self.hub.db_remove_composer(composer_id)
+ return composer_id
+
+ def process_update(self, composer_id, process):
+ print "Composer ID", composer_id, "is at", process, "%."
+ return 1
+
+
+# Our Hub Methods
class HubMode():
def __init__(self):
+ # FIXME: Load a config file (db information, general settings)
+ self.count_composers = 0
pass
-
- def set_status(self, id, status):
- print id
- print status
- pass
-
- def db_get_ks():
- pass
-
- def check_jobs():
+
+ def db_get_ks(self): #Private function?
+ print "Getting test.ks from Database."
+ return open('revisor/modhub/test.ks', 'rb')
+
+ def db_check_jobs(self):
#check jobs in DB
+ print "Checking Database for Jobs"
#get KS from DB if any found
- pass
-
- def add_composer():
- #function to add composer for distribution idea
- pass
+ return self.db_get_ks()
+
+ def db_add_composer(self, composer_host, composer_port):
+ self.count_composers += 1
+ print "New composer added. ComposerID:", self.count_composers, "\nComposerHost:", composer_host, "ComposerPort:", composer_port
+ return self.count_composers
+
+ def db_remove_composer(self, composer_id):
+ self.count_composers -= 1
+ print "Composer removed. ComposerID:", composer_id
+ return self.count_composers
\ No newline at end of file
diff --git a/revisor/modhub/test.ks b/revisor/modhub/test.ks
new file mode 100755
index 0000000..2d4cf47
--- /dev/null
+++ b/revisor/modhub/test.ks
@@ -0,0 +1 @@
+Test_Content test_ks
\ No newline at end of file
diff --git a/revisor/plugins.py b/revisor/plugins.py
index fae8758..2451d94 100644
--- a/revisor/plugins.py
+++ b/revisor/plugins.py
@@ -32,6 +32,7 @@ class RevisorPlugins:
"""Specifies a list of plugins to test for, and triggers running those tests"""
self.plugins = {
'modcobbler': False,
+ 'modcomposer': False,
'moddelta': False,
'modgui': False,
'modisolinux': False,
commit f902b38887f12499689779c0de7d9c9b870fd649
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Wed Dec 17 03:36:59 2008 +0100
Fix indentation
diff --git a/revisor/base.py b/revisor/base.py
index 30d0feb..ae3b1ad 100644
--- a/revisor/base.py
+++ b/revisor/base.py
@@ -1492,7 +1492,7 @@ class RevisorBase:
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):
- run_buildinstall = True
+ run_buildinstall = True
if run_buildinstall:
pungicallback = revisor.progress.PungiCallback(pbar, pungi=mypungi, cfg=self.cfg)
commit a1cf062257a55e144701bf57a741c055d3a3bf5d
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Wed Dec 17 03:35:44 2008 +0100
Fix the checking as well
diff --git a/revisor/base.py b/revisor/base.py
index 32bb0df..30d0feb 100644
--- a/revisor/base.py
+++ b/revisor/base.py
@@ -1483,7 +1483,18 @@ class RevisorBase:
# FIXME: Optionally recompose installer images
pbar = self.progress_bar(_("Building Installation Images"))
- if not os.access(os.path.join(self.cfg.working_directory, "revisor-pungi", self.cfg.version, self.cfg.model, self.cfg.architecture, "os", "isolinux", "initrd.img"), os.R_OK):
+ if self.cfg.architecture in [ "ppc", "ppc64" ]:
+ files = [ "images/boot.iso", "ppc/ppc32/vmlinuz", "ppc/ppc64/vmlinuz" ]
+ else:
+ files = [ "isolinux/isolinux.cfg", "isolinux/isolinux.bin", "isolinux/vmlinuz", "isolinux/initrd.img", "images/boot.iso" ]
+
+ 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):
+
+ run_buildinstall = True
+
+ if run_buildinstall:
pungicallback = revisor.progress.PungiCallback(pbar, pungi=mypungi, cfg=self.cfg)
mypungi.doBuildinstall(callback=pungicallback)
else:
commit 0e525aa70f3f1220154550c9fe296d5865cccc58
Merge: 5f2fa55... d48c986...
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Wed Dec 17 03:12:21 2008 +0100
Merge branch 'master' of ssh://git.fedorahosted.org/git/revisor
commit d48c98636f505c29037a82b7e1ebb933f99a491d
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Thu Dec 18 02:36:16 2008 +0100
ppc needs respin kickstart config as well... and no yum pkgordering
diff --git a/unity/conf/f9-install-respin.conf b/unity/conf/f9-install-respin.conf
index 297eee2..6130b7f 100644
--- a/unity/conf/f9-install-respin.conf
+++ b/unity/conf/f9-install-respin.conf
@@ -33,7 +33,6 @@ architecture = i386
version = 9
version_from = F9
kickstart_file = /etc/revisor/conf.d/fedora-9-gold.cfg
-pkgorder_style = yum
[f9-x86_64-respin]
description = Fedora Unity Re-Spin Model for Fedora 9
@@ -46,7 +45,6 @@ architecture = x86_64
version = 9
version_from = F9
kickstart_file = /etc/revisor/conf.d/fedora-9-respin.cfg
-#pkgorder_style = yum
[f9-ppc-respin]
description = Fedora Unity Re-Spin Model for Fedora 9
@@ -58,8 +56,7 @@ iso_label = FU $datestamp
architecture = ppc
version = 9
version_from = F9
-kickstart_file = /etc/revisor/conf.d/fedora-9-gold.cfg
-pkgorder_style = yum
+kickstart_file = /etc/revisor/conf.d/fedora-9-respin.cfg
[f9-ppc64-respin]
description = Fedora Unity Re-Spin Model for Fedora 9
@@ -72,5 +69,4 @@ architecture = ppc64
version = 9
version_from = F9
kickstart_file = /etc/revisor/conf.d/fedora-9-gold.cfg
-pkgorder_style = yum
commit 5f2fa55d85e488df78543540890c9efa387ad88d
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Wed Dec 17 03:12:04 2008 +0100
Fix reuseinstaller for ppc archs
diff --git a/revisor/modreuseinstaller/__init__.py b/revisor/modreuseinstaller/__init__.py
index 74414db..71411c0 100644
--- a/revisor/modreuseinstaller/__init__.py
+++ b/revisor/modreuseinstaller/__init__.py
@@ -55,8 +55,13 @@ class RevisorReuseinstaller:
if not cli_options.reuse == "":
self.cfg.reuse = cli_options.reuse
+
+ if self.cfg.architecture in [ "ppc", "ppc64" ]:
+ files = [ "images/boot.iso", "ppc/ppc32/vmlinuz", "ppc/ppc64/vmlinuz" ]
+ else:
+ files = [ "isolinux/isolinux.cfg", "isolinux/isolinux.bin", "isolinux/vmlinuz", "isolinux/initrd.img", "images/boot.iso" ]
# FIXME: This only does local trees right now
- for file in [ "isolinux/isolinux.cfg", "isolinux/isolinux.bin", "isolinux/vmlinuz", "isolinux/initrd.img", "images/boot.iso" ]:
+ for file in files:
if not os.access("%s/%s" % (cli_options.reuse,file), os.R_OK):
self.cfg.reuse = False
self.log.error(_("Could not access %s/%s, required for reusing a previous tree. Cancelling the reuse of installer images") % (cli_options.reuse,file), recoverable=True)
@@ -69,11 +74,17 @@ class RevisorReuseinstaller:
print self.cfg.reuse
return
+ if self.cfg.architecture in [ "ppc", "ppc64" ]:
+ dirs = [ "etc", "images", "ppc" ]
+ else:
+ dirs = [ "isolinux", "images" ]
+
target = os.path.join(self.cfg.working_directory, "revisor-pungi", self.cfg.version, self.cfg.model, self.cfg.architecture, "os")
- self.log.debug(_("Copying %s/%s to %s/%s") % (self.cfg.reuse, "images", target, "images"), level=9)
- shutil.copytree("%s/%s" % (self.cfg.reuse, "images"), "%s/%s" % (target, "images"))
- self.log.debug(_("Copying %s/%s to %s/%s") % (self.cfg.reuse, "isolinux", target, "isolinux"), level=9)
- shutil.copytree("%s/%s" % (self.cfg.reuse, "isolinux"), "%s/%s" % (target, "isolinux"))
+
+ for dir in dirs:
+ self.log.debug(_("Copying %s/%s to %s/%s") % (self.cfg.reuse, dir, target, dir), level=9)
+ shutil.copytree("%s/%s" % (self.cfg.reuse, dir), "%s/%s" % (target, dir))
+
self.log.debug(_("Copying %s/.discinfo to %s/.discinfo") % (self.cfg.reuse, target), level=9)
shutil.copy("%s/.discinfo" % (self.cfg.reuse), target)
if os.access("%s/.treeinfo" % (self.cfg.reuse), os.R_OK):
commit d9f802b39017f90c28ce5964c9e7f1b113dca4a4
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Wed Dec 17 03:07:38 2008 +0100
Remove duplicate boot.iso
diff --git a/revisor/modreuseinstaller/__init__.py b/revisor/modreuseinstaller/__init__.py
index b5bdd49..74414db 100644
--- a/revisor/modreuseinstaller/__init__.py
+++ b/revisor/modreuseinstaller/__init__.py
@@ -56,7 +56,7 @@ class RevisorReuseinstaller:
if not cli_options.reuse == "":
self.cfg.reuse = cli_options.reuse
# FIXME: This only does local trees right now
- for file in [ "isolinux/isolinux.cfg", "isolinux/isolinux.bin", "isolinux/vmlinuz", "isolinux/initrd.img", "images/boot.iso", "images/boot.iso" ]:
+ for file in [ "isolinux/isolinux.cfg", "isolinux/isolinux.bin", "isolinux/vmlinuz", "isolinux/initrd.img", "images/boot.iso" ]:
if not os.access("%s/%s" % (cli_options.reuse,file), os.R_OK):
self.cfg.reuse = False
self.log.error(_("Could not access %s/%s, required for reusing a previous tree. Cancelling the reuse of installer images") % (cli_options.reuse,file), recoverable=True)
commit c53272a53965d4238fe7188f15f524a5601204f6
Merge: f02bd5d... d46459d...
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Tue Dec 16 18:49:54 2008 +0100
Merge branch 'master' of ssh://git.fedorahosted.org/git/revisor
commit f02bd5dcd66f53a7d5810feb397c9362cb9678e5
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Wed Dec 17 15:26:36 2008 +0100
No kernel-xen on these architectures
diff --git a/revisor/base.py b/revisor/base.py
index f5d040c..68a6d98 100644
--- a/revisor/base.py
+++ b/revisor/base.py
@@ -1111,7 +1111,8 @@ class RevisorBase:
required_pkgs.extend(['grub'])
if self.cfg.version_from not in [ "F10", "DEVEL" ]:
- required_pkgs.extend(['kernel-xen'])
+ if self.cfg.architecture not in [ "ppc", "ppc64" ]:
+ required_pkgs.extend(['kernel-xen'])
suggested_pkgs = []
commit d46459d0ecb90b4c97a33e6451f64ecf2690000b
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Tue Dec 16 18:49:47 2008 +0100
Skip the list of packages in kickstart for everything spins
diff --git a/revisor/base.py b/revisor/base.py
index f5d040c..4bffcbb 100644
--- a/revisor/base.py
+++ b/revisor/base.py
@@ -1674,8 +1674,10 @@ class RevisorBase:
groups_nondefault.append(group.groupid)
# Now, make sure that any packages listed in the kickstart end
- # up on the first possible disc as well
- ds.addPackages(packageList)
+ # up on the first possible disc as well. But not when composing
+ # the everything spin, please
+ if not self.cfg.everything_spin:
+ ds.addPackages(packageList)
for group in groups_nondefault:
# Do not do this because the installer still has all the groups available
commit 85895e1867ac2298a1d8efbce1ce07a77b009b7d
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Tue Dec 16 14:35:33 2008 +0100
Change f9-x86_64-respin model to use the fedora-9-respin.cfg kickstart file
diff --git a/unity/conf/f9-install-respin.conf b/unity/conf/f9-install-respin.conf
index 42a8afa..297eee2 100644
--- a/unity/conf/f9-install-respin.conf
+++ b/unity/conf/f9-install-respin.conf
@@ -45,7 +45,7 @@ iso_label = FU $datestamp
architecture = x86_64
version = 9
version_from = F9
-kickstart_file = /etc/revisor/conf.d/fedora-9-gold.cfg
+kickstart_file = /etc/revisor/conf.d/fedora-9-respin.cfg
#pkgorder_style = yum
[f9-ppc-respin]
commit 7da647e1685507b03f93e89d5aad0eecf3288507
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Tue Dec 16 14:34:38 2008 +0100
Add a fedora-9-respin.cfg
diff --git a/conf/conf.d/fedora-9-respin.cfg b/conf/conf.d/fedora-9-respin.cfg
new file mode 100644
index 0000000..4c16176
--- /dev/null
+++ b/conf/conf.d/fedora-9-respin.cfg
@@ -0,0 +1,192 @@
+# Kickstart file for composing the "Fedora" spin of Fedora 9 (Sulphur)
+
+# Use a part of 'iso' to define how large you want your isos.
+# Only used when composing to more than one iso.
+# Default is 670 (megs), CD size.
+#part iso --size=4998
+
+# Add the repos you wish to use to compose here. At least one of them needs group data.
+repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-9&arch=$basearch
+repo --name=fedora-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-9&arch=$basearch
+repo --name=fedora-updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f9&arch=$basearch
+repo --name=fedora-updates-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-source-f9&arch=$basearch
+
+# Package manifest for the compose. Uses repo group metadata to translate groups.
+# (@base is added by default unless you add --nobase to %packages)
+%packages
+# core
+tcsh
+@base-x
+kernel*
+-kernel*debug*
+-kernel*-devel*
+-kernel-kdump*
+-syslog-ng
+# Hardware stuff
+@hardware-support
+@dial-up
+# Desktop Packages
+@gnome-desktop
+@kde-desktop
+echo-icon-theme
+tracker
+swfdec
+libflashsupport
+nspluginwrapper
+liferea
+esc
+thunderbird
+# apps
+@authoring-and-publishing
+#@eclipse
+@editors
+joe
+emacs
+@games
+@graphical-internet
+@graphics
+@java
+@office
+@sound-and-video
+k3b
+@text-internet
+@system-tools
+wireshark-gnome
+# Devel packages
+#@development-libs
+#@development-tools
+@gnome-software-development
+@java-development
+@kde-software-development
+#@web-development
+@x-software-development
+# Server packages
+#@dns-server
+#@ftp-server
+@mail-server
+@mysql
+@network-server
+@news-server
+@printing
+@server-cfg
+@smb-server
+@sql-server
+@web-server --optional
+# Virt group
+@virtualization --optional
+# filesystem stuff
+reiserfs-utils
+xfsprogs
+jfsutils
+# Languages
+@afrikaans-support
+@albanian-support
+@arabic-support
+@armenian-support
+@assamese-support
+@basque-support
+@belarusian-support
+@bengali-support
+@bhutanese-support
+@bosnian-support
+@brazilian-support
+@breton-support
+@british-support
+@bulgarian-support
+@catalan-support
+@chinese-support
+@croatian-support
+@czech-support
+@danish-support
+@dutch-support
+@esperanto-support
+@estonian-support
+@ethiopic-support
+@faeroese-support
+@filipino-support
+@finnish-support
+@french-support
+@gaelic-support
+@galician-support
+@georgian-support
+@german-support
+@greek-support
+@gujarati-support
+@hebrew-support
+@hindi-support
+@hungarian-support
+@icelandic-support
+@indonesian-support
+@inuktitut-support
+@irish-support
+@italian-support
+@japanese-support
+@kannada-support
+@kashubian-support
+@khmer-support
+@korean-support
+@lao-support
+@latvian-support
+@lithuanian-support
+@low-saxon-support
+@macedonian-support
+@malay-support
+@malayalam-support
+@maori-support
+@marathi-support
+@mongolian-support
+@nepali-support
+@northern-sami-support
+@northern-sotho-support
+@norwegian-support
+@oriya-support
+@persian-support
+@polish-support
+@portuguese-support
+@punjabi-support
+@romanian-support
+@russian-support
+@samoan-support
+@serbian-support
+@sinhala-support
+@slovak-support
+@slovenian-support
+@somali-support
+@southern-ndebele-support
+@southern-sotho-support
+@spanish-support
+@swati-support
+@swedish-support
+@tagalog-support
+@tamil-support
+@telugu-support
+@thai-support
+@tibetan-support
+@tonga-support
+@tsonga-support
+@tswana-support
+@turkish-support
+@ukrainian-support
+@urdu-support
+@venda-support
+@vietnamese-support
+@walloon-support
+@welsh-support
+@xhosa-support
+@zulu-support
+# Compose Needs
+#anaconda-runtime
+#cracklib-python
+#iscsi-initiator-utils
+#memtest86+
+#vnc-server
+# Size removals
+-gimp-help
+-java-1.6.0-openjdk-src
+-xorg-x11-docs
+-kernel-doc
+-java-1.5.0-gcj-src
+-java-1.5.0-gcj-devel
+-libgcj-src
+-*javadoc*
+%end
commit d7712539e63f671fc876e8ca2e27b7ae1f1c0b25
Merge: 4519bbd... db24880...
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Tue Dec 16 11:57:04 2008 +0100
Merge branch 'master' of ssh://git.fedorahosted.org/git/revisor
commit 4519bbd5ed390e51326d5fbc9d201bd74ad640bb
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Tue Dec 16 11:54:44 2008 +0100
Fix pkgorder spitting out ugly stuff
diff --git a/revisor/pkgorder.py b/revisor/pkgorder.py
index 4cf53b4..381e372 100644
--- a/revisor/pkgorder.py
+++ b/revisor/pkgorder.py
@@ -117,7 +117,7 @@ class PackageOrderer(yum.YumBase):
(exactmatched, matched, unmatched) = yum.packages.parsePackages(self.pkgSack.returnPackages(), packageLst, casematch=0)
matches = exactmatched + matched
- self.log.debug(_("Adding package(s): %r") % matches, level=9)
+ self.log.debug(_("Adding package(s): %r") % [match.name for match in matches], level=9)
map(self.install, filter(lambda x: self.pkgSack.returnNewestByName(), matches))
commit db248803efb097909c41ef5aa4d615978c2324d2
Author: S. A. Hartsuiker <sahartsu(a)xs4all.nl>
Date: Mon Dec 15 23:29:32 2008 +0100
Fix error reported by noik00(a)gmail.com
diff --git a/revisor/__init__.py.in b/revisor/__init__.py.in
index 73fe257..dce9aef 100644
--- a/revisor/__init__.py.in
+++ b/revisor/__init__.py.in
@@ -236,7 +236,12 @@ class Revisor:
dest = "media_installation_bluray",
action = "store_true",
default = False,
- help = _("Create Installation Media Blu-Ray Discs (Capacity per disc: 50GB)"))
+ help = _("Create Installation Media Blu-Ray Discs (Capacity per disc: 25GB)"))
+ install_group.add_option( "--install-bluray-dl",
+ dest = "media_installation_bluray_duallayer",
+ action = "store_true",
+ default = False,
+ help = _("Create Installation Media Duallayer Blu-Ray Discs (Capacity per disc: 50GB)"))
install_group.add_option( "--install-unified",
dest = "media_installation_unified",
action = "store_true",
@@ -468,4 +473,4 @@ class Revisor:
if os.access(os.path.join(self.base.cfg.working_directory, dir), os.R_OK):
shutil.rmtree(os.path.join(self.base.cfg.working_directory, dir))
- sys.exit(exitcode)
\ No newline at end of file
+ sys.exit(exitcode)
commit a7b78bc34383534f918c1f7a9213208a01517625
Merge: 43fb14d... ebaa9f3...
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Dec 15 21:47:17 2008 +0100
Merge branch 'master' of ssh://git.fedorahosted.org/git/revisor
commit 43fb14dfe3d397199bca41099a4610f114b441e5
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Dec 15 20:17:16 2008 +0100
Update package ordering and commit splittree to the changes
diff --git a/revisor/base.py b/revisor/base.py
index ae1802a..f5d040c 100644
--- a/revisor/base.py
+++ b/revisor/base.py
@@ -380,7 +380,7 @@ class RevisorBase:
if self.cfg.ksobj._get("packages","default"):
for group in self.cfg.yumobj.comps.groups:
if hasattr(group,"default"):
- if group.default:
+ if bool(group.default):
groupList.append(self.cfg.ksobj._Group(group.groupid))
##
@@ -676,6 +676,12 @@ class RevisorBase:
self.log.debug(_("Appending group @base"))
groupList.append(self.cfg.ksobj._Group("base"))
+ if self.cfg.ksobj._get("packages","default"):
+ for group in self.cfg.yumobj.comps.groups:
+ if hasattr(group,"default"):
+ if bool(group.default):
+ groupList.append(self.cfg.ksobj._Group(group.groupid))
+
##
## Add packages from Groups in ksdata
##
@@ -1634,22 +1640,30 @@ class RevisorBase:
groups_nondefault = []
groups_nondefault_support = []
+ groupList = [grp.name for grp in self.cfg.ksobj._get("packages","groupList")]
+ self.log.debug(_("Running with grouplist: %r") % groupList, level=9)
+
+ packageList = self.cfg.ksobj._get("packages","packageList")
+ self.log.debug(_("Running with packagelist: %r") % packageList, level=9)
+
pbar.current = 0.0
- num_groups = len(self.cfg.yumobj.comps.groups)
+ num_groups = len(groupList)
pbar.total = float(num_groups)
self.log.debug(_("Appending group core and base"), level=7)
ds.addGroups(["core", "base"])
- ds.addGroups(["base-x"])
-
for group in self.cfg.yumobj.comps.groups:
+ # Do not do this because the installer still has all the groups available
+ #if not group.groupid in groupList:
+ #continue
+
if hasattr(group,"default"):
- if group.default:
+ if bool(group.default):
self.log.debug(_("Appending default group %s") % group.groupid, level=7)
- ds.addGroups(group.groupid)
+ ds.addGroups([group.groupid])
pbar.current += 1.0
pbar.set_fraction(pbar.current/pbar.total)
elif group.groupid.endswith("-support"):
@@ -1659,22 +1673,34 @@ class RevisorBase:
else:
groups_nondefault.append(group.groupid)
+ # Now, make sure that any packages listed in the kickstart end
+ # up on the first possible disc as well
+ ds.addPackages(packageList)
+
for group in groups_nondefault:
+ # Do not do this because the installer still has all the groups available
+ #if group not in groupList:
+ #continue
+
self.log.debug(_("Appending non-default group %s") % group, level=7)
ds.addGroups([group])
pbar.current += 1.0
pbar.set_fraction(pbar.current/pbar.total)
for group in groups_nondefault_support:
+ # Do not do this because the installer still has all the groups available
+ #if group not in groupList:
+ #continue
+
self.log.debug(_("Appending non-default support group %s") % group, level=7)
- ds.addGroups([group])
+ # Speed things up!
+ #ds.addGroups([group])
pbar.current += 1.0
pbar.set_fraction(pbar.current/pbar.total)
# Everthing else but kernels
for po in ds.pkgSack.returnPackages():
- fpattern = "%s*" % po.name
- ds.printMatchingPkgs(fpattern)
+ ds.printMatchingPkgs(os.path.basename(po.localPkg()))
pbar.destroy()
@@ -1718,14 +1744,13 @@ class RevisorBase:
"java-development", "kde-software-development",
"mail-server", "network-server", "legacy-network-server"])
- pbar.set_fraction(34.0/38.0)
+ pbar.set_fraction(34.0/38.0)
- ds.addGroups(["news-server", "legacy-software-development"])
+ ds.addGroups(["news-server", "legacy-software-development"])
# Everthing else but kernels
for po in ds.pkgSack.returnPackages():
- fpattern = "%s*" % po.name
- ds.printMatchingPkgs(fpattern)
+ ds.printMatchingPkgs(os.path.basename(po.localPkg()))
pbar.destroy()
diff --git a/revisor/pkgorder.py b/revisor/pkgorder.py
index 97f7c1e..4cf53b4 100644
--- a/revisor/pkgorder.py
+++ b/revisor/pkgorder.py
@@ -73,8 +73,6 @@ class PackageOrderer(yum.YumBase):
os.makedirs(os.path.join(self.testpath,"etc"))
def addGroups(self, groupLst):
- self.initActionTs()
-
for group in groupLst:
# If no such group exists, skip it
if not self.comps.has_group(group):
@@ -86,50 +84,36 @@ class PackageOrderer(yum.YumBase):
self.log.debug(_("Adding group: %s") % group, level=9)
- grp = self.cfg.yumobj.comps.return_group(group)
-
- #packageLst = grp.mandatory_packages.keys() + grp.default_packages.keys() + grp.optional_packages.keys()
+ grp = self.comps.return_group(group)
- self.log.debug(_("The following packages are in group %s: %r") % (group, grp.mandatory_packages.keys() + grp.default_packages.keys()), level=9)
+# packageLst = grp.mandatory_packages.keys() + grp.default_packages.keys() + grp.optional_packages.keys()
+ packageLst = grp.mandatory_packages.keys() + grp.default_packages.keys()
- # From how we add Packages
- #(exactmatched, matched, unmatched) = yum.packages.parsePackages(self.pkgSack.returnPackages(), packageLst, casematch=0)
- #matches = exactmatched + matched
-
- #self.log.debug(_("Adding package(s): %r") % matches, level=9)
+ for condreq, cond in grp.conditional_packages.iteritems():
+ self.log.debug(_("Adding conditional: %s / %s") % (condreq, cond), level=9)
+ packageLst.extend([ condreq, cond ])
- #map(self.install, filter(lambda x: self.pkgSack.returnNewestByName(), matches))
+ self.log.debug(_("The following packages are in group %s: %r") % (group, packageLst), level=9)
- for pkg in grp.mandatory_packages.keys() + grp.default_packages.keys() + grp.optional_packages.keys():
+ for pkg in packageLst:
try:
pkgs = self.pkgSack.returnNewestByName(pkg)
for po in pkgs:
- self.tsInfo.addInstall(po)
+ self.install(po)
self.log.debug(_("Adding %s-%s:%s-%s.%s to transaction") % (po.name, po.epoch, po.version, po.release, po.arch), level=9)
except yum.Errors.PackageSackError, e:
pass
- for condreq, cond in grp.conditional_packages.iteritems():
- self.log.debug(_("Testing condition: %s / %s") % (condreq, cond), level=9)
- pkgs = self.pkgSack.searchNevra(name=condreq)
- if len(pkgs) > 1:
- pkgs = self.bestPackagesFromList(pkgs)
- if self.tsInfo.conditionals.has_key(cond):
- self.tsInfo.conditionals[cond].extend(pkgs)
- else:
- self.tsInfo.conditionals[cond] = pkgs
-
if self.cfg.pkgorder_style == "yum":
self.resolveDeps()
else:
self.log.debug(_("%d dependencies already resolved") % len(self.resolved_deps.keys()), level=9)
- (self.resolved_deps, self.final_pkgobjs) = revisor.misc.resolve_dependencies_inclusive(self.cfg.yumobj, self.cfg.log, resolved_deps=self.resolved_deps, final_pkgobjs=self.final_pkgobjs)
+ (self.resolved_deps, self.final_pkgobjs) = revisor.misc.resolve_dependencies_inclusive(self, logger=self.log, resolved_deps=self.resolved_deps, final_pkgobjs=self.final_pkgobjs)
- self.processTransaction()
+ for po in self.final_pkgobjs.keys():
+ self.printMatchingPkgs(os.path.basename(po.localPkg()))
def addPackages(self, packageLst):
- self.initActionTs()
-
(exactmatched, matched, unmatched) = yum.packages.parsePackages(self.pkgSack.returnPackages(), packageLst, casematch=0)
matches = exactmatched + matched
@@ -140,9 +124,10 @@ class PackageOrderer(yum.YumBase):
if self.cfg.pkgorder_style == "yum":
self.resolveDeps()
else:
- (self.resolved_deps, self.final_pkgobjs) = revisor.misc.resolve_dependencies_inclusive(self.cfg.yumobj, self.cfg.log, resolved_deps=self.resolved_deps, final_pkgobjs=self.final_pkgobjs)
+ (self.resolved_deps, self.final_pkgobjs) = revisor.misc.resolve_dependencies_inclusive(self, logger=self.log, resolved_deps=self.resolved_deps, final_pkgobjs=self.final_pkgobjs)
- self.processTransaction()
+ for po in self.final_pkgobjs.keys():
+ self.printMatchingPkgs(os.path.basename(po.localPkg()))
def processTransaction(self):
del self.ts
@@ -150,10 +135,8 @@ class PackageOrderer(yum.YumBase):
self.populateTs(keepold=0)
self.ts.check()
self.ts.order()
- for (hdr, path) in self.ts.ts.getKeys():
- fname = os.path.basename(path)
- fpattern = "%s*" % fname.rsplit('.', 2)[0]
- self.printMatchingPkgs(fpattern)
+ for txmbr in self.ts.ts.getKeys():
+ self.printMatchingPkgs(os.path.basename(txmbr.po.localPkg()))
def createConfig(self):
yumconfstr = """
@@ -181,25 +164,13 @@ enabled=1
except:
self.log.error(_("Unable to create yum configuration file for package ordering at %s") % os.path.join(self.testpath,"etc","yum.conf"))
- def printMatchingPkgs(self, fpattern):
- if os.path.isdir("%s/%s/RPMS" % (self.toppath, self.cfg.product_path)):
- matches = glob.glob("%s/%s/RPMS/%s" % (self.toppath, self.cfg.product_path, fpattern))
- elif os.path.isdir("%s/%s" %(self.toppath, self.cfg.product_path)):
- matches = glob.glob("%s/%s/%s" % (self.toppath, self.cfg.product_path, fpattern))
- # F8 prep
- elif os.path.isdir("%s/Packages" % (self.toppath)):
- matches = glob.glob("%s/Packages/%s" % (self.toppath, fpattern))
- else:
- matches = glob.glob("%s/%s" % (toppath, fpattern))
-
+ def printMatchingPkgs(self, filename):
+ if self.processed.has_key(filename): return
f = open(self.cfg.pkgorder_file,"a")
- for match in matches:
- mname = os.path.basename(match)
- if self.processed.has_key(mname): continue
- self.processed[mname] = True
- f.write(mname + "\n")
- self.log.debug(_("-> package %s") % mname)
+ f.write(filename + "\n")
f.close()
+ self.processed[filename] = True
+ self.log.debug(_("-> package %s") % filename)
def doFileLogSetup(self, uid, logfile):
pass
diff --git a/revisor/splittree.py b/revisor/splittree.py
index 21a797e..f8970c9 100755
--- a/revisor/splittree.py
+++ b/revisor/splittree.py
@@ -183,7 +183,6 @@ self.reserve_size : Additional size needed to be reserved on the first disc.
for j in range(0, len(dirlist)):
dirlist[j] = string.replace(dirlist[j], self.dist_dir, '')
-
# now create the dirs for disc1
for j in range(0, len(dirlist)):
os.makedirs("%s-disc%d/%s" % (self.dist_dir, i, dirlist[j]))
@@ -237,9 +236,6 @@ self.reserve_size : Additional size needed to be reserved on the first disc.
disc = self.bin_list[0]
for pkg in orderedlist:
-
- self.log.debug(_("Checking package %s") % pkg, level=9)
-
# Check if the package has already been included
if packages.has_key(pkg):
self.log.debug(_("pkg %s already included, skipping") % pkg, level=9)
@@ -255,8 +251,6 @@ self.reserve_size : Additional size needed to be reserved on the first disc.
else:
maxsize = self.target_size
- self.log.debug(_("Maximum size for disc #%d set to %d") % (disc, maxsize), level=9)
-
packagenum = packagenum + 1
if packagenum == 1:
@@ -286,6 +280,7 @@ self.reserve_size : Additional size needed to be reserved on the first disc.
os.link("%s/%s/%s" % (self.dist_dir, pkgdir, pkg),
"%s-disc%d/%s/%s" % (self.dist_dir, disc, pkgdir, pkg))
+
lastpackage = pkg
if reportSize == 1:
commit 82265a8cecf0dc9cd703089e3d5980f7468d3f23
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Dec 15 20:15:29 2008 +0100
Partial commit of the patch from David Kuestler
diff --git a/revisor/cfg.py b/revisor/cfg.py
index 663d7c9..2e0ca16 100644
--- a/revisor/cfg.py
+++ b/revisor/cfg.py
@@ -322,7 +322,7 @@ class ConfigStore:
if os.access(self.destination_directory, os.R_OK):
complain = False
if os.access(os.path.join(self.destination_directory,"iso"), os.R_OK):
- if int(self.media_installation_cd) + int(self.media_installation_dvd) + int(self.media_installation_dvd_duallayer) + int(self.media_installation_bluray) + int(self.media_installation_unified) + int(self.media_utility_rescue) > 0:
+ if int(self.media_installation_cd) + int(self.media_installation_dvd) + int(self.media_installation_dvd_duallayer) + int(self.media_installation_bluray) + int(self.media_installation_bluray_duallayer) + int(self.media_installation_unified) + int(self.media_utility_rescue) > 0:
complain = True
if os.access(os.path.join(self.destination_directory,"live"), os.R_OK):
if self.media_live:
@@ -341,7 +341,7 @@ class ConfigStore:
complain = False
if os.access(os.path.join(self.destination_directory,"iso"), os.R_OK):
# Mind that this cannot use self.media_installation since self.media_installation_pxe does not use ISOs
- if int(self.media_installation_cd) + int(self.media_installation_dvd) + int(self.media_installation_dvd_duallayer) + int(self.media_installation_bluray) + int(self.media_installation_unified) + int(self.media_utility_rescue) > 0:
+ if int(self.media_installation_cd) + int(self.media_installation_dvd) + int(self.media_installation_dvd_duallayer) + int(self.media_installation_bluray) + int(self.media_installation_bluray_duallayer) + int(self.media_installation_unified) + int(self.media_utility_rescue) > 0:
shutil.rmtree(os.path.join(self.destination_directory,"iso"))
if os.access(os.path.join(self.destination_directory,"live"), os.R_OK):
if self.media_live:
@@ -356,7 +356,7 @@ class ConfigStore:
# os.makedirs(self.destination_directory)
# Mind that this cannot use self.media_installation since self.media_installation_pxe does not use ISOs
- if not os.access(os.path.join(self.destination_directory,"iso"), os.R_OK) and int(self.media_installation_cd) + int(self.media_installation_dvd) + int(self.media_installation_dvd_duallayer) + int(self.media_installation_bluray) + int(self.media_installation_unified) + int(self.media_utility_rescue) > 0:
+ if not os.access(os.path.join(self.destination_directory,"iso"), os.R_OK) and int(self.media_installation_cd) + int(self.media_installation_dvd) + int(self.media_installation_dvd_duallayer) + int(self.media_installation_bluray) + int(self.media_installation_bluray_duallayer) + int(self.media_installation_unified) + int(self.media_utility_rescue) > 0:
while not os.access(os.path.join(self.destination_directory,"iso"), os.R_OK):
try:
os.makedirs(os.path.join(self.destination_directory,"iso"))
@@ -861,6 +861,7 @@ class ConfigStore:
self.media_installation_dvd or \
self.media_installation_dvd_duallayer or \
self.media_installation_bluray or \
+ self.media_installation_bluray_duallayer or \
self.media_installation_tree or \
self.media_installation_unified:
@@ -1145,7 +1146,8 @@ class Runtime:
1: "dvd",
2: "dvd-dl",
3: "bluray",
- 4: "unified"
+ 4: "bluray-dl",
+ 5: "unified"
},
"cd": {
"size": 685 * 1024 * 1024,
@@ -1171,12 +1173,19 @@ class Runtime:
"compose": "self.cfg.media_installation_dvd_duallayer"
},
"bluray": {
- "size": 50000 * 1024 * 1024,
+ "size": 23000 * 1024 * 1024,
"discdir": "bluray",
"label": "Bluray",
"discs": 0,
"compose": "self.cfg.media_installation_bluray"
},
+ "bluray-dl": {
+ "size": 47000 * 1024 * 1024,
+ "discdir": "bluray-dl",
+ "label": "Bluray-DL",
+ "discs": 0,
+ "compose": "self.cfg.media_installation_bluray_duallayer"
+ },
"unified": {
"size": -1,
"discdir": "unified",
commit 2537867e08bdea45fa217739e4b9be70f4592d16
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Dec 15 20:11:05 2008 +0100
Use a bool, not a string
diff --git a/scripts/find-default-groups.py b/scripts/find-default-groups.py
index f790685..021ae9f 100755
--- a/scripts/find-default-groups.py
+++ b/scripts/find-default-groups.py
@@ -70,7 +70,7 @@ class Yum(yum.YumBase):
self.total_default = 0
for group in self.comps.groups:
if hasattr(group,"default"):
- if group.default and not group.groupid in self.cli_options.skip_list:
+ if bool(group.default) and not group.groupid in self.cli_options.skip_list:
self.selectGroup(group.groupid)
self.total_mandatory += len(group.mandatory_packages.keys())
self.total_default += len(group.default_packages.keys())
commit 35e4fc7181ebc32652da1f5e91f4b5fc68b4e8e3
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Dec 15 01:00:56 2008 +0100
Reduce verbosity, it scares me
diff --git a/revisor/pkgorder.py b/revisor/pkgorder.py
index 89a951d..97f7c1e 100644
--- a/revisor/pkgorder.py
+++ b/revisor/pkgorder.py
@@ -101,12 +101,11 @@ class PackageOrderer(yum.YumBase):
#map(self.install, filter(lambda x: self.pkgSack.returnNewestByName(), matches))
for pkg in grp.mandatory_packages.keys() + grp.default_packages.keys() + grp.optional_packages.keys():
- self.log.debug(_("Attempt to add pkg %s") % (pkg), level=9)
try:
pkgs = self.pkgSack.returnNewestByName(pkg)
for po in pkgs:
self.tsInfo.addInstall(po)
- self.log.debug(_("Package Ordering: Adding %s-%s:%s-%s.%s to transaction") % (po.name, po.epoch, po.version, po.release, po.arch), level=9)
+ self.log.debug(_("Adding %s-%s:%s-%s.%s to transaction") % (po.name, po.epoch, po.version, po.release, po.arch), level=9)
except yum.Errors.PackageSackError, e:
pass
commit f0d74baadf035a27dd210039778184cfa365c2c7
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Dec 15 00:55:42 2008 +0100
With selectGroup from YUM, we're just not doing what we actually want to do;
Get all packages in a group and try and add them to a transaction, but only
if they exist in the repository (install tree) that we use.
Also, ensure that there's an installroot set in our little yum config, or some
packages might end up "already installed and latest version".
diff --git a/revisor/pkgorder.py b/revisor/pkgorder.py
index 9e6f819..89a951d 100644
--- a/revisor/pkgorder.py
+++ b/revisor/pkgorder.py
@@ -75,9 +75,50 @@ class PackageOrderer(yum.YumBase):
def addGroups(self, groupLst):
self.initActionTs()
- self.log.debug(_("Adding group(s): %r") % groupLst, level=9)
+ for group in groupLst:
+ # If no such group exists, skip it
+ if not self.comps.has_group(group):
+ continue
- map(self.selectGroup, filter(lambda x: self.comps.has_group(x), groupLst))
+ # If the group is not in the kickstart groups, skip it
+ #if not group in self.cfg.ksobj._get("packages","groupList"):
+ #continue
+
+ self.log.debug(_("Adding group: %s") % group, level=9)
+
+ grp = self.cfg.yumobj.comps.return_group(group)
+
+ #packageLst = grp.mandatory_packages.keys() + grp.default_packages.keys() + grp.optional_packages.keys()
+
+ self.log.debug(_("The following packages are in group %s: %r") % (group, grp.mandatory_packages.keys() + grp.default_packages.keys()), level=9)
+
+ # From how we add Packages
+ #(exactmatched, matched, unmatched) = yum.packages.parsePackages(self.pkgSack.returnPackages(), packageLst, casematch=0)
+ #matches = exactmatched + matched
+
+ #self.log.debug(_("Adding package(s): %r") % matches, level=9)
+
+ #map(self.install, filter(lambda x: self.pkgSack.returnNewestByName(), matches))
+
+ for pkg in grp.mandatory_packages.keys() + grp.default_packages.keys() + grp.optional_packages.keys():
+ self.log.debug(_("Attempt to add pkg %s") % (pkg), level=9)
+ try:
+ pkgs = self.pkgSack.returnNewestByName(pkg)
+ for po in pkgs:
+ self.tsInfo.addInstall(po)
+ self.log.debug(_("Package Ordering: Adding %s-%s:%s-%s.%s to transaction") % (po.name, po.epoch, po.version, po.release, po.arch), level=9)
+ except yum.Errors.PackageSackError, e:
+ pass
+
+ for condreq, cond in grp.conditional_packages.iteritems():
+ self.log.debug(_("Testing condition: %s / %s") % (condreq, cond), level=9)
+ pkgs = self.pkgSack.searchNevra(name=condreq)
+ if len(pkgs) > 1:
+ pkgs = self.bestPackagesFromList(pkgs)
+ if self.tsInfo.conditionals.has_key(cond):
+ self.tsInfo.conditionals[cond].extend(pkgs)
+ else:
+ self.tsInfo.conditionals[cond] = pkgs
if self.cfg.pkgorder_style == "yum":
self.resolveDeps()
@@ -124,13 +165,14 @@ reposdir=/dev/null
exclude=*debuginfo*
debuglevel=9
logfile=/var/log/yum.log
+installroot=%(testpath)s
cachedir=%(cachedir)s
[anaconda]
name=Anaconda
baseurl=file://%(toppath)s
enabled=1
- """ % { "toppath": self.toppath, "cachedir": self.cfg.yumobj.conf.cachedir }
+ """ % { "toppath": self.toppath, "testpath": self.testpath, "cachedir": self.cfg.yumobj.conf.cachedir }
try:
f = open(os.path.join(self.testpath,"etc","yum.conf"),"w")
commit d704fc6d78a02224c8f7535c64a76d5e9a065082
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Dec 15 00:54:45 2008 +0100
Add our log instance to splittree's timber
diff --git a/revisor/pungi.py b/revisor/pungi.py
index 4ac3808..6d3ad7b 100644
--- a/revisor/pungi.py
+++ b/revisor/pungi.py
@@ -422,6 +422,7 @@ cost=500
# Hey I get size in bytes but I want MBytes
timber = splittree.Timber()
+ timber.log = self.log
timber.arch = self.cfg.architecture
timber.disc_size = float(media_size / 1024 / 1024)
timber.target_size = float(media_size)
@@ -446,6 +447,7 @@ cost=500
we_are_ok = True
timber.createSplitDirs()
timber.splitRPMS()
+
# Now that we've split, examine the size of all disc directories
# and make sure they fit
for disc in range(1, timber.total_discs + 1):
commit 6d45a8c0359aa896dd740485fc6545fc67092e40
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Dec 15 00:53:36 2008 +0100
Make splitting the tree a little more efficient by just using the filenames
package ordering spits out anyway.
diff --git a/revisor/splittree.py b/revisor/splittree.py
index 1f4ae5a..21a797e 100755
--- a/revisor/splittree.py
+++ b/revisor/splittree.py
@@ -27,59 +27,42 @@ import time
import types
import rpm
-global _ts
-_ts = None
-
-# returns n-v-r.a from file filename
-def nvra(pkgfile):
- global _ts
- if _ts is None:
- _ts = rpm.TransactionSet()
- _ts.setVSFlags(-1)
- fd = os.open(pkgfile, os.O_RDONLY)
- h = _ts.hdrFromFdno(fd)
- os.close(fd)
- return "%s-%s-%s.%s.rpm" %(h['name'], h['version'], h['release'],
- h['arch'])
-
+# Translation
+from rhpl.translate import _
class Timber:
"""Split trees like no other"""
def __init__(self):
-
+
"""self.release_str : the name and version of the product"
-
+
self.package_order_file : the location of the file which has
the package ordering
-
+
self.arch : the arch the tree is intended for
-
+
self.real_arch : the arch found in the unified tree's
.discinfo file
-
+
self.dist_dir : the loaction of the unified tree
self.src_dir : the location of the unified SRPM dir
-
+
self.start_time : the timestamp that's in .discinfo files
-
-self.dir_info : The info other than start_time that goes
-into the .discinfo files. The info should already exist
-after running buildinstall in the unified tree
-
+
self.total_discs : total number of discs
-
+
self.total_bin_discs : total number of discs with RPMs
-
+
self.total_srpm_discs : total number of discs with SRPMs
-
+
self.reverse_sort_srpms : sort the srpms in reverse order to
fit. Usually only needed if we share a disc between SRPMs
and RPMs. Set to 1 to turn on.
self.reserve_size : Additional size needed to be reserved on the first disc.
"""
-
+
self.reserve_size = 0
self.disc_size = 640.0
self.target_size = self.disc_size * 1024.0 * 1024
@@ -92,7 +75,6 @@ self.reserve_size : Additional size needed to be reserved on the first disc.
self.dist_dir = None
self.src_dir = None
self.start_time = None
- self.dir_info = None
self.total_discs = None
self.bin_discs = None
self.src_discs = None
@@ -104,7 +86,6 @@ self.reserve_size : Additional size needed to be reserved on the first disc.
self.common_files = ['beta_eula.txt', 'EULA', 'README', 'GPL', 'RPM-GPG-KEY', 'RPM-GPG-KEY-beta', 'RPM-GPG-KEY-fedora']
self.logfile = []
-
def getSize(self, path, blocksize=None):
"""Gets the size as reported by du -sL"""
@@ -121,11 +102,9 @@ self.reserve_size : Additional size needed to be reserved on the first disc.
thesize = string.split(thesize)[0]
return thesize
-
-
def reportSizes(self, disc, firstpkg=None, lastpkg=None):
"""appends to self.logfile"""
-
+
if firstpkg:
self.logfile.append("First package on disc%d: %s" % (disc, firstpkg))
if lastpkg:
@@ -134,8 +113,6 @@ self.reserve_size : Additional size needed to be reserved on the first disc.
discsize = self.getSize("%s-disc%d" % (self.dist_dir, disc))
self.logfile.append("%s-disc%d size: %s" % (self.arch, disc, discsize))
-
-
def createDiscInfo(self, discnumber):
"""creates the .discinfo files in the split trees"""
@@ -154,9 +131,6 @@ self.reserve_size : Additional size needed to be reserved on the first disc.
# skip the disc number line from the unified tree
file.readline()
-
- # basedir, packagedir, and pixmapdir
- self.dir_info = [file.readline()[:-1], file.readline()[:-1], file.readline()[:-1]]
file.close()
@@ -165,12 +139,8 @@ self.reserve_size : Additional size needed to be reserved on the first disc.
discinfo_file.write(self.release_str + '\n')
discinfo_file.write(self.real_arch + '\n')
discinfo_file.write("%s\n" % discnumber)
- for i in range(0, len(self.dir_info)):
- discinfo_file.write(self.dir_info[i] + '\n')
discinfo_file.close()
-
-
def linkFiles(self, src_dir, dest_dir, filelist):
"""Creates hardlinks from files in the unified dir to files in the split dirs. This is not for RPMs or SRPMs"""
@@ -181,8 +151,6 @@ self.reserve_size : Additional size needed to be reserved on the first disc.
os.link(src, dest)
except OSError, (errno, msg):
pass
-
-
def createSplitDirs(self):
"""Figures out which discs are for RPMs, which are for SRPMs,
@@ -198,19 +166,18 @@ self.reserve_size : Additional size needed to be reserved on the first disc.
self.src_list = range(self.total_discs - self.src_discs + 1, self.total_discs + 1)
self.shared_list = range(self.total_discs - self.src_discs + 1, self.bin_discs + 1)
-
for i in range(self.bin_list[0], self.bin_list[-1] + 1):
if i == 1:
p = os.popen('find %s/ -type f -not -name .discinfo -not -name "*\.rpm"' % self.dist_dir, 'r')
filelist = p.read()
p.close()
filelist = string.split(filelist)
-
+
p = os.popen('find %s/ -type d -not -name SRPMS' % self.dist_dir, 'r')
dirlist = p.read()
p.close()
dirlist = string.split(dirlist)
-
+
dont_create = []
# we need to clean up the dirlist first. We don't want everything yet
for j in range(0, len(dirlist)):
@@ -220,7 +187,7 @@ self.reserve_size : Additional size needed to be reserved on the first disc.
# now create the dirs for disc1
for j in range(0, len(dirlist)):
os.makedirs("%s-disc%d/%s" % (self.dist_dir, i, dirlist[j]))
-
+
for j in range(0, len(filelist)):
filelist[j] = string.replace(filelist[j], self.dist_dir, '')
try:
@@ -233,7 +200,7 @@ self.reserve_size : Additional size needed to be reserved on the first disc.
os.makedirs("%s-disc%d/%s" % (self.dist_dir, i, self.product_path))
self.linkFiles(self.dist_dir, "%s-disc%d" %(self.dist_dir, i), self.common_files)
self.createDiscInfo(i)
-
+
if (self.src_discs != 0):
for i in range(self.src_list[0], self.src_list[-1] + 1):
os.makedirs("%s-disc%d/SRPMS" % (self.dist_dir, i))
@@ -242,48 +209,26 @@ self.reserve_size : Additional size needed to be reserved on the first disc.
self.common_files)
self.createDiscInfo(i)
-
-
def splitRPMS(self, reportSize = 1):
"""Creates links in the split dirs for the RPMs"""
-
+
packages = {}
+ orderedlist = []
- pkgdir = "%s" %(self.product_path,)
-
- rpmlist = os.listdir("%s/%s" %(self.dist_dir, pkgdir))
- rpmlist.sort()
+ pkgdir = "%s" % (self.product_path,)
- # create the packages dictionary in this format: n-v-r.a:['n-v-r.arch.rpm']
- for filename in rpmlist:
- filesize = os.path.getsize("%s/%s/%s" % (self.dist_dir, pkgdir, filename))
- try:
- pkg_nvr = nvra("%s/%s/%s" %(self.dist_dir, pkgdir, filename))
- except rpm.error, e:
- continue
-
- if packages.has_key(pkg_nvr):
- # append in case we have multiple packages with the
- # same n-v-r. Ex: the kernel has multiple n-v-r's for
- # different arches
- packages[pkg_nvr].append(filename)
- else:
- packages[pkg_nvr] = [filename]
-
- orderedlist = []
-
- # read the ordered pacakge list into orderedlist
+ # Grab the files from package_order_file and find them
file = open(self.package_order_file, 'r')
- for pkg_nvr in file.readlines():
- pkg_nvr = string.rstrip(pkg_nvr)
- if pkg_nvr[0:8] != "warning:":
- orderedlist.append(pkg_nvr)
+ for pkg in file.readlines():
+ pkg = string.rstrip(pkg)
+ if pkg[0:8] != "warning:":
+ orderedlist.append(pkg)
file.close()
# last package is the last package placed on the disc
firstpackage = ''
lastpackage = ''
-
+
# packagenum resets when we change discs. It's used to
# determine the first package in the split tree and that's
# about it
@@ -291,47 +236,57 @@ self.reserve_size : Additional size needed to be reserved on the first disc.
disc = self.bin_list[0]
- for rpm_nvr in orderedlist:
- if not packages.has_key(rpm_nvr):
+ for pkg in orderedlist:
+
+ self.log.debug(_("Checking package %s") % pkg, level=9)
+
+ # Check if the package has already been included
+ if packages.has_key(pkg):
+ self.log.debug(_("pkg %s already included, skipping") % pkg, level=9)
continue
- for file_name in packages[rpm_nvr]:
- curused = self.getSize("%s-disc%s" % (self.dist_dir, disc), blocksize=1)
- filesize = self.getSize("%s/%s/%s" % (self.dist_dir, pkgdir, file_name), blocksize=1)
- newsize = filesize + curused
-
- # compensate for the size of the comps package which has yet to be created
- if disc == 1:
- maxsize = self.target_size - self.comps_size - self.reserve_size
- else:
- maxsize = self.target_size
-
- packagenum = packagenum + 1
-
- if packagenum == 1:
- firstpackage = file_name
-
- # move to the next disc if true
- if newsize > maxsize:
- self.reportSizes(disc, firstpkg=firstpackage, lastpkg=lastpackage)
- # try it, if we are already on the last disc then complain loudly
- try:
- nextdisc=self.bin_list.index(disc+1)
- disc = self.bin_list[nextdisc]
- os.link("%s/%s/%s" % (self.dist_dir, pkgdir, file_name),
- "%s-disc%d/%s/%s" % (self.dist_dir, disc, pkgdir, file_name))
- packagenum = 1
- firstpackage = file_name
-
- except:
- # back down to the last RPM disc and complain about the overflow
- disc = disc - 1
- self.logfile.append("No more discs to put packages, overflowing on disc%d" % disc)
- continue
-
- else:
- os.link("%s/%s/%s" % (self.dist_dir, pkgdir, file_name),
- "%s-disc%d/%s/%s" % (self.dist_dir, disc, pkgdir, file_name))
- lastpackage = file_name
+
+ curused = self.getSize("%s-disc%s" % (self.dist_dir, disc), blocksize=1)
+ filesize = self.getSize("%s/%s/%s" % (self.dist_dir, pkgdir, pkg), blocksize=1)
+ newsize = filesize + curused
+
+ # compensate for the size of the comps package which has yet to be created
+ if disc == 1:
+ maxsize = self.target_size - self.comps_size - self.reserve_size
+ else:
+ maxsize = self.target_size
+
+ self.log.debug(_("Maximum size for disc #%d set to %d") % (disc, maxsize), level=9)
+
+ packagenum = packagenum + 1
+
+ if packagenum == 1:
+ firstpackage = pkg
+
+ # move to the next disc if true
+ if newsize > maxsize:
+ self.reportSizes(disc, firstpkg=firstpackage, lastpkg=lastpackage)
+ # try it, if we are already on the last disc then complain loudly
+ try:
+ nextdisc = self.bin_list.index(disc+1)
+ disc = self.bin_list[nextdisc]
+ self.log.debug(_("Including package %s on disc #%d") % (pkg, disc), level=9)
+ os.link("%s/%s/%s" % (self.dist_dir, pkgdir, pkg),
+ "%s-disc%d/%s/%s" % (self.dist_dir, disc, pkgdir, pkg))
+ packagenum = 1
+ firstpackage = pkg
+
+ except:
+ # back down to the last RPM disc and complain about the overflow
+ disc = disc - 1
+ self.logfile.append("No more discs to put packages, overflowing on disc%d" % disc)
+ continue
+
+ else:
+ self.log.debug(_("Including package %s on disc #%d") % (pkg, disc), level=9)
+
+ os.link("%s/%s/%s" % (self.dist_dir, pkgdir, pkg),
+ "%s-disc%d/%s/%s" % (self.dist_dir, disc, pkgdir, pkg))
+ lastpackage = pkg
if reportSize == 1:
if firstpackage == '':
@@ -339,8 +294,6 @@ self.reserve_size : Additional size needed to be reserved on the first disc.
self.reportSizes(disc, firstpkg=firstpackage, lastpkg=lastpackage)
-
-
def getLeastUsedTree(self):
"""Returns the least full tree to use for SRPMS"""
@@ -350,8 +303,6 @@ self.reserve_size : Additional size needed to be reserved on the first disc.
sizes.sort()
return sizes[0]
-
-
def splitSRPMS(self):
"""Puts the srpms onto the SRPM split discs. The packages are
ordered by size, and placed one by one on the disc with the
@@ -385,7 +336,7 @@ self.reserve_size : Additional size needed to be reserved on the first disc.
self.src_list.pop(self.src_list.index(disc))
os.link("%s/%s" % (self.src_dir, srpm_list[i][1]),
"%s-disc%d/SRPMS/%s" % (self.dist_dir, self.getLeastUsedTree()[1], srpm_list[i][1]))
-
+
for i in range(0, len(srpm_disc_list)):
self.reportSizes(srpm_disc_list[i])
@@ -402,17 +353,15 @@ self.reserve_size : Additional size needed to be reserved on the first disc.
self.splitSRPMS()
return self.logfile
-
-
def usage(theerror):
print theerror
print """Usage: %s --arch=i386 --total-discs=8 --bin-discs=4 --src-discs=4 --release-string="distro name" --pkgorderfile=/tmp/pkgorder.12345 --distdir=/usr/src/someunifiedtree --srcdir=/usr/src/someunifiedtree/SRPMS --productpath=product""" % sys.argv[0]
sys.exit(1)
-
+
if "__main__" == __name__:
import getopt
-
+
timber = Timber()
theargs = ["arch=", "total-discs=", "bin-discs=", 'disc-size=',
@@ -469,7 +418,7 @@ if "__main__" == __name__:
timber.src_dir = options["--srcdir"]
else:
usage("You forgot to specify --srcdir")
-
+
if options.has_key("--productpath"):
timber.product_path = options["--productpath"]
@@ -480,7 +429,7 @@ if "__main__" == __name__:
timber.disc_size = float(options["--disc-size"])
logfile = timber.main()
-
+
for logentry in range(0, len(logfile)):
print logfile[logentry]
commit 7f418ea50ecb6977f0d0b44f30f51b5e52f850cd
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Dec 15 00:51:56 2008 +0100
More verbose copying of images/ and isolinux/ and the like, so the user
knows what is going on
diff --git a/revisor/modreuseinstaller/__init__.py b/revisor/modreuseinstaller/__init__.py
index cb4892f..b5bdd49 100644
--- a/revisor/modreuseinstaller/__init__.py
+++ b/revisor/modreuseinstaller/__init__.py
@@ -70,9 +70,13 @@ class RevisorReuseinstaller:
return
target = os.path.join(self.cfg.working_directory, "revisor-pungi", self.cfg.version, self.cfg.model, self.cfg.architecture, "os")
+ self.log.debug(_("Copying %s/%s to %s/%s") % (self.cfg.reuse, "images", target, "images"), level=9)
shutil.copytree("%s/%s" % (self.cfg.reuse, "images"), "%s/%s" % (target, "images"))
+ self.log.debug(_("Copying %s/%s to %s/%s") % (self.cfg.reuse, "isolinux", target, "isolinux"), level=9)
shutil.copytree("%s/%s" % (self.cfg.reuse, "isolinux"), "%s/%s" % (target, "isolinux"))
+ self.log.debug(_("Copying %s/.discinfo to %s/.discinfo") % (self.cfg.reuse, target), level=9)
shutil.copy("%s/.discinfo" % (self.cfg.reuse), target)
if os.access("%s/.treeinfo" % (self.cfg.reuse), os.R_OK):
+ self.log.debug(_("Copying %s/.treeinfo to %s/.treeinfo") % (self.cfg.reuse, target), level=9)
shutil.copy("%s/.treeinfo" % (self.cfg.reuse), target)
commit 860d1e0e8251291948ac04a37d9f8ded3f95b6b9
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Dec 15 00:46:10 2008 +0100
Add functions to discover the current distribution / release version
and system architecture so in the future we can get the best default
model to show in the GUI.
diff --git a/revisor/misc.py b/revisor/misc.py
index a6d1862..bde8f4f 100644
--- a/revisor/misc.py
+++ b/revisor/misc.py
@@ -332,6 +332,16 @@ def return_pkg_tuple(pkg):
return (name, epoch, version, release, arch)
+def get_system_release():
+ p1 = subprocess.Popen(['rpmquery', '--qf="%{VERSION}\n"', 'fedora-release'], output=subprocess.PIPE)
+ release = p1.stdout.readline().trim()
+ return release
+
+def get_system_arch():
+ p1 = subprocess.Popen(['uname', '-p'], output=subprocess.PIPE)
+ arch = p1.stdout.readline().trim()
+ return arch
+
def size_me(val):
"""
Given a value, convert it to a humanly readible format
commit 21af1d217914eb185e04bcdb332652298dc99523
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Dec 15 00:45:39 2008 +0100
Do not increase the progress when an already resolved dep is found
diff --git a/revisor/misc.py b/revisor/misc.py
index 9a4069c..a6d1862 100644
--- a/revisor/misc.py
+++ b/revisor/misc.py
@@ -23,6 +23,7 @@ import re
import revisor
import rpmUtils.arch
import socket
+import subprocess
import sys
import urlgrabber
import urlparse
@@ -188,10 +189,8 @@ def get_package_deps(yumobj, po, pbar, logger=None, resolved_deps={}, final_pkgo
for req in reqs:
(r,f,v) = req
if resolved_deps.has_key(req):
+ # This message is here for troubleshooting purposes
#logger.debug(_("Saving you a little time, dep (%s, %s, %s) already resolved") % (r,f,v), level=9)
- if not pbar == None:
- pbar.cur_task += 1.0
- pbar.set_fraction(pbar.cur_task/pbar.num_tasks)
continue
if r.startswith('rpmlib(') or r.startswith('config('):
@@ -233,6 +232,7 @@ def get_repourls(yumobj):
this_repo = repo.baseurl[0]
else:
this_repo = repo.baseurl
+
# Check whether it is a localrepo baseurl
if this_repo.startswith('http://localrepo'):
# Check whether localrepo resolves anywhere
@@ -247,6 +247,7 @@ def get_repourls(yumobj):
if result == None:
# Go with the mirrorlist
mirror_list = True
+
if mirror_list and hasattr(repo,"mirrorlist"):
print "Using mirrorlist %s from repo %s" % (repo.mirrorlist,repo.id)
repository_mirrorlists.append(repo.mirrorlist)
commit ebaa9f3c919809ec466e75b9eacd021f56e0bc5e
Author: Piotr Drąg <piotrdrag(a)gmail.com>
Date: Sun Dec 14 23:01:15 2008 +0000
Updated Polish translation
Transmitted-via: Transifex (translate.fedoraproject.org)
diff --git a/po/Changelog b/po/Changelog
index 5f35af3..03833d9 100644
--- a/po/Changelog
+++ b/po/Changelog
@@ -1,5 +1,7 @@
Updated Polish translation
+Transmitted-via: Transifex (translate.fedoraproject.org)Updated Polish translation
+
Transmitted-via: Transifex (translate.fedoraproject.org)Updated German translation
Transmitted-via: Transifex (translate.fedoraproject.org)Updatet brazilian portuguese translation
diff --git a/po/pl.po b/po/pl.po
index a5edc56..caf27e2 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: pl\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-12 21:05+0100\n"
-"PO-Revision-Date: 2008-12-12 21:07+0100\n"
+"POT-Creation-Date: 2008-12-14 23:56+0100\n"
+"PO-Revision-Date: 2008-12-14 23:58+0100\n"
"Last-Translator: Piotr Drąg <piotrdrag(a)gmail.com>\n"
"Language-Team: Polish <pl(a)li.org>\n"
"MIME-Version: 1.0\n"
@@ -1839,7 +1839,7 @@ msgstr "Dowiązywanie informacji o wydaniu"
msgid "Copying updates.img from %s to %s"
msgstr "Kopiowanie updates.img z %s do %s"
-#: ../revisor/base.py:1518 ../revisor/pungi.py:414
+#: ../revisor/base.py:1518 ../revisor/pungi.py:417
#, python-format
msgid "copy_dir '%s' not accessible"
msgstr "Nie można uzyskać dostępu do copy_dir \"%s\""
@@ -1971,7 +1971,7 @@ msgstr ""
"\n"
"%s"
-#: ../revisor/base.py:1971 ../revisor/pungi.py:410
+#: ../revisor/base.py:1971 ../revisor/pungi.py:413
#, python-format
msgid "Copying %s to %s"
msgstr "Kopiowanie %s do %s"
@@ -2768,6 +2768,11 @@ msgstr ""
msgid "Adding group(s): %r"
msgstr "Dodawanie grup: %r"
+#: ../revisor/pkgorder.py:85
+#, python-format
+msgid "%d dependencies already resolved"
+msgstr "%d zależności zostało już rozwiązanych"
+
#: ../revisor/pkgorder.py:96
#, python-format
msgid "Adding package(s): %r"
@@ -2966,39 +2971,49 @@ msgstr "Podczas rozpakowywania plików wydania wystąpił błąd: %s"
msgid "Copying %s"
msgstr "Kopiowanie %s"
-#: ../revisor/pungi.py:389
+#: ../revisor/pungi.py:378
+#, python-format
+msgid "Copying release note file %s"
+msgstr "Kopiowanie pliku informacji o wydaniu %s"
+
+#: ../revisor/pungi.py:382
+#, python-format
+msgid "File %s not readable"
+msgstr "Plik %s jest nieczytelny"
+
+#: ../revisor/pungi.py:392
#, python-format
msgid "Could not access directory %s, cannot copy extra files onto the media."
msgstr ""
"Nie można uzyskać dostępu do folderu %s, nie można skopiować dodatkowych "
"plików na nośnik."
-#: ../revisor/pungi.py:395
+#: ../revisor/pungi.py:398
#, python-format
msgid "Could not create files/ directory: %s"
msgstr "Nie można utworzyć folderu files/: %s"
-#: ../revisor/pungi.py:406
+#: ../revisor/pungi.py:409
#, python-format
msgid "Creating %s"
msgstr "Tworzenie %s"
-#: ../revisor/pungi.py:454
+#: ../revisor/pungi.py:457
#, python-format
msgid "Disc %s #%d is oversized (%r > %r)"
msgstr "Płyta %s #%d ma za duży rozmiar (%r > %r)"
-#: ../revisor/pungi.py:458
+#: ../revisor/pungi.py:461
#, python-format
msgid "Removing tree %s"
msgstr "Usuwanie drzewa %s"
-#: ../revisor/pungi.py:466
+#: ../revisor/pungi.py:469
#, python-format
msgid "Disc %s #%d is OK in size (%r <= %r)"
msgstr "Płyta %s #%d ma prawidłowy rozmiar (%r <= %r)"
-#: ../revisor/pungi.py:517
+#: ../revisor/pungi.py:520
msgid ""
"Hacking anaconda's .discinfo because it'll shit itself if it reads it's own "
"output"
commit c4a5857e4591457a3cd15e31b546cfbb8452bd74
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Sun Dec 14 14:06:15 2008 +0100
Add a single-cd kickstart configuration file
diff --git a/unity/conf/conf.d/fedora-10-single-cd.cfg b/unity/conf/conf.d/fedora-10-single-cd.cfg
new file mode 100644
index 0000000..d609a87
--- /dev/null
+++ b/unity/conf/conf.d/fedora-10-single-cd.cfg
@@ -0,0 +1,2 @@
+%packages
+%end
commit 78b7b150ef5f215ab7441947a1a2b62ef68d9e56
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Sat Dec 13 18:25:13 2008 +0100
Move get_package_deps() to it's own function
diff --git a/revisor/misc.py b/revisor/misc.py
index 38b9834..9a4069c 100644
--- a/revisor/misc.py
+++ b/revisor/misc.py
@@ -148,50 +148,6 @@ def resolve_pkgs(yumobj, package_list, log=None):
return final_package_list
def resolve_dependencies_inclusive(yumobj, logger=None, pbar=None, resolved_deps={}, final_pkgobjs={}):
- def get_package_deps(po, logger=None):
- """Add the dependencies for a given package to the
- transaction info"""
-
- if logger == None:
- logger = revisor.logger.Logger()
-
- logger.debug(_("Checking dependencies for %s.%s") % (po.name, po.arch), level=8)
-
- if not pbar == None:
- pbar.cur_task += 1.0
-
- reqs = po.requires
- provs = po.provides
-
- for req in reqs:
- if resolved_deps.has_key(req):
- if not pbar == None:
- pbar.cur_task += 1.0
- pbar.set_fraction(pbar.cur_task/pbar.num_tasks)
- continue
-
- (r,f,v) = req
- if r.startswith('rpmlib(') or r.startswith('config('):
- if not pbar == None:
- pbar.cur_task += 1.0
- pbar.set_fraction(pbar.cur_task/pbar.num_tasks)
- continue
-
- deps = yumobj.whatProvides(r, f, v).returnPackages()
-
- if not deps:
- if not pbar == None:
- pbar.cur_task += 1.0
- logger.warning(_("Unresolvable dependency %s %s %s in %s.%s") % (r, f, v, po.name, po.arch))
- continue
-
- depsack = yum.packageSack.ListPackageSack(deps)
-
- for dep in depsack.returnNewestByNameArch():
- yumobj.tsInfo.addInstall(dep)
- logger.debug(_("Added %s-%s:%s-%s.%s for %s-%s:%s-%s.%s (requiring %s %s %s)") % (dep.name, dep.epoch, dep.version, dep.release, dep.arch, po.name, po.epoch, po.version, po.release, po.arch, r, f, v), level=9)
- resolved_deps[(r, f, v)] = None
-
if logger == None:
logger = revisor.logger.Logger()
@@ -208,12 +164,59 @@ def resolve_dependencies_inclusive(yumobj, logger=None, pbar=None, resolved_deps
for txmbr in yumobj.tsInfo.getMembers():
if not final_pkgobjs.has_key(txmbr.po):
final_pkgobjs[txmbr.po] = None
- get_package_deps(txmbr.po, logger)
+ (resolved_deps, final_pkgobjs) = get_package_deps(yumobj, txmbr.po, pbar, logger=logger, resolved_deps=resolved_deps, final_pkgobjs=final_pkgobjs)
moretoprocess = True
return (resolved_deps, final_pkgobjs)
#yumobj.tsInfo.makelists()
+def get_package_deps(yumobj, po, pbar, logger=None, resolved_deps={}, final_pkgobjs={}):
+ """Add the dependencies for a given package to the
+ transaction info"""
+
+ if logger == None:
+ logger = revisor.logger.Logger()
+
+ logger.debug(_("Checking dependencies for %s.%s") % (po.name, po.arch), level=8)
+
+ if not pbar == None:
+ pbar.cur_task += 1.0
+
+ reqs = po.requires
+ provs = po.provides
+
+ for req in reqs:
+ (r,f,v) = req
+ if resolved_deps.has_key(req):
+ #logger.debug(_("Saving you a little time, dep (%s, %s, %s) already resolved") % (r,f,v), level=9)
+ if not pbar == None:
+ pbar.cur_task += 1.0
+ pbar.set_fraction(pbar.cur_task/pbar.num_tasks)
+ continue
+
+ if r.startswith('rpmlib(') or r.startswith('config('):
+ if not pbar == None:
+ pbar.cur_task += 1.0
+ pbar.set_fraction(pbar.cur_task/pbar.num_tasks)
+ continue
+
+ deps = yumobj.whatProvides(r, f, v).returnPackages()
+
+ if not deps:
+ if not pbar == None:
+ pbar.cur_task += 1.0
+ logger.warning(_("Unresolvable dependency %s %s %s in %s.%s") % (r, f, v, po.name, po.arch))
+ continue
+
+ depsack = yum.packageSack.ListPackageSack(deps)
+
+ for dep in depsack.returnNewestByNameArch():
+ yumobj.tsInfo.addInstall(dep)
+ logger.debug(_("Added %s-%s:%s-%s.%s for %s-%s:%s-%s.%s (requiring %s %s %s)") % (dep.name, dep.epoch, dep.version, dep.release, dep.arch, po.name, po.epoch, po.version, po.release, po.arch, r, f, v), level=9)
+ resolved_deps[(r, f, v)] = None
+
+ return (resolved_deps, final_pkgobjs)
+
def get_repourls(yumobj):
"""
From a yum object, extract the repository URLs for repositories
commit fda61a7035ba22b5ff371ce955edde3d73dfebef
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Sat Dec 13 18:24:47 2008 +0100
Set the default package ordering style to "" instead of 0
diff --git a/revisor/cfg.py b/revisor/cfg.py
index 328074c..663d7c9 100644
--- a/revisor/cfg.py
+++ b/revisor/cfg.py
@@ -1041,7 +1041,7 @@ class Defaults:
self.everything_spin = False
self.pkgorder_file = ""
- self.pkgorder_style = None
+ self.pkgorder_style = ""
# Use fedora-release by default
self.release_pkgs = "^fedora-release.*$"
commit 3dfd30057e6391a9c8983441f274f336442c535e
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Sat Dec 13 18:24:31 2008 +0100
Remove the old group adding in packageordering
diff --git a/revisor/base.py b/revisor/base.py
index 027fed8..ae1802a 100644
--- a/revisor/base.py
+++ b/revisor/base.py
@@ -97,8 +97,8 @@ class RevisorBase:
self.cfg.setup_yum()
self.cfg.setup_ks()
- def run(self):
- """Split into either running CLI, Server, Hub or GUI"""
+ def run(self):
+ """Split into either running CLI, Server, Hub or GUI"""
if self.cfg.cli_mode:
self.log.debug(_("Running Revisor in CLI mode..."), level=1)
import revisor.cli
@@ -1643,6 +1643,8 @@ class RevisorBase:
ds.addGroups(["core", "base"])
+ ds.addGroups(["base-x"])
+
for group in self.cfg.yumobj.comps.groups:
if hasattr(group,"default"):
if group.default:
@@ -1657,34 +1659,6 @@ class RevisorBase:
else:
groups_nondefault.append(group.groupid)
- # Now that the default groups have been added, add some of the obvious groups
- ds.addGroups(["base-x", "fonts", "gnome-desktop"])
-
- ds.addGroups(["dial-up", "graphical-internet", "editors", "sound-and-video", "printing",
- "hardware-support", "admin-tools", "java", "legacy-fonts"])
-
- ds.addGroups(["graphics", "office", "games"])
-
- ds.addGroups(["development-libs", "development-tools", "gnome-software-development", "x-software-development"])
-
- ds.addGroups(["web-server"])
-
- ds.addGroups(["graphics", "authoring-and-publishing"])
-
- ds.addGroups([ "ftp-server", "sql-server",
- "mysql", "server-cfg", "dns-server",
- "smb-server"])
-
- ds.addGroups(["kde-desktop", "development-tools", "development-libs",
- "gnome-software-development", "eclipse",
- "x-software-development",
- "java-development", "kde-software-development",
- "mail-server", "network-server", "legacy-network-server"])
-
- ds.addGroups(["news-server", "legacy-software-development",
- "engineering-and-scientific"])
-
-
for group in groups_nondefault:
self.log.debug(_("Appending non-default group %s") % group, level=7)
ds.addGroups([group])
commit 12a4f67a6fd373efbe4a02ae51fa28b166e94f81
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Sat Dec 13 18:24:12 2008 +0100
More indentation fixes
diff --git a/revisor/modhub/__init__.py b/revisor/modhub/__init__.py
index c18a75e..db55a7a 100644
--- a/revisor/modhub/__init__.py
+++ b/revisor/modhub/__init__.py
@@ -64,16 +64,13 @@ class RevisorHub():
help = _("Start the Hub mode and fork."),
metavar = "[boolean]")
- #def check_options(self, cfg, cli_options):
+ def check_options(self, cfg, cli_options):
# Cheater! Found a cheater!
- #print cli_options.server_mode
- #if cli_options.server_mode:
- #cfg.server_mode = False
- #cfg.hub_mode = True
- #cfg.gui_mode = False
- #cfg.cli_mode = False
- #print "blaat"
- #pass
+ if cli_options.hub_mode:
+ cfg.server_mode = False
+ cfg.hub_mode = True
+ cfg.gui_mode = False
+ cfg.cli_mode = False
def set_defaults(self, defaults):
#defaults.db_server = x.x.x.x
@@ -107,13 +104,11 @@ class Session(object):
def __init__(self, id):
self.id = id
print "Hub session initted"
- self.revisor = HubMode()
-
- def set_status(self, id, status):
- if id == self.id:
- self.revisor.set_status(id, status)
- pass
+ self.revisor = HubMode()
+ def set_status(self, id, status):
+ if id == self.id:
+ self.revisor.set_status(id, status)
class RevisorXMLRPCServer(SimpleXMLRPCServer.SimpleXMLRPCServer):
""" The actual XML-RPC Server object"""
@@ -123,22 +118,22 @@ class RevisorXMLRPCServer(SimpleXMLRPCServer.SimpleXMLRPCServer):
class HubMode():
- def __init__(self):
- pass
+ def __init__(self):
+ pass
- def set_status(self, id, status):
- print id
- print status
- pass
+ def set_status(self, id, status):
+ print id
+ print status
+ pass
- def db_get_ks():
- pass
+ def db_get_ks():
+ pass
- def check_jobs():
- #check jobs in DB
- #get KS from DB if any found
- pass
+ def check_jobs():
+ #check jobs in DB
+ #get KS from DB if any found
+ pass
- def add_composer():
- #function to add composer for distribution idea
- pass
+ def add_composer():
+ #function to add composer for distribution idea
+ pass
commit 8bc9343fc8556836bca9c2588904c2b34093bc02
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Sat Dec 13 16:19:43 2008 +0100
Make that message go away
diff --git a/revisor/modhub/__init__.py b/revisor/modhub/__init__.py
index 24abc51..c18a75e 100644
--- a/revisor/modhub/__init__.py
+++ b/revisor/modhub/__init__.py
@@ -15,8 +15,7 @@ class RevisorHub():
""" Hub Mode """
def __init__(self):
- # blaat
- print "HELLO HUB!!!!!!!"
+ pass
def do_xmlrpc(self, cfg):
""" Get our xmlrpc hub running. """
@@ -109,7 +108,7 @@ class Session(object):
self.id = id
print "Hub session initted"
self.revisor = HubMode()
-
+
def set_status(self, id, status):
if id == self.id:
self.revisor.set_status(id, status)
@@ -121,7 +120,7 @@ class RevisorXMLRPCServer(SimpleXMLRPCServer.SimpleXMLRPCServer):
def __init__(self, args):
self.allow_reuse_address = True
SimpleXMLRPCServer.SimpleXMLRPCServer.__init__(self, args)
-
+
class HubMode():
def __init__(self):
@@ -131,15 +130,15 @@ class HubMode():
print id
print status
pass
-
+
def db_get_ks():
pass
-
+
def check_jobs():
#check jobs in DB
#get KS from DB if any found
pass
-
+
def add_composer():
#function to add composer for distribution idea
pass
commit 240e74f70998c341c779ef237fceed942cf458ce
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Sat Dec 13 02:28:36 2008 +0100
Add everything spin kickstart file
diff --git a/unity/conf/conf.d/fedora-10-everything.cfg b/unity/conf/conf.d/fedora-10-everything.cfg
new file mode 100644
index 0000000..92bb857
--- /dev/null
+++ b/unity/conf/conf.d/fedora-10-everything.cfg
@@ -0,0 +1,3 @@
+%packages
+*
+%end
commit 36f6ea365fbe429eeb05149c6b78c6d3efc5e97b
Merge: d4e81ee... 97250a7...
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Sat Dec 13 02:24:10 2008 +0100
Merge branch 'master' of ssh://git.fedorahosted.org/git/revisor
commit d4e81ee89dfcbd11c82964e52bab90f826b19dbe
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Sat Dec 13 02:23:14 2008 +0100
Test for images/boot.iso which is available in all versions
diff --git a/revisor/modreuseinstaller/__init__.py b/revisor/modreuseinstaller/__init__.py
index 61462d7..cb4892f 100644
--- a/revisor/modreuseinstaller/__init__.py
+++ b/revisor/modreuseinstaller/__init__.py
@@ -56,7 +56,7 @@ class RevisorReuseinstaller:
if not cli_options.reuse == "":
self.cfg.reuse = cli_options.reuse
# FIXME: This only does local trees right now
- for file in [ "isolinux/isolinux.cfg", "isolinux/isolinux.bin", "isolinux/vmlinuz", "isolinux/initrd.img", "images/minstg2.img", "images/boot.iso" ]:
+ for file in [ "isolinux/isolinux.cfg", "isolinux/isolinux.bin", "isolinux/vmlinuz", "isolinux/initrd.img", "images/boot.iso", "images/boot.iso" ]:
if not os.access("%s/%s" % (cli_options.reuse,file), os.R_OK):
self.cfg.reuse = False
self.log.error(_("Could not access %s/%s, required for reusing a previous tree. Cancelling the reuse of installer images") % (cli_options.reuse,file), recoverable=True)
commit 60b10b55b648854c597306749931ef07bca4998e
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Sat Dec 13 02:22:31 2008 +0100
Slightly less verbose, please
diff --git a/revisor/pkgorder.py b/revisor/pkgorder.py
index 92c3186..9e6f819 100644
--- a/revisor/pkgorder.py
+++ b/revisor/pkgorder.py
@@ -82,7 +82,7 @@ class PackageOrderer(yum.YumBase):
if self.cfg.pkgorder_style == "yum":
self.resolveDeps()
else:
- print "%r" % self.resolved_deps
+ self.log.debug(_("%d dependencies already resolved") % len(self.resolved_deps.keys()), level=9)
(self.resolved_deps, self.final_pkgobjs) = revisor.misc.resolve_dependencies_inclusive(self.cfg.yumobj, self.cfg.log, resolved_deps=self.resolved_deps, final_pkgobjs=self.final_pkgobjs)
self.processTransaction()
commit 90a673ed54093522148137c9b2c9447a5bbb27b6
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Sat Dec 13 02:21:54 2008 +0100
Test if the file is readable before attempting to copy it
diff --git a/revisor/pungi.py b/revisor/pungi.py
index 6528ba1..4ac3808 100644
--- a/revisor/pungi.py
+++ b/revisor/pungi.py
@@ -375,8 +375,11 @@ cost=500
for filename in filelist:
for pattern in self.cfg.release_files.split():
if re.match(pattern,filename) and not os.path.exists(os.path.join(self.topdir, filename)):
- self.log.debug("Copying release note file %s" % filename)
- shutil.copy(os.path.join(dirpath, filename), os.path.join(self.topdir, filename))
+ self.log.debug(_("Copying release note file %s") % filename)
+ if os.access(os.path.join(dirpath, filename), os.R_OK):
+ shutil.copy(os.path.join(dirpath, filename), os.path.join(self.topdir, filename))
+ else:
+ self.log.debug(_("File %s not readable") % os.path.join(dirpath, filename), level=2)
self.common_files.append(filename)
self.log.debug(str(self.common_files))
commit 97250a7bdf1ae01cbb035bc5f21a75d613928a81
Author: Piotr Drąg <piotrdrag(a)gmail.com>
Date: Fri Dec 12 20:08:36 2008 +0000
Updated Polish translation
Transmitted-via: Transifex (translate.fedoraproject.org)
diff --git a/po/Changelog b/po/Changelog
index 65fb1ca..5f35af3 100644
--- a/po/Changelog
+++ b/po/Changelog
@@ -1,4 +1,6 @@
-Updated German translation
+Updated Polish translation
+
+Transmitted-via: Transifex (translate.fedoraproject.org)Updated German translation
Transmitted-via: Transifex (translate.fedoraproject.org)Updatet brazilian portuguese translation
diff --git a/po/pl.po b/po/pl.po
index 02e4b8c..a5edc56 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: pl\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 03:39+0100\n"
-"PO-Revision-Date: 2008-12-01 03:43+0100\n"
+"POT-Creation-Date: 2008-12-12 21:05+0100\n"
+"PO-Revision-Date: 2008-12-12 21:07+0100\n"
"Last-Translator: Piotr Drąg <piotrdrag(a)gmail.com>\n"
"Language-Team: Polish <pl(a)li.org>\n"
"MIME-Version: 1.0\n"
@@ -1233,45 +1233,49 @@ msgstr "Witaj w Revisorze, programie od Fedora Unity"
msgid "Cannot find anaconda-runtime in /usr/lib/anaconda-runtime"
msgstr "Nie można znaleźć anaconda-runtime w /usr/lib/anaconda-runtime"
-#: ../revisor/base.py:104
+#: ../revisor/base.py:103
msgid "Running Revisor in CLI mode..."
msgstr "Uruchamianie Revisora w trybie CLI..."
-#: ../revisor/base.py:110
+#: ../revisor/base.py:112
+msgid "Running Revisor in Hub mode..."
+msgstr "Uruchamianie Revisora w trybie huba..."
+
+#: ../revisor/base.py:117
msgid "Running Revisor in RPC Server mode..."
msgstr "Uruchamianie Revisora w trybie serwera RPC..."
-#: ../revisor/base.py:114 ../revisor/base.py:119
+#: ../revisor/base.py:121 ../revisor/base.py:127
msgid "Running Revisor in GUI mode..."
msgstr "Uruchamianie Revisora w trybie GUI..."
-#: ../revisor/base.py:174
+#: ../revisor/base.py:182
#, python-format
msgid "Opening up /usr/bin/htmlview %s%s"
msgstr "Otwieranie /usr/bin/htmlview %s%s"
#. self.mode.base_buttons_xml.get_widget("button_information").set_sensitive(True)
-#: ../revisor/base.py:178
+#: ../revisor/base.py:186
#, python-format
msgid "Cannot fork process showing help, please use %s%s"
msgstr "Nie można rozdzielić procesu wyświetlania pomocy, użyj %s%s"
-#: ../revisor/base.py:180
+#: ../revisor/base.py:188
#, python-format
msgid "Cannot show Help in CLI mode, use %s%s"
msgstr "Nie można wyświetlić pomocy w trybie CLI, użyj %s%s"
-#: ../revisor/base.py:188
+#: ../revisor/base.py:196
msgid "Loading Repositories"
msgstr "Wczytywanie repozytoriów"
-#: ../revisor/base.py:190
+#: ../revisor/base.py:198
#, python-format
msgid "Getting configuration from %s"
msgstr "Pobieranie konfiguracji z %s"
-#: ../revisor/base.py:197 ../revisor/base.py:258 ../revisor/base.py:265
-#: ../revisor/base.py:275 ../revisor/base.py:285 ../revisor/cfg.py:473
+#: ../revisor/base.py:205 ../revisor/base.py:266 ../revisor/base.py:273
+#: ../revisor/base.py:283 ../revisor/base.py:293 ../revisor/cfg.py:473
#: ../revisor/cfg.py:484 ../revisor/cfg.py:497 ../revisor/pkgorder.py:178
#: ../revisor/pkgorder.py:183 ../revisor/pkgorder.py:194
#: ../revisor/pkgorder.py:197 ../revisor/pkgorder.py:206
@@ -1280,7 +1284,7 @@ msgstr "Pobieranie konfiguracji z %s"
msgid "Using deprecated YUM function: %s()"
msgstr "Używanie przestarzałej funkcji yuma: %s()"
-#: ../revisor/base.py:199
+#: ../revisor/base.py:207
#, python-format
msgid ""
"yum.YumBase.doConfigSetup failed, probably an invalid configuration file %s"
@@ -1288,33 +1292,33 @@ msgstr ""
"yum.YumBase.doConfigSetup nie powiodło się, prawdopodobnie plik konfiguracji "
"%s jest nieprawidłowy"
-#: ../revisor/base.py:202
+#: ../revisor/base.py:210
#, python-format
msgid "Bumping YUMs debuglevel (%d) to our debuglevel (%d)"
msgstr "Podnoszenie poziomu raportowania błędów yuma (%d) na nasz poziom (%d)"
-#: ../revisor/base.py:204
+#: ../revisor/base.py:212
#, python-format
msgid "YUMs debuglevel now %d"
msgstr "Poziom raportowania błędów yuma wynosi teraz %d"
-#: ../revisor/base.py:239
+#: ../revisor/base.py:247
msgid "Another application is running which is accessing software information."
msgstr "Inna uruchomiona aplikacja ma dostęp do informacji o oprogramowaniu."
-#: ../revisor/base.py:244
+#: ../revisor/base.py:252
msgid "Fatal Error: Unable to retrieve software information.\n"
msgstr "Fatalny błąd: nie można pobierać informacji o oprogramowaniu.\n"
-#: ../revisor/base.py:254
+#: ../revisor/base.py:262
msgid "Setting up a Transaction Set"
msgstr "Ustawianie zestawu transakcji"
-#: ../revisor/base.py:261
+#: ../revisor/base.py:269
msgid "Getting myself a piece of the RPMDB"
msgstr "Pobieranie fragmentu RPMDB"
-#: ../revisor/base.py:268
+#: ../revisor/base.py:276
msgid ""
"Apparently we're running on an Enterprise Linux system (we can tell from the "
"way yum sets up the RPM Database)"
@@ -1322,38 +1326,38 @@ msgstr ""
"Działamy na systemie Enterprise Linux (możemy tak wywnioskować ze sposobu, w "
"jaki yum ustawia bazę danych RPM)"
-#: ../revisor/base.py:271
+#: ../revisor/base.py:279
msgid "Getting Repository Information"
msgstr "Pobieranie informacji o repozytoriach"
-#: ../revisor/base.py:278
+#: ../revisor/base.py:286
#, python-format
msgid "Arch list = %s"
msgstr "Lista architektur = %s"
-#: ../revisor/base.py:280
+#: ../revisor/base.py:288
msgid "Getting the Package Sacks"
msgstr "Pobieranie zestawów pakietów"
-#: ../revisor/base.py:290
+#: ../revisor/base.py:298
#, python-format
msgid "All OK so far, %d packages in the Package Sack"
msgstr "Jak na razie wszystko w porządku, %d pakietów w zestawie"
-#: ../revisor/base.py:303
+#: ../revisor/base.py:311
msgid ""
"Building a nice package list from ksdata, and adding it to the transaction"
msgstr "Budowanie ładnej listy pakietów z ksdata i dodawanie jej do transakcji"
-#: ../revisor/base.py:308
+#: ../revisor/base.py:316
msgid "Kickstart mode: respin"
msgstr "Tryb kickstart: ponowne komponowanie"
-#: ../revisor/base.py:311
+#: ../revisor/base.py:319
msgid "Kickstart mode: normal"
msgstr "Tryb kickstart: normalny"
-#: ../revisor/base.py:319
+#: ../revisor/base.py:327
#, python-format
msgid ""
"What we're getting from pykickstart is: %d groups, %d packages and %d "
@@ -1362,120 +1366,120 @@ msgstr ""
"Od pykickstart pobrano: %d grup, %d pakietów i %d wyłączonych pakietów. %d "
"pakietów zostało całkowicie zignorowanych."
-#: ../revisor/base.py:329 ../revisor/base.py:625
+#: ../revisor/base.py:337 ../revisor/base.py:633
msgid "Select kickstart packages"
msgstr "Wybierz pakiety kickstart"
-#: ../revisor/base.py:337
+#: ../revisor/base.py:345
#, python-format
msgid "Using pkgsack excludes, the list of packages to exclude is now: %r"
msgstr ""
"Używanie wykluczania pkgsack, lista pakietów do wykluczenia to teraz: %r"
-#: ../revisor/base.py:354 ../revisor/base.py:653
+#: ../revisor/base.py:362 ../revisor/base.py:661
msgid "Appending group @core"
msgstr "Dołączanie grupy @core"
-#: ../revisor/base.py:369 ../revisor/base.py:668
+#: ../revisor/base.py:377 ../revisor/base.py:676
msgid "Appending group @base"
msgstr "Dołączanie grupy @base"
-#: ../revisor/base.py:388 ../revisor/base.py:679
+#: ../revisor/base.py:396 ../revisor/base.py:687
#, python-format
msgid "Found group: %s"
msgstr "Znaleziono grupę: %s"
-#: ../revisor/base.py:394
+#: ../revisor/base.py:402
#, python-format
msgid "Repository metadata cannot be found: %s: %s"
msgstr "Nie można znaleźć metadanych repozytorium: %s: %s"
-#: ../revisor/base.py:397
+#: ../revisor/base.py:405
#, python-format
msgid "Group not found: %s"
msgstr "Nie znaleziono grupy: %s"
-#: ../revisor/base.py:409
+#: ../revisor/base.py:417
#, python-format
msgid "Selecting required packages for group %s"
msgstr "Wybieranie wymaganych pakietów dla grupy %s"
-#: ../revisor/base.py:413 ../revisor/base.py:434 ../revisor/base.py:455
-#: ../revisor/base.py:474
+#: ../revisor/base.py:421 ../revisor/base.py:442 ../revisor/base.py:463
+#: ../revisor/base.py:482
#, python-format
msgid "Including %s"
msgstr "Dołączanie %s"
-#: ../revisor/base.py:423
+#: ../revisor/base.py:431
#, python-format
msgid "From Groups (required): Adding %s-%s:%s-%s.%s to transaction"
msgstr "Z grup (wymagane): dodawanie %s-%s:%s-%s.%s do transakcji"
-#: ../revisor/base.py:430
+#: ../revisor/base.py:438
#, python-format
msgid "Selecting default packages for group %s"
msgstr "Wybieranie domyślnych pakietów dla grupy %s"
-#: ../revisor/base.py:443
+#: ../revisor/base.py:451
#, python-format
msgid "From Groups (default): Adding %s-%s:%s-%s.%s to transaction"
msgstr "Z grup (domyślne): dodawanie %s-%s:%s-%s.%s do transakcji"
-#: ../revisor/base.py:450
+#: ../revisor/base.py:458
#, python-format
msgid "Selecting optional packages for group %s"
msgstr "Wybieranie opcjonalnych pakietów dla grupy %s"
-#: ../revisor/base.py:464 ../revisor/base.py:483
+#: ../revisor/base.py:472 ../revisor/base.py:491
#, python-format
msgid "From Groups (optional): Adding %s-%s:%s-%s.%s to transaction"
msgstr "Z grup (opcjonalne): dodawanie %s-%s:%s-%s.%s do transakcji"
-#: ../revisor/base.py:470
+#: ../revisor/base.py:478
#, python-format
msgid "No include parameter for group %s, using defaults"
msgstr "Brak parametru dołączania dla grupy %s, używanie domyślnych"
-#: ../revisor/base.py:492 ../revisor/base.py:696
+#: ../revisor/base.py:500 ../revisor/base.py:704
#, python-format
msgid "Testing condition: %s / %s"
msgstr "Testowanie warunków: %s/%s"
-#: ../revisor/base.py:506
+#: ../revisor/base.py:514
#, python-format
msgid "From package list, including: %s"
msgstr "Z listy pakietów, dołączanie: %s"
-#: ../revisor/base.py:509
+#: ../revisor/base.py:517
#, python-format
msgid "Package %s is in excludeList, continuing"
msgstr "Pakiet %s znajduje się na liście wyłączonych, kontynuowanie"
-#: ../revisor/base.py:517
+#: ../revisor/base.py:525
msgid "No packages found!"
msgstr "Nie znaleziono pakietów!"
-#: ../revisor/base.py:522 ../revisor/base.py:551
+#: ../revisor/base.py:530 ../revisor/base.py:559
#, python-format
msgid "From Packages: Adding %s-%s:%s-%s.%s to transaction"
msgstr "Z pakietów: dodawanie %s-%s:%s-%s.%s do transakcji"
-#: ../revisor/base.py:529
+#: ../revisor/base.py:537
#, python-format
msgid "Could not find package '%s', searching..."
msgstr "Nie można znaleźć pakietu \"%s\", wyszukiwanie..."
-#: ../revisor/base.py:542
+#: ../revisor/base.py:550
#, python-format
msgid "Found packages matching '%s': %s"
msgstr "Znaleziono pakiety pasujące do \"%s\": %s"
-#: ../revisor/base.py:553
+#: ../revisor/base.py:561
#, python-format
msgid "From Packages: Not adding %s now because it is in the ignore list"
msgstr "Z pakietów: nie dodano teraz %s, ponieważ jest na liście ignorowanych"
-#: ../revisor/base.py:564
+#: ../revisor/base.py:572
#, python-format
msgid ""
"More then one package found for %s-%s-%s.%s - going to add them all to the "
@@ -1484,22 +1488,22 @@ msgstr ""
"Znaleziono więcej niż jeden pakiet dla %s-%s-%s.%s - wszystkie zostaną "
"dodane do transakcji"
-#: ../revisor/base.py:566
+#: ../revisor/base.py:574
#, python-format
msgid "Could not find package %s-%s-%s.%s"
msgstr "Nie można znaleźć pakietu %s-%s-%s.%s"
-#: ../revisor/base.py:569
+#: ../revisor/base.py:577
#, python-format
msgid "From Packages (exact string %s-%s-%s.%s), selecting %s-%s-%s.%s"
msgstr "Z pakietów: (dokładny łańcuch %s-%s-%s.%s), wybieranie %s-%s-%s.%s"
-#: ../revisor/base.py:589 ../revisor/base.py:744
+#: ../revisor/base.py:597 ../revisor/base.py:752
#, python-format
msgid "From Excludes: Removing %s-%s:%s-%s.%s from transaction"
msgstr "Z wykluczonych: usuwanie %s-%s:%s-%s.%s z transakcji"
-#: ../revisor/base.py:592 ../revisor/base.py:747
+#: ../revisor/base.py:600 ../revisor/base.py:755
#, python-format
msgid ""
"Apparently trying to exclude a package that is not available in the "
@@ -1508,7 +1512,7 @@ msgstr ""
"Próbujesz wykluczyć pakiet, który nie jest dostępny we wczytanych "
"repozytoriach lub nie został dodany do transakcji: %s"
-#: ../revisor/base.py:598
+#: ../revisor/base.py:606
#, python-format
msgid ""
"\n"
@@ -1528,11 +1532,11 @@ msgstr ""
"Można kontynuować z tymi małymi błędami, ale wynik może zdecydowanie różnić "
"się od oczekiwanego."
-#: ../revisor/base.py:604
+#: ../revisor/base.py:612
msgid "This is what was selected to be installed:"
msgstr "Wybrane do zainstalowania:"
-#: ../revisor/base.py:617
+#: ../revisor/base.py:625
#, python-format
msgid ""
"What we're getting from pykickstart is: %d groups, %d packages and %d "
@@ -1540,54 +1544,54 @@ msgid ""
msgstr ""
"Od pykickstart pobrano: %d grup, %d pakietów i %d wyłączonych pakietów."
-#: ../revisor/base.py:636
+#: ../revisor/base.py:644
#, python-format
msgid "Using pkgsack excludes, excluded packages is now: %r"
msgstr "Używanie wykluczania pkgsack, wykluczone pakiety to teraz: %r"
-#: ../revisor/base.py:676
+#: ../revisor/base.py:684
#, python-format
msgid "No such group %s"
msgstr "Brak grupy %s"
-#: ../revisor/base.py:733
+#: ../revisor/base.py:741
#, python-format
msgid "Adding %s-%s:%s-%s.%s"
msgstr "Dodawanie %s-%s:%s-%s.%s"
-#: ../revisor/base.py:765
+#: ../revisor/base.py:773
msgid "Initting progress bar for "
msgstr "Rozpoczynanie paska postępu dla "
-#: ../revisor/base.py:772
+#: ../revisor/base.py:780
msgid "Apparently we have not yet entered the Build Media stage"
msgstr "Najwyraźniej nie przeszliśmy jeszcze do etapu budowania nośnika"
-#: ../revisor/base.py:801 ../revisor/misc.py:156
+#: ../revisor/base.py:809 ../revisor/misc.py:158
#, python-format
msgid "Checking dependencies for %s.%s"
msgstr "Sprawdzanie zależności %s.%s"
#. pbar.cur_task += 1.0
-#: ../revisor/base.py:823 ../revisor/misc.py:183
+#: ../revisor/base.py:831 ../revisor/misc.py:185
#, python-format
msgid "Unresolvable dependency %s %s %s in %s.%s"
msgstr "Nie można rozwiązać zależności %s %s %s w %s.%s"
-#: ../revisor/base.py:830 ../revisor/misc.py:190
+#: ../revisor/base.py:838 ../revisor/misc.py:192
#, python-format
msgid "Added %s-%s:%s-%s.%s for %s-%s:%s-%s.%s (requiring %s %s %s)"
msgstr "Dodano %s-%s:%s-%s.%s dla %s-%s:%s-%s.%s (wymaga %s %s %s)"
-#: ../revisor/base.py:833 ../revisor/misc.py:196
+#: ../revisor/base.py:841 ../revisor/misc.py:198
msgid "Checking dependencies - allowing conflicts within the package set"
msgstr "Sprawdzanie zależności - pozwalanie na konflikty w zestawie pakietów"
-#: ../revisor/base.py:834 ../revisor/base.py:863
+#: ../revisor/base.py:842 ../revisor/base.py:871
msgid "Resolving Dependencies"
msgstr "Rozwiązywanie zależności"
-#: ../revisor/base.py:856
+#: ../revisor/base.py:864
#, python-format
msgid ""
"The following packages were excluded using the kickstart package manifest, "
@@ -1598,13 +1602,13 @@ msgstr ""
"kickstart, ale zostały dołączone, aby rozwiązać zależności:\n"
" - %s"
-#: ../revisor/base.py:862
+#: ../revisor/base.py:870
msgid ""
"Checking dependencies - not allowing any conflicts within the package set"
msgstr ""
"Sprawdzanie zależności - nie pozwalanie na konflikty w zestawie pakietów"
-#: ../revisor/base.py:890
+#: ../revisor/base.py:898
#, python-format
msgid ""
"Unable to resolve dependencies for some packages selected:\n"
@@ -1616,16 +1620,16 @@ msgstr ""
"%s"
#. End of dependency resolving
-#: ../revisor/base.py:894 ../revisor/image.py:97
+#: ../revisor/base.py:902 ../revisor/image.py:97
msgid "Unable to build transaction"
msgstr "Nie można zbudować transakcji"
-#: ../revisor/base.py:899 ../revisor/image.py:102
+#: ../revisor/base.py:907 ../revisor/image.py:102
#, python-format
msgid "Succesfully built transaction: ret %s, msg %s"
msgstr "Pomyślnie zbudowano transakcję: ret %s, komunikat %s"
-#: ../revisor/base.py:905
+#: ../revisor/base.py:913
#, python-format
msgid ""
"Errors where encountered while downloading package headers:\n"
@@ -1636,7 +1640,7 @@ msgstr ""
"\n"
"%s"
-#: ../revisor/base.py:914
+#: ../revisor/base.py:922
msgid ""
"The package set after dependency resolving does not match the packages "
"selected in the kickstart manifest"
@@ -1644,203 +1648,203 @@ msgstr ""
"Zestaw pakietów po rozwiązaniu zależności nie zgadza się z pakietami "
"wybranymi w manifeście kickstart"
-#: ../revisor/base.py:941
+#: ../revisor/base.py:949
#, python-format
msgid "No such repository: %s"
msgstr "Brak repozytorium: %s"
-#: ../revisor/base.py:943
+#: ../revisor/base.py:951
#, python-format
msgid "Enabling %s repository"
msgstr "Włączanie repozytorium %s"
-#: ../revisor/base.py:962
+#: ../revisor/base.py:970
#, python-format
msgid "Disabling %s repository"
msgstr "Wyłączanie repozytorium %s"
-#: ../revisor/base.py:969
+#: ../revisor/base.py:977
msgid "Creating a list of SRPMs"
msgstr "Tworzenie listy źródłowych pakietów RPM"
-#: ../revisor/base.py:984
+#: ../revisor/base.py:992
msgid "Source RPM PO already in the list"
msgstr "PO źródłowego pakietu RPM jest już na liście"
-#: ../revisor/base.py:986
+#: ../revisor/base.py:994
#, python-format
msgid "Source RPM found in non-source repository %s"
msgstr "Źródłowy pakiet RPM znaleziono w repozytorium nieźródłowym %s"
-#: ../revisor/base.py:988
+#: ../revisor/base.py:996
#, python-format
msgid "Error: Cannot find a source rpm for %s"
msgstr "Błąd: nie można znaleźć źródłowego RPM-a dla %s"
-#: ../revisor/base.py:990 ../revisor/modgui/build_media.py:106
+#: ../revisor/base.py:998 ../revisor/modgui/build_media.py:106
#: ../revisor/modgui/build_media.py:142 ../revisor/modgui/build_media.py:219
msgid "Downloading Source Packages"
msgstr "Pobieranie pakietów źródłowych"
-#: ../revisor/base.py:1019 ../revisor/progress.py:441
+#: ../revisor/base.py:1027 ../revisor/progress.py:441
#, python-format
msgid "Downloading %s"
msgstr "Pobieranie %s"
-#: ../revisor/base.py:1049 ../revisor/modgui/build_media.py:101
+#: ../revisor/base.py:1057 ../revisor/modgui/build_media.py:101
#: ../revisor/modgui/build_media.py:214
msgid "Downloading Packages"
msgstr "Pobieranie pakietów"
-#: ../revisor/base.py:1058
+#: ../revisor/base.py:1066
msgid "Unable to find a suitable mirror."
msgstr "Nie można znaleźć odpowiedniego serwera lustrzanego."
-#: ../revisor/base.py:1070
+#: ../revisor/base.py:1078
#, python-format
msgid "Errors were encountered while downloading packages: %s"
msgstr "Podczas pobierania pakietów pakietów wystąpiły błędy: %s"
-#: ../revisor/base.py:1111
+#: ../revisor/base.py:1119
#, python-format
msgid "Overriding auto package selection with user package selection for %s..."
msgstr ""
"Zastępowanie automatycznego wyboru pakietów pakietami wybranymi przez "
"użytkownika dla %s..."
-#: ../revisor/base.py:1124
+#: ../revisor/base.py:1132
#, python-format
msgid "Adding required package %s-%s:%s-%s.%s"
msgstr "Dodawanie wymaganego pakietu %s-%s:%s-%s.%s"
#. This list has already been resolved
-#: ../revisor/base.py:1127
+#: ../revisor/base.py:1135
#, python-format
msgid "%s. This is a required package."
msgstr "%s. Ten pakiet jest wymagany."
-#: ../revisor/base.py:1139
+#: ../revisor/base.py:1147
#, python-format
msgid "Adding suggested package %s-%s:%s-%s.%s"
msgstr "Dodawanie sugerowanego pakietu %s-%s:%s-%s.%s"
-#: ../revisor/base.py:1149
+#: ../revisor/base.py:1157
#, python-format
msgid "Packages that do not need to be on the media: %s"
msgstr "Pakiety, które nie muszą być na nośniku: %s"
-#: ../revisor/base.py:1174 ../revisor/base.py:1200
+#: ../revisor/base.py:1182 ../revisor/base.py:1208
msgid "Did not succeed in adding in all required packages"
msgstr "Dodanie wszystkich wymaganych pakietów nie powiodło się"
-#: ../revisor/base.py:1208
+#: ../revisor/base.py:1216
msgid "Populating statistics"
msgstr "Tworzenie statystyk"
-#: ../revisor/base.py:1224
+#: ../revisor/base.py:1232
#, python-format
msgid "Package %s-%s:%s-%s.%s does not seem to have a archivesize header"
msgstr ""
"Wydaje się, że pakiet %s-%s:%s-%s.%s nie posiada nagłówka rozmiaru archiwum"
-#: ../revisor/base.py:1232
+#: ../revisor/base.py:1240
#, python-format
msgid "Package %s-%s:%s-%s.%s does not seem to have a installedsize header"
msgstr ""
"Wydaje się, że pakiet %s-%s:%s-%s.%s nie posiada nagłówka rozmiaru po "
"zainstalowaniu"
-#: ../revisor/base.py:1240
+#: ../revisor/base.py:1248
#, python-format
msgid "Package %s-%s:%s-%s.%s does not seem to have a packagesize header"
msgstr ""
"Wydaje się, że pakiet %s-%s:%s-%s.%s nie posiada nagłówka rozmiaru pakietu"
-#: ../revisor/base.py:1250
+#: ../revisor/base.py:1258
#, python-format
msgid "Total size of all packages (archivesize): %s %s"
msgstr "Całkowity rozmiar wszystkich pakietów (rozmiar archiwum): %s %s"
-#: ../revisor/base.py:1251
+#: ../revisor/base.py:1259
#, python-format
msgid "Total size of all packages, (installedsize): %s %s"
msgstr ""
"Całkowity rozmiar wszystkich pakietów (rozmiar po zainstalowaniu): %s %s"
-#: ../revisor/base.py:1252
+#: ../revisor/base.py:1260
#, python-format
msgid "Total size of all packages, (packagesize): %s %s"
msgstr "Całkowity rozmiar wszystkich pakietów (rozmiar pakietu): %s %s"
-#: ../revisor/base.py:1287
+#: ../revisor/base.py:1295
#, python-format
msgid "Report of the %d most space consuming packages"
msgstr "Zgłoś %d pakietów zajmujących najwięcej miejsca"
-#: ../revisor/base.py:1382 ../revisor/base.py:1396 ../revisor/base.py:2017
+#: ../revisor/base.py:1390 ../revisor/base.py:1404 ../revisor/base.py:2025
#, python-format
msgid "Creating pkgdir: %s"
msgstr "Tworzenie pkgdir: %s"
#. Now for each txmbr in
#. Link the localPkg() result into the build tree
-#: ../revisor/base.py:1405
+#: ../revisor/base.py:1413
msgid "Linking in packages"
msgstr "Dowiązywanie pakietów"
-#: ../revisor/base.py:1424 ../revisor/base.py:2041
+#: ../revisor/base.py:1432 ../revisor/base.py:2049
#, python-format
msgid "Package hard link failed: %s: %s"
msgstr "Twarde dowiązanie pakietów nie powiodło się: %s: %s"
-#: ../revisor/base.py:1429 ../revisor/base.py:2046
+#: ../revisor/base.py:1437 ../revisor/base.py:2054
#, python-format
msgid "Copying: %s to %s"
msgstr "Kopiowanie: %s do %s"
-#: ../revisor/base.py:1432 ../revisor/base.py:2049
+#: ../revisor/base.py:1440 ../revisor/base.py:2057
#, python-format
msgid "Symlinking: %s to %s"
msgstr "Dowiązywanie symboliczne: %s do %s"
-#: ../revisor/base.py:1435 ../revisor/base.py:2052
+#: ../revisor/base.py:1443 ../revisor/base.py:2060
msgid "Package symlink succeeded"
msgstr "Dowiązanie symboliczne pakietów powiodło się"
-#: ../revisor/base.py:1437 ../revisor/base.py:1444 ../revisor/base.py:2054
-#: ../revisor/base.py:2061
+#: ../revisor/base.py:1445 ../revisor/base.py:1452 ../revisor/base.py:2062
+#: ../revisor/base.py:2069
#, python-format
msgid "Package link failed, trying copy: %s: %s"
msgstr "Dowiązanie pakietów nie powiodło się, próbowanie skopiowania: %s: %s"
-#: ../revisor/base.py:1454
+#: ../revisor/base.py:1462
msgid "Creating Repository Information"
msgstr "Tworzenie informacji o repozytoriach"
#. FIXME: Optionally recompose installer images
-#: ../revisor/base.py:1469
+#: ../revisor/base.py:1477
msgid "Building Installation Images"
msgstr "Budowanie obrazów instalacyjnych"
-#: ../revisor/base.py:1475
+#: ../revisor/base.py:1483
msgid "Using already existing installer images"
msgstr "Używanie już istniejących obrazów instalatora"
-#: ../revisor/base.py:1489
+#: ../revisor/base.py:1497
msgid "Linking in release notes"
msgstr "Dowiązywanie informacji o wydaniu"
-#: ../revisor/base.py:1501
+#: ../revisor/base.py:1509
#, python-format
msgid "Copying updates.img from %s to %s"
msgstr "Kopiowanie updates.img z %s do %s"
-#: ../revisor/base.py:1510 ../revisor/pungi.py:414
+#: ../revisor/base.py:1518 ../revisor/pungi.py:414
#, python-format
msgid "copy_dir '%s' not accessible"
msgstr "Nie można uzyskać dostępu do copy_dir \"%s\""
-#: ../revisor/base.py:1521
+#: ../revisor/base.py:1529
#, python-format
msgid "Size of the installation tree is %s MB"
msgstr "Rozmiar drzewa instalacyjnego wynosi %s MB"
@@ -1849,103 +1853,103 @@ msgstr "Rozmiar drzewa instalacyjnego wynosi %s MB"
#. That makes our lives difficult, hihi
#. So, make sure that if we're on el_linux, the repository gets
#. bind mounted and configured appropriately
-#: ../revisor/base.py:1571
+#: ../revisor/base.py:1579
msgid "Running pkgorder"
msgstr "Wykonywanie pkgorder"
-#: ../revisor/base.py:1634
+#: ../revisor/base.py:1642
msgid "Appending group core and base"
msgstr "Dołączanie grup core i base"
-#: ../revisor/base.py:1641
+#: ../revisor/base.py:1649
#, python-format
msgid "Appending default group %s"
msgstr "Dołączanie domyślnej grupy %s"
-#: ../revisor/base.py:1681
+#: ../revisor/base.py:1689
#, python-format
msgid "Appending non-default group %s"
msgstr "Dołączanie nie domyślnej grupy %s"
-#: ../revisor/base.py:1687
+#: ../revisor/base.py:1695
#, python-format
msgid "Appending non-default support group %s"
msgstr "Dołączanie nie domyślnych grup obsługi %s"
-#: ../revisor/base.py:1754
+#: ../revisor/base.py:1762
#, python-format
msgid "Not running package ordering, using file %s instead"
msgstr ""
"Porządkowanie kolejności pakietów nie zostanie wykonane, używanie zamiast "
"tego pliku %s"
-#: ../revisor/base.py:1756
+#: ../revisor/base.py:1764
msgid "Not running package ordering"
msgstr "Porządkowanie kolejności pakietów nie zostanie wykonane"
-#: ../revisor/base.py:1788
+#: ../revisor/base.py:1796
msgid "^Install using kickstart"
msgstr "^Zainstaluj używając kickstart"
#. Split Tree
-#: ../revisor/base.py:1811
+#: ../revisor/base.py:1819
#, python-format
msgid "Splitting Build Tree (%s)"
msgstr "Rozdzielanie drzewa budowania (%s)"
#. Split repo
-#: ../revisor/base.py:1817
+#: ../revisor/base.py:1825
#, python-format
msgid "Splitting Repository (%s)"
msgstr "Rozdzielanie repozytorium (%s)"
-#: ../revisor/base.py:1831 ../revisor/modgui/build_media.py:244
+#: ../revisor/base.py:1839 ../revisor/modgui/build_media.py:244
#, python-format
msgid "Creating %s ISO Image #%d"
msgstr "Tworzenie %s obrazu ISO #%d"
-#: ../revisor/base.py:1836 ../revisor/modgui/build_media.py:248
+#: ../revisor/base.py:1844 ../revisor/modgui/build_media.py:248
#, python-format
msgid "Creating %s ISO Image"
msgstr "Tworzenie %s obrazu ISO"
#. For all images but source images; implant the md5 into the ISO for the media check
#. FIXME: Well, it seems we don't deal with source images here.
-#: ../revisor/base.py:1850
+#: ../revisor/base.py:1858
msgid "Implanting MD5 into ISO Images"
msgstr "Wprowadzanie MD5 do obrazów ISO"
#. mediatype = built_image["mediatype"]
#. if not mediatype == 'source':
-#: ../revisor/base.py:1858
+#: ../revisor/base.py:1866
#, python-format
msgid "Implanting md5 into ISO Image: %s"
msgstr "Wprowadzanie MD5 do obrazu ISO: %s"
-#: ../revisor/base.py:1864
+#: ../revisor/base.py:1872
msgid "Cannot implant ISO md5sum"
msgstr "Nie można wprowadzić md5sum ISO"
#. Do some SHA1SUMMONING
-#: ../revisor/base.py:1872
+#: ../revisor/base.py:1880
msgid "Creating SHA1SUMs for Images"
msgstr "Tworzenie plików SHA1SUM dla obrazów"
-#: ../revisor/base.py:1888
+#: ../revisor/base.py:1896
msgid "Creating Rescue ISO Image"
msgstr "Tworzenie ratunkowego obrazu ISO"
-#: ../revisor/base.py:1948
+#: ../revisor/base.py:1956
#, python-format
msgid "Copying %s to %s (%d files)"
msgstr "Kopiowanie %s do %s (%d plików)"
-#: ../revisor/base.py:1952
+#: ../revisor/base.py:1960
#, python-format
msgid "Moving %s to %s (%d files)"
msgstr "Przenoszenie %s do %s (%d plików)"
-#: ../revisor/base.py:1955
+#: ../revisor/base.py:1963
#, python-format
msgid ""
"Moving of the source tree failed (trying copy):\n"
@@ -1956,7 +1960,7 @@ msgstr ""
"\n"
"%s"
-#: ../revisor/base.py:1958
+#: ../revisor/base.py:1966
#, python-format
msgid ""
"Copying of the source tree failed:\n"
@@ -1967,12 +1971,12 @@ msgstr ""
"\n"
"%s"
-#: ../revisor/base.py:1963 ../revisor/pungi.py:410
+#: ../revisor/base.py:1971 ../revisor/pungi.py:410
#, python-format
msgid "Copying %s to %s"
msgstr "Kopiowanie %s do %s"
-#: ../revisor/base.py:1967
+#: ../revisor/base.py:1975
#, python-format
msgid ""
"Copying of the installation tree failed:\n"
@@ -1983,41 +1987,41 @@ msgstr ""
"\n"
"%s"
-#: ../revisor/base.py:1973
+#: ../revisor/base.py:1981
msgid "Creating ext3 filesystem"
msgstr "Tworzenie systemu plików ext3"
-#: ../revisor/base.py:1980
+#: ../revisor/base.py:1988
msgid "Configuring System"
msgstr "Konfigurowanie systemu"
#. Now for each txmbr in
#. Link the localPkg() result into the build tree
-#: ../revisor/base.py:2026
+#: ../revisor/base.py:2034
msgid "Linking in Source packages"
msgstr "Dowiązywanie pakietów źródłowych"
-#: ../revisor/base.py:2081
+#: ../revisor/base.py:2089
#, python-format
msgid "Setting rundir to %s"
msgstr "Ustawianie rundir na %s"
-#: ../revisor/base.py:2087
+#: ../revisor/base.py:2095
#, python-format
msgid "Directory %s could not be created. Aborting"
msgstr "Nie można utworzyć folderu %s. Przerywanie"
-#: ../revisor/base.py:2089
+#: ../revisor/base.py:2097
#, python-format
msgid "Running command: %s"
msgstr "Wykonywanie polecenia: %s"
-#: ../revisor/base.py:2090
+#: ../revisor/base.py:2098
#, python-format
msgid "Extra information: %s %s %s"
msgstr "Dodatkowe informacje: %s %s %s"
-#: ../revisor/base.py:2118
+#: ../revisor/base.py:2126
#, python-format
msgid "Got an error from %s (return code %s)"
msgstr "Otrzymano błąd z %s (kod zwrotny %s)"
@@ -2367,11 +2371,11 @@ msgstr "wybieranie self.packages_list[%r][%r][%r][%r]"
msgid "returning pkg_list: %r"
msgstr "zwracanie pkg_list: %r"
-#: ../revisor/cfg.py:1087
+#: ../revisor/cfg.py:1088
msgid "Run from image"
msgstr "Uruchom z obrazu"
-#: ../revisor/cfg.py:1088
+#: ../revisor/cfg.py:1089
msgid "Run from RAM - requires 1 GB+"
msgstr "Uruchom z pamięci RAM - wymaga 1 GB+"
@@ -2698,11 +2702,11 @@ msgstr "Ustaw preferowane jądro: normal, PAE, xen lub debug."
msgid " %s - No Description"
msgstr "%s - brak opisu"
-#: ../revisor/__init__.py.in:442
+#: ../revisor/__init__.py.in:448
msgid "Interrupted by user"
msgstr "Przerwano przez użytkownika"
-#: ../revisor/__init__.py.in:449
+#: ../revisor/__init__.py.in:454
msgid ""
"Traceback occurred, please report a bug at http://fedorahosted.org/revisor"
msgstr "Wystąpił błąd, proszę zgłosić błąd na http://fedorahosted.org/revisor"
@@ -2723,12 +2727,12 @@ msgstr "Czy chcesz kontynuować? [Y/n]"
msgid "Abort! Abort! Abort!"
msgstr "Przerwij!"
-#: ../revisor/misc.py:36
+#: ../revisor/misc.py:38
msgid "This tool has to run with root privileges. Aborting"
msgstr "To narzędzie musi być uruchamiane z uprawnieniami roota. Przerywanie"
#. SELinux in enforcing mode
-#: ../revisor/misc.py:47
+#: ../revisor/misc.py:49
msgid ""
"SELinux is in enforcing mode on this host. Composing media will fail. Please "
"set SELinux to permissive mode."
@@ -2736,7 +2740,7 @@ msgstr ""
"SElinux jest ustawiony w trybie wymuszania na tym komputerze. Skomponowanie "
"nośnika nie powiedzie się. Ustaw SELinuksa na tryb zezwalania."
-#: ../revisor/misc.py:52
+#: ../revisor/misc.py:54
msgid ""
"SELinux on this host is disabled. Composed media will not have SELinux, and "
"as a result the system you install from the composed media will not have "
@@ -2746,12 +2750,12 @@ msgstr ""
"posiadały SELinuksa, a w rezultacie system zainstalowany z tego nośnika "
"również nie będzie posiadał SELinuksa."
-#: ../revisor/misc.py:134 ../revisor/misc.py:141
+#: ../revisor/misc.py:136 ../revisor/misc.py:143
#, python-format
msgid "Resolved %s"
msgstr "Rozwiązano %s"
-#: ../revisor/misc.py:144
+#: ../revisor/misc.py:146
#, python-format
msgid ""
"Looking to resolve package %s to a Provides, but we still can't find it."
@@ -2780,73 +2784,73 @@ msgstr ""
msgid "-> package %s"
msgstr "-> pakiet %s"
-#: ../revisor/plugins.py:57 ../revisor/plugins.py:74
+#: ../revisor/plugins.py:58 ../revisor/plugins.py:75
#, python-format
msgid "Plugin %s failed to load (%s: %s)"
msgstr "Wczytanie wtyczki %s nie powiodło się (%s: %s)"
-#: ../revisor/plugins.py:68
+#: ../revisor/plugins.py:69
#, python-format
msgid "ImportError for plugin %s: %s"
msgstr "Błąd importowania wtyczki %s: %s"
-#: ../revisor/plugins.py:71
+#: ../revisor/plugins.py:72
#, python-format
msgid "RuntimeError for plugin %s: %s"
msgstr "Błąd wykonywania wtyczki %s: %s"
-#: ../revisor/plugins.py:91 ../revisor/plugins.py:93
+#: ../revisor/plugins.py:92 ../revisor/plugins.py:94
#, python-format
msgid "Cannot set defaults for plugin %s: %s"
msgstr "Nie można ustawić domyślnych dla wtyczki %s: %s"
-#: ../revisor/plugins.py:95
+#: ../revisor/plugins.py:96
#, python-format
msgid "Cannot set defaults for plugin %s: Unknown Error"
msgstr "Nie można ustawić domyślnych dla wtyczki %s: nieznany błąd"
-#: ../revisor/plugins.py:98
+#: ../revisor/plugins.py:99
#, python-format
msgid "Not setting defaults for plugin %s: No function 'set_defaults()'"
msgstr ""
"Domyślne nie zostaną ustawione dla wtyczki %s: brak funkcji \"set_defaults()"
"\""
-#: ../revisor/plugins.py:115
+#: ../revisor/plugins.py:116
#, python-format
msgid "Cannot set runtime for plugin %s: %s"
msgstr "Nie można ustawić środowiska wykonawczego dla wtyczki %s: %s"
-#: ../revisor/plugins.py:117
+#: ../revisor/plugins.py:118
#, python-format
msgid "Not setting runtime for plugin %s: No function 'set_runtime()'"
msgstr ""
"Środowisko wykonawcze nie zostanie ustawione dla wtyczki %s: brak funkcji "
"\"set_runtime()\""
-#: ../revisor/plugins.py:134
+#: ../revisor/plugins.py:135
#, python-format
msgid "Cannot add options for plugin %s: %s"
msgstr "Nie można dodać opcji dla wtyczki %s: %s"
-#: ../revisor/plugins.py:136
+#: ../revisor/plugins.py:137
#, python-format
msgid "Not adding options for plugin %s: No function 'add_options()'"
msgstr ""
"Opcje nie zostaną ustawione dla wtyczki %s: brak funkcji \"add_options()\""
-#: ../revisor/plugins.py:154
+#: ../revisor/plugins.py:155
#, python-format
msgid "Cannot check options for plugin %s: %s"
msgstr "Nie można sprawdzić opcji dla wtyczki %s: %s"
-#: ../revisor/plugins.py:156
+#: ../revisor/plugins.py:157
#, python-format
msgid "Not checking options for plugin %s: No function 'check_options()'"
msgstr ""
"Opcje nie zostaną sprawdzone dla wtyczki %s: brak funkcji \"check_options()\""
-#: ../revisor/plugins.py:192
+#: ../revisor/plugins.py:193
#, python-format
msgid "Cannot execute hook %s for plugin %s: %s"
msgstr "Nie można wykonać haka %s dla wtyczki %s: %s"
commit 67ea9d1bfe91a5cf73258f0118c6c7b8fefb206e
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Fri Dec 12 16:42:28 2008 +0100
Fix typo
diff --git a/revisor/base.py b/revisor/base.py
index 6c7e0fb..027fed8 100644
--- a/revisor/base.py
+++ b/revisor/base.py
@@ -104,7 +104,7 @@ class RevisorBase:
import revisor.cli
self.cli = revisor.cli.RevisorCLI(self)
self.cli.run()
- elif hasattr(self.cfg,"server_mode") or hasattr(self.cfg."hub_mode"):
+ elif hasattr(self.cfg,"server_mode") or hasattr(self.cfg,"hub_mode"):
# Check hub_mode,
# Then check server_mode,
# If we have both attributes, but none is set, fall back to GUI mode
commit edd62d1a25034a16d1b91652f734ac15ee6c3c40
Merge: 3a4b3d1... 2698976...
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Fri Dec 12 16:41:51 2008 +0100
Merge branch 'master' of ssh://git.fedorahosted.org/git/revisor
commit 2698976be397f7733403873beb87ab80e784349a
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Fri Dec 12 16:41:27 2008 +0100
Pass on the resolved_deps and final_pkg_objs
diff --git a/revisor/pkgorder.py b/revisor/pkgorder.py
index 05611de..92c3186 100644
--- a/revisor/pkgorder.py
+++ b/revisor/pkgorder.py
@@ -83,7 +83,7 @@ class PackageOrderer(yum.YumBase):
self.resolveDeps()
else:
print "%r" % self.resolved_deps
- (self.resolved_deps, self.final_pkgobjs) = revisor.misc.resolve_dependencies_inclusive(self.cfg.yumobj, self.cfg.log)
+ (self.resolved_deps, self.final_pkgobjs) = revisor.misc.resolve_dependencies_inclusive(self.cfg.yumobj, self.cfg.log, resolved_deps=self.resolved_deps, final_pkgobjs=self.final_pkgobjs)
self.processTransaction()
commit 3620539408a58623d2c4bca609ed67e4dde2392c
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Fri Dec 12 16:30:16 2008 +0100
Use the renamed resolve_dependencies_inclusive function
diff --git a/revisor/pkgorder.py b/revisor/pkgorder.py
index da3d5b9..05611de 100644
--- a/revisor/pkgorder.py
+++ b/revisor/pkgorder.py
@@ -83,7 +83,7 @@ class PackageOrderer(yum.YumBase):
self.resolveDeps()
else:
print "%r" % self.resolved_deps
- (self.resolved_deps, self.final_pkgobjs) = revisor.misc.resolve_dependencies_ugly(self.cfg.yumobj, self.cfg.log)
+ (self.resolved_deps, self.final_pkgobjs) = revisor.misc.resolve_dependencies_inclusive(self.cfg.yumobj, self.cfg.log)
self.processTransaction()
@@ -100,7 +100,7 @@ class PackageOrderer(yum.YumBase):
if self.cfg.pkgorder_style == "yum":
self.resolveDeps()
else:
- (self.resolved_deps, self.final_pkgobjs) = revisor.misc.resolve_dependencies_ugly(self.cfg.yumobj, self.cfg.log, resolved_deps=self.resolved_deps, final_pkgobjs=self.final_pkgobjs)
+ (self.resolved_deps, self.final_pkgobjs) = revisor.misc.resolve_dependencies_inclusive(self.cfg.yumobj, self.cfg.log, resolved_deps=self.resolved_deps, final_pkgobjs=self.final_pkgobjs)
self.processTransaction()
diff --git a/scripts/find-default-groups.py b/scripts/find-default-groups.py
index 941b79b..f478dc0 100755
--- a/scripts/find-default-groups.py
+++ b/scripts/find-default-groups.py
@@ -87,7 +87,7 @@ class Yum(yum.YumBase):
if self.cli_options.depsolve_exclusive:
self.resolveDeps()
else:
- (self.resolved_deps,self.final_pkgobjs) = revisor.misc.resolve_dependencies_ugly(self, resolved_deps=self.resolved_deps, final_pkgobjs=self.final_pkgobjs)
+ (self.resolved_deps,self.final_pkgobjs) = revisor.misc.resolve_dependencies_inclusive(self, resolved_deps=self.resolved_deps, final_pkgobjs=self.final_pkgobjs)
def size_me(val):
ret_val = float(val)
diff --git a/scripts/repoclosure.py b/scripts/repoclosure.py
index 33d6933..9e6afee 100644
--- a/scripts/repoclosure.py
+++ b/scripts/repoclosure.py
@@ -45,13 +45,13 @@ class Yum(yum.YumBase):
self.tsInfo.addInstall(po)
except yum.Errors.PackageSackError, e:
pass
-
+
def resolve_dependencies(self):
return
#if self.cli_options.depsolve_exclusive:
#self.resolveDeps()
#else:
- #(self.resolved_deps,self.final_pkgobjs) = revisor.misc.resolve_dependencies_ugly(self, resolved_deps=self.resolved_deps, final_pkgobjs=self.final_pkgobjs)
+ #(self.resolved_deps,self.final_pkgobjs) = revisor.misc.resolve_dependencies_inclusive(self, resolved_deps=self.resolved_deps, final_pkgobjs=self.final_pkgobjs)
def exec_transaction(self, callback=None):
if not callback:
commit b2e4e62cc7857f3ac32931d89d3b5247d3766d60
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Fri Dec 12 16:29:35 2008 +0100
Use the new revisor.misc.return_pkg_tuple() function
Use the renamed resolve_dependencies_inclusive function
diff --git a/revisor/base.py b/revisor/base.py
index 2c11ddb..6c7e0fb 100644
--- a/revisor/base.py
+++ b/revisor/base.py
@@ -96,7 +96,7 @@ class RevisorBase:
self.cfg.setup_yum()
self.cfg.setup_ks()
-
+
def run(self):
"""Split into either running CLI, Server, Hub or GUI"""
if self.cfg.cli_mode:
@@ -564,43 +564,10 @@ class RevisorBase:
if self.cfg.ksobj._get("packages","handleMissing") != kickstart.constants.KS_MISSING_IGNORE:
warnings.append(e.value)
# Here's where we try and see if this is a rpm -qa list
- elif re.match('.*-.*-.*\..*', pkg):
- # This format can have two forms:
- # name-ver-release.arch
- # name-ver-release
-
- # The first thing we need to get is the name and ver.
- # This is relatively easy
- (name, ver, relarch) = pkg.rsplit('-', 2)
-
- # For the latter part however (release.arch or release)...
- try:
- # Try splitting rel.disttag.arch
- (rel, dist, arch) = relarch.rsplit('.', 2)
- except ValueError:
- # Failed... :/
- # So, is this rel.arch? or rel.disttag?
-
- # Let's try and split on .
- # If it errors, we only have the release
- # If it's OK, we either have rel, arch, or rel, disttag
-
- try:
- (foo, bar) = relarch.split('.', 2)
- # Now that we've split, see if bar is an arch or a disttag
- if rpmUtils.arch.arches.has_key(bar):
- arch = bar
- else:
- arch = None
- # If we didn't find a valid architecture, then
- # bar is part of the release (e.g. disttag)
- rel = "%s.%s" % (foo, bar)
-
- except ValueError:
- # Apparently our string only holds the release
- rel = relarch
+ elif re.match('.*-.*-.*', pkg):
+ (name, epoch, ver, rel, arch) = revisor.misc.return_pkg_tuple(pkg)
- pkgs = self.cfg.yumobj.pkgSack.searchNevra(name=name, ver=ver, rel=rel, arch=arch)
+ pkgs = self.cfg.yumobj.pkgSack.searchNevra(name=name, epoch=epoch, ver=ver, rel=rel, arch=arch)
if len(pkgs) > 1:
warnings.append(_("More then one package found for %s-%s-%s.%s - going to add them all to the transaction") % (name,ver,rel,arch))
elif len(pkgs) < 1:
@@ -878,7 +845,7 @@ class RevisorBase:
# Hook in modrebrand to replace fedora-logos
self.cfg.plugins.exec_hook("pre_resolve_dependencies")
- revisor.misc.resolve_dependencies_ugly(self.cfg.yumobj, logger=self.log, pbar=pbar)
+ revisor.misc.resolve_dependencies_inclusive(self.cfg.yumobj, logger=self.log, pbar=pbar)
# Hook in modrebrand to replace fedora-logos
self.cfg.plugins.exec_hook("post_resolve_dependencies")
commit 481acf340bd9a341c3ea91fce8715fa7f5b5149c
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Fri Dec 12 16:28:28 2008 +0100
Rename resolve_dependencies_ugly to resolve_dependencies_inclusive
Add return_pkg_tuple which parses a string and returns a (n, e, v, r, a) tuple
diff --git a/revisor/misc.py b/revisor/misc.py
index f2b7045..38b9834 100644
--- a/revisor/misc.py
+++ b/revisor/misc.py
@@ -19,7 +19,9 @@
import logging
import os
+import re
import revisor
+import rpmUtils.arch
import socket
import sys
import urlgrabber
@@ -145,7 +147,7 @@ def resolve_pkgs(yumobj, package_list, log=None):
return final_package_list
-def resolve_dependencies_ugly(yumobj, logger=None, pbar=None, resolved_deps={}, final_pkgobjs={}):
+def resolve_dependencies_inclusive(yumobj, logger=None, pbar=None, resolved_deps={}, final_pkgobjs={}):
def get_package_deps(po, logger=None):
"""Add the dependencies for a given package to the
transaction info"""
@@ -213,6 +215,12 @@ def resolve_dependencies_ugly(yumobj, logger=None, pbar=None, resolved_deps={},
#yumobj.tsInfo.makelists()
def get_repourls(yumobj):
+ """
+ From a yum object, extract the repository URLs for repositories
+ that are enabled.
+
+ Returns a tuple of lists, baseurls and mirrorlists
+ """
repository_baseurls = []
repository_mirrorlists = []
for repo in yumobj.repos.listEnabled():
@@ -244,7 +252,87 @@ def get_repourls(yumobj):
return (repository_baseurls,repository_mirrorlists)
+def return_pkg_tuple(pkg):
+ """
+ Given a package name (string), resolve the following forms to a package tuple:
+ - name-version-release.disttag.arch
+ - name-version-release.disttag
+ - name-version-release.arch
+ - name-version-release
+
+ Returns a (name, epoch, version, release, arch) tuple
+ """
+
+ name = None
+ epoch = None
+ version = None
+ release = None
+ arch = None
+
+ # We only accept strings
+ if not isinstance(pkg, str):
+ return
+
+ print "Input: %s" % pkg
+
+ # First of all, the package must match the following regexp:
+ # FIXME: Tweak this regexp
+ if re.match('.*-.*-.*', pkg):
+
+ # The first thing we need to get is the name and ver.
+ # This is relatively easy
+ (name, version, reldistarch) = pkg.rsplit('-', 2)
+
+ # version can still hold the epoch, as can name
+ try:
+ (epoch, version) = version.split(':', 1)
+ except ValueError:
+ try:
+ (epoch, name) = name.split(':', 1)
+ except ValueError:
+ epoch = None
+
+
+ # Now, for the reldistarch part,
+ try:
+ # Try splitting rel.disttag.arch
+ (rel, dist, arch) = reldistarch.rsplit('.', 2)
+ if rpmUtils.arch.arches.has_key(arch) or arch == "noarch":
+ # We have a winner!
+ release = "%s.%s" % (rel, dist)
+ else:
+ # Apparently there's a dot in the release :/
+ release = reldistarch
+ arch = None
+
+ except ValueError:
+ # Failed, so..., is this rel.arch? or rel.disttag?
+ # Let's try and split on .
+ # If it errors, we only have the release
+ # If it's OK, we either have rel, arch, or rel, disttag
+
+ try:
+ (foo, bar) = reldistarch.rsplit('.', 2)
+ # Now that we've split, see if bar is an arch or a disttag
+ if rpmUtils.arch.arches.has_key(bar) or arch == "noarch":
+ arch = bar
+ else:
+ arch = None
+ # If we didn't find a valid architecture, then
+ # bar is part of the release (e.g. disttag)
+ release = "%s.%s" % (foo, bar)
+
+ except ValueError:
+ # Apparently our string only holds the release
+ release = reldistarch
+
+ return (name, epoch, version, release, arch)
+
def size_me(val):
+ """
+ Given a value, convert it to a humanly readible format
+ Returns a tuple of (quantity, unit), e.g. (0, "KB")
+ """
ret_val = int(val)
units = [ "B", "kB", "MB", "GB", "TB" ]
while ret_val > 1024:
commit af900dff2640b595948c4c9d7d365a0edd99c047
Merge: c5cfa1d... e708908...
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Fri Dec 12 15:47:26 2008 +0100
Merge branch 'master' of ssh://git.fedorahosted.org/git/revisor
Conflicts:
revisor/base.py
revisor/modhub/__init__.py
diff --cc revisor/base.py
index 34adcbd,e797c9b..2c11ddb
--- a/revisor/base.py
+++ b/revisor/base.py
@@@ -96,24 -96,27 +96,24 @@@ class RevisorBase
self.cfg.setup_yum()
self.cfg.setup_ks()
-
- def run(self):
- """Split into either running CLI, Server or GUI"""
+
+ def run(self):
+ """Split into either running CLI, Server, Hub or GUI"""
if self.cfg.cli_mode:
- import revisor.cli
self.log.debug(_("Running Revisor in CLI mode..."), level=1)
+ import revisor.cli
self.cli = revisor.cli.RevisorCLI(self)
self.cli.run()
- #not optimal yet
- # TODO: remove redundant code
- elif hasattr(self.cfg,"hub_mode"):
+ elif hasattr(self.cfg,"server_mode") or hasattr(self.cfg."hub_mode"):
+ # Check hub_mode,
+ # Then check server_mode,
+ # If we have both attributes, but none is set, fall back to GUI mode
if self.cfg.hub_mode:
self.log.debug(_("Running Revisor in Hub mode..."), level=1)
- self.server = self.plugins.modhub
- self.server.run(base=self)
- elif self.cfg.gui_mode:
- self.log.debug(_("Running Revisor in GUI mode..."), level=1)
- self.gui = self.plugins.modgui
- self.gui.run(base=self)
- elif hasattr(self.cfg,"server_mode"):
- if self.cfg.server_mode:
+ self.hub = self.plugins.modhub
+ self.cfg.gui_mode = False #hack!
+ self.hub.run(base=self)
+ elif self.cfg.server_mode:
self.log.debug(_("Running Revisor in RPC Server mode..."), level=1)
self.server = self.plugins.modserver
self.server.run(base=self)
diff --cc revisor/modhub/__init__.py
index 85d8937,7b20883..24abc51
--- a/revisor/modhub/__init__.py
+++ b/revisor/modhub/__init__.py
@@@ -90,17 -89,24 +90,19 @@@ class RevisorHub()
class RevisorXMLRPCInterface(object):
""" Functionality to expose to the XML-RPC interface. """
- def __init__(self, cfg):
- try:
- if cfg:
- self.cfg = cfg
- else:
- # FIXME: Initialize ConfigStore or return Error
- pass
- except NameError:
- pass
-
- self.sessions = dict()
- #self.next_session = 0
- pass
-
- def session_set_status(self, id, status):
- self.sessions[sid].set_status(id, status)
- return 1
+ def __init__(self, cfg=None):
- #if cfg == None:
- # FIXME: Initialize ConfigStore or return Error
- #pass
- #else:
- #self.cfg = cfg
-
- #self.sessions = dict()
- #self.next_session = 0
- pass
++ try:
++ if cfg:
++ self.cfg = cfg
++ else:
++ # FIXME: Initialize ConfigStore or return Error
++ pass
++ except NameError:
++ pass
++ self.sessions = dict()
++ self.next_session = 0
++ pass
class Session(object):
def __init__(self, id):
commit c5cfa1d3881e0359f4f9a629cd83f85f7ad416b1
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Fri Dec 12 15:43:39 2008 +0100
Add a stuff for packaging modhub
diff --git a/revisor.spec.in b/revisor.spec.in
index acf87f2..12f0901 100644
--- a/revisor.spec.in
+++ b/revisor.spec.in
@@ -3,6 +3,7 @@
%define pkg_cobbler 1
%define pkg_comps 1
%define pkg_delta 0
+%define pkg_hub 0
%define pkg_isolinux 1
%define pkg_jigdo 0
%define pkg_rebrand 0
@@ -71,6 +72,9 @@ Obsoletes: revisor-cobbler
%if ! %{pkg_delta}
Obsoletes: revisor-delta
%endif
+%if ! %{pkg_hub}
+Obsoletes: revisor-hub
+%endif
%if ! %{pkg_isolinux}
Obsoletes: revisor-isolinux
%endif
@@ -156,6 +160,19 @@ Requires: system-config-kickstart
This is the Revisor GUI package
##
+## Revisor HUB plugin
+##
+%if %{pkg_hub}
+%package hub
+Summary: Revisor Hub for build farms
+Group: Applications/System
+Requires: revisor-cli = %{version}-%{release}
+
+%description hub
+Revisor build farms need a hub. This is it.
+%endif
+
+##
## Revisor customize isolinux.cfg
##
%if %{pkg_isolinux}
@@ -288,6 +305,10 @@ make install DESTDIR=$RPM_BUILD_ROOT
rm -rf %{buildroot}/%{python_sitelib}/revisor/moddelta
%endif
+%if ! %{pkg_hub}
+ rm -rf %{buildroot}/%{python_sitelib}/revisor/modhub
+%endif
+
%if ! %{pkg_isolinux}
rm -rf %{buildroot}/%{python_sitelib}/revisor/modisolinux
%endif
@@ -392,6 +413,15 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/pixmaps/*
%{_datadir}/applications/*.desktop
+%if %{pkg_hub}
+%files hub
+%defattr(-,root,root,-)
+%dir %{python_sitelib}/revisor/modhub
+%{python_sitelib}/revisor/modhub/*.py
+%{python_sitelib}/revisor/modhub/*.pyc
+%{python_sitelib}/revisor/modhub/*.pyo
+%endif
+
%if %{pkg_isolinux}
%files isolinux
%defattr(-,root,root,-)
commit 8163c9544889e17f6ef53cd55c173e07b50100b6
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Fri Dec 12 15:42:29 2008 +0100
Enhance the package nevr/nevra resolution by determining whether we have complete nevr(a)
in the following forms:
- name-version-release.disttag.arch
- name-version-release.arch
- name-version-release.disttag
- name-version-release
diff --git a/revisor/base.py b/revisor/base.py
index 1bc9efe..34adcbd 100644
--- a/revisor/base.py
+++ b/revisor/base.py
@@ -27,7 +27,7 @@ import time
import math
import re
import revisor
-import rpmUtils.miscutils
+import rpmUtils.arch
import shutil
import fnmatch
import yum
@@ -563,10 +563,43 @@ class RevisorBase:
except yum.Errors.PackageSackError, e:
if self.cfg.ksobj._get("packages","handleMissing") != kickstart.constants.KS_MISSING_IGNORE:
warnings.append(e.value)
- # Here's where we try and see if this is a rpm -qa list
+ # Here's where we try and see if this is a rpm -qa list
elif re.match('.*-.*-.*\..*', pkg):
+ # This format can have two forms:
+ # name-ver-release.arch
+ # name-ver-release
+
+ # The first thing we need to get is the name and ver.
+ # This is relatively easy
(name, ver, relarch) = pkg.rsplit('-', 2)
- (rel, arch) = relarch.rsplit('.', 1)
+
+ # For the latter part however (release.arch or release)...
+ try:
+ # Try splitting rel.disttag.arch
+ (rel, dist, arch) = relarch.rsplit('.', 2)
+ except ValueError:
+ # Failed... :/
+ # So, is this rel.arch? or rel.disttag?
+
+ # Let's try and split on .
+ # If it errors, we only have the release
+ # If it's OK, we either have rel, arch, or rel, disttag
+
+ try:
+ (foo, bar) = relarch.split('.', 2)
+ # Now that we've split, see if bar is an arch or a disttag
+ if rpmUtils.arch.arches.has_key(bar):
+ arch = bar
+ else:
+ arch = None
+ # If we didn't find a valid architecture, then
+ # bar is part of the release (e.g. disttag)
+ rel = "%s.%s" % (foo, bar)
+
+ except ValueError:
+ # Apparently our string only holds the release
+ rel = relarch
+
pkgs = self.cfg.yumobj.pkgSack.searchNevra(name=name, ver=ver, rel=rel, arch=arch)
if len(pkgs) > 1:
warnings.append(_("More then one package found for %s-%s-%s.%s - going to add them all to the transaction") % (name,ver,rel,arch))
commit e708908e48381cdd114c8d6cf26a295c7af2b481
Author: noik <noik00(a)gmail.com>
Date: Fri Dec 12 15:31:03 2008 +0100
Added hub-demo.py for testing hub functions(not complete)
changed base.py for starting the hubmode
Added some "to-be-implemented"-methods for further programming, and visualizing the concept, and fixed the indentations.
diff --git a/hub-demo.py b/hub-demo.py
new file mode 100755
index 0000000..14208e7
--- /dev/null
+++ b/hub-demo.py
@@ -0,0 +1,23 @@
+#! /usr/bin/python
+
+#This is a demo of the server
+#to use it, run this in interactive mode (python -i)
+# and your environment will have a connection variable
+
+from revisor.client import *
+
+con = Connection("http://localhost:9321")
+
+#print dir(con)
+
+print con.con.system.listMethods()
+
+session = con.con.session_set_status(1, "POEP!!!!")
+
+#con.con.session_set_configuration(session)
+#con.con.session_set_model(session, "f9-i386")
+#con.con.session_set_kickstart(session, "/etc/revisor/conf.d/sample-ks.cfg")
+
+#con.con.session_start_compose(session)
+
+#con.con.session_delete_session(session)
diff --git a/revisor/base.py b/revisor/base.py
index 0348035..e797c9b 100644
--- a/revisor/base.py
+++ b/revisor/base.py
@@ -96,29 +96,40 @@ class RevisorBase:
self.cfg.setup_yum()
self.cfg.setup_ks()
-
- def run(self):
- """Split into either running CLI, Server or GUI"""
+
+ def run(self):
+ """Split into either running CLI, Server, Hub or GUI"""
if self.cfg.cli_mode:
- import revisor.cli
self.log.debug(_("Running Revisor in CLI mode..."), level=1)
+ import revisor.cli
self.cli = revisor.cli.RevisorCLI(self)
self.cli.run()
+ #not optimal yet
+ # TODO: remove redundant code
+ elif hasattr(self.cfg,"hub_mode"):
+ if self.cfg.hub_mode:
+ self.log.debug(_("Running Revisor in Hub mode..."), level=1)
+ self.server = self.plugins.modhub
+ self.server.run(base=self)
+ elif self.cfg.gui_mode:
+ self.log.debug(_("Running Revisor in GUI mode..."), level=1)
+ self.gui = self.plugins.modgui
+ self.gui.run(base=self)
elif hasattr(self.cfg,"server_mode"):
- # added hubmode
- if self.cfg.hub_mode:
- self.log.debug(_("Running Revisor in Hub mode..."), level=1)
- self.server = self.plugins.modhub
- self.cfg.gui_mode = False #hack!
- self.server.run(base=self)
- elif self.cfg.server_mode:
- self.log.debug(_("Running Revisor in RPC Server mode..."), level=1)
- self.server = self.plugins.modserver
- self.server.run(base=self)
- elif self.cfg.gui_mode:
- self.log.debug(_("Running Revisor in GUI mode..."), level=1)
- self.gui = self.plugins.modgui
- self.gui.run(base=self)
+ if self.cfg.server_mode:
+ self.log.debug(_("Running Revisor in RPC Server mode..."), level=1)
+ self.server = self.plugins.modserver
+ self.server.run(base=self)
+ elif self.cfg.gui_mode:
+ self.log.debug(_("Running Revisor in GUI mode..."), level=1)
+ self.gui = self.plugins.modgui
+ self.gui.run(base=self)
+
+ elif self.cfg.gui_mode:
+ self.log.debug(_("Running Revisor in GUI mode..."), level=1)
+ self.gui = self.plugins.modgui
+ self.gui.run(base=self)
+
def create_logger(self):
"""Create a logger instance using cli_options.debuglevel"""
diff --git a/revisor/modhub/__init__.py b/revisor/modhub/__init__.py
index 4af145c..7b20883 100644
--- a/revisor/modhub/__init__.py
+++ b/revisor/modhub/__init__.py
@@ -15,8 +15,7 @@ class RevisorHub():
""" Hub Mode """
def __init__(self):
- # blaat
- print "HELLO HUB!!!!!!!"
+ pass
def do_xmlrpc(self, cfg):
""" Get our xmlrpc hub running. """
@@ -90,22 +89,35 @@ class RevisorHub():
class RevisorXMLRPCInterface(object):
""" Functionality to expose to the XML-RPC interface. """
- def __init__(self, cfg=None):
- #if cfg == None:
- # FIXME: Initialize ConfigStore or return Error
- #pass
- #else:
- #self.cfg = cfg
-
- #self.sessions = dict()
+ def __init__(self, cfg):
+ try:
+ if cfg:
+ self.cfg = cfg
+ else:
+ # FIXME: Initialize ConfigStore or return Error
+ pass
+ except NameError:
+ pass
+
+ self.sessions = dict()
#self.next_session = 0
pass
+
+ def session_set_status(self, id, status):
+ self.sessions[sid].set_status(id, status)
+ return 1
class Session(object):
def __init__(self, id):
self.id = id
- print "Session initted & ended"
+ print "Hub session initted"
+ self.revisor = HubMode()
+
+ def set_status(self, id, status):
+ if id == self.id:
+ self.revisor.set_status(id, status)
+ pass
class RevisorXMLRPCServer(SimpleXMLRPCServer.SimpleXMLRPCServer):
@@ -113,3 +125,25 @@ class RevisorXMLRPCServer(SimpleXMLRPCServer.SimpleXMLRPCServer):
def __init__(self, args):
self.allow_reuse_address = True
SimpleXMLRPCServer.SimpleXMLRPCServer.__init__(self, args)
+
+
+class HubMode():
+ def __init__(self):
+ pass
+
+ def set_status(self, id, status):
+ print id
+ print status
+ pass
+
+ def db_get_ks():
+ pass
+
+ def check_jobs():
+ #check jobs in DB
+ #get KS from DB if any found
+ pass
+
+ def add_composer():
+ #function to add composer for distribution idea
+ pass
commit 6b8094429e077ddca46a9a872ea148fdf564dc7a
Author: Mads Kiilerich <mads(a)kiilerich.com>
Date: Fri Dec 12 14:43:54 2008 +0100
Return non-zero error code in case of error
diff --git a/revisor/__init__.py.in b/revisor/__init__.py.in
index 13ad690..73fe257 100644
--- a/revisor/__init__.py.in
+++ b/revisor/__init__.py.in
@@ -436,15 +436,20 @@ class Revisor:
def run(self):
"""Run Forest, RUN!"""
+
+ exitcode = 0
+
try:
self.base.run()
+ except SystemExit:
+ pass
except KeyboardInterrupt:
+ exitcode = 1
self.base.log.info(_("Interrupted by user"))
# except TypeError, e:
# self.log.error(_("Type Error: %s") % e)
- except SystemExit:
- pass
except:
+ exitcode = 2
traceback.print_exc()
print >> sys.stderr, _("Traceback occurred, please report a bug at http://fedorahosted.org/revisor")
finally:
@@ -462,3 +467,5 @@ class Revisor:
for dir in ["revisor-yumcache"]:
if os.access(os.path.join(self.base.cfg.working_directory, dir), os.R_OK):
shutil.rmtree(os.path.join(self.base.cfg.working_directory, dir))
+
+ sys.exit(exitcode)
\ No newline at end of file
commit efe46471a01aedd2c1bd8ae4f93e8c08ef1af001
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Fri Dec 12 14:17:13 2008 +0100
Fix the indentation. Use 4 spaces to a tab
diff --git a/revisor/base.py b/revisor/base.py
index 0348035..1bc9efe 100644
--- a/revisor/base.py
+++ b/revisor/base.py
@@ -104,21 +104,29 @@ class RevisorBase:
self.log.debug(_("Running Revisor in CLI mode..."), level=1)
self.cli = revisor.cli.RevisorCLI(self)
self.cli.run()
- elif hasattr(self.cfg,"server_mode"):
- # added hubmode
- if self.cfg.hub_mode:
- self.log.debug(_("Running Revisor in Hub mode..."), level=1)
- self.server = self.plugins.modhub
- self.cfg.gui_mode = False #hack!
- self.server.run(base=self)
- elif self.cfg.server_mode:
- self.log.debug(_("Running Revisor in RPC Server mode..."), level=1)
- self.server = self.plugins.modserver
- self.server.run(base=self)
- elif self.cfg.gui_mode:
- self.log.debug(_("Running Revisor in GUI mode..."), level=1)
- self.gui = self.plugins.modgui
- self.gui.run(base=self)
+ elif hasattr(self.cfg,"server_mode") or hasattr(self.cfg."hub_mode"):
+ # Check hub_mode,
+ # Then check server_mode,
+ # If we have both attributes, but none is set, fall back to GUI mode
+ if self.cfg.hub_mode:
+ self.log.debug(_("Running Revisor in Hub mode..."), level=1)
+ self.hub = self.plugins.modhub
+ self.cfg.gui_mode = False #hack!
+ self.hub.run(base=self)
+ elif self.cfg.server_mode:
+ self.log.debug(_("Running Revisor in RPC Server mode..."), level=1)
+ self.server = self.plugins.modserver
+ self.server.run(base=self)
+ elif self.cfg.gui_mode:
+ self.log.debug(_("Running Revisor in GUI mode..."), level=1)
+ self.gui = self.plugins.modgui
+ self.gui.run(base=self)
+
+ # And, finally, fall back to GUI mode
+ elif self.cfg.gui_mode:
+ self.log.debug(_("Running Revisor in GUI mode..."), level=1)
+ self.gui = self.plugins.modgui
+ self.gui.run(base=self)
def create_logger(self):
"""Create a logger instance using cli_options.debuglevel"""
diff --git a/revisor/modhub/__init__.py b/revisor/modhub/__init__.py
index 4af145c..85d8937 100644
--- a/revisor/modhub/__init__.py
+++ b/revisor/modhub/__init__.py
@@ -12,94 +12,94 @@ import os
#import logger.Logger
class RevisorHub():
- """ Hub Mode """
-
- def __init__(self):
- # blaat
- print "HELLO HUB!!!!!!!"
-
- def do_xmlrpc(self, cfg):
- """ Get our xmlrpc hub running. """
- xinterface = RevisorXMLRPCInterface(cfg)
- hub = RevisorXMLRPCServer(('', int(cfg.hub_port)))
- hub.register_introspection_functions()
- cfg.log.info("XMLRPC Server running on port %s" % cfg.hub_port)
- hub.register_instance(xinterface)
- while True:
- try:
- hub.serve_forever()
- except IOError:
- # interrupted? try to serve again
- time.sleep(0.5)
-
- def run(self, base):
- print "HUB mode started!"
- if base.cfg.fork_mode:
- pid = os.fork()
- self.do_xmlrpc(base.cfg)
- else:
- try:
- self.do_xmlrpc(base.cfg)
- pass
- except KeyboardInterrupt:
+ """ Hub Mode """
+
+ def __init__(self):
+ # blaat
+ print "HELLO HUB!!!!!!!"
+
+ def do_xmlrpc(self, cfg):
+ """ Get our xmlrpc hub running. """
+ xinterface = RevisorXMLRPCInterface(cfg)
+ hub = RevisorXMLRPCServer(('', int(cfg.hub_port)))
+ hub.register_introspection_functions()
+ cfg.log.info("XMLRPC Server running on port %s" % cfg.hub_port)
+ hub.register_instance(xinterface)
+ while True:
+ try:
+ hub.serve_forever()
+ except IOError:
+ # interrupted? try to serve again
+ time.sleep(0.5)
+
+ def run(self, base):
+ print "HUB mode started!"
+ if base.cfg.fork_mode:
+ pid = os.fork()
+ self.do_xmlrpc(base.cfg)
+ else:
+ try:
+ self.do_xmlrpc(base.cfg)
+ pass
+ except KeyboardInterrupt:
#base.log.info("Shutting down...")
- pass
-
- def add_options(self, parser):
- modhub_group = parser.add_option_group("Hub Options")
- modhub_group.add_option( "--hub",
+ pass
+
+ def add_options(self, parser):
+ modhub_group = parser.add_option_group("Hub Options")
+ modhub_group.add_option( "--hub",
dest = "hub_mode",
action = "store_true",
default = False,
help = _("Use the Hub mode for distributed composing."))
- modhub_group.add_option( "--hub-port",
+ modhub_group.add_option( "--hub-port",
dest = "hub_port",
action = "store",
default = "9321",
help = _("Port to start Hub mode on."),
metavar = "[hub-port]")
- modhub_group.add_option("--forkhub",
- dest = "forkhub_mode",
- action = "store",
- default = False,
- help = _("Start the Hub mode and fork."),
- metavar = "[boolean]")
-
- #def check_options(self, cfg, cli_options):
+ modhub_group.add_option("--forkhub",
+ dest = "forkhub_mode",
+ action = "store",
+ default = False,
+ help = _("Start the Hub mode and fork."),
+ metavar = "[boolean]")
+
+ #def check_options(self, cfg, cli_options):
# Cheater! Found a cheater!
- #print cli_options.server_mode
+ #print cli_options.server_mode
#if cli_options.server_mode:
- #cfg.server_mode = False
- #cfg.hub_mode = True
+ #cfg.server_mode = False
+ #cfg.hub_mode = True
#cfg.gui_mode = False
#cfg.cli_mode = False
- #print "blaat"
+ #print "blaat"
#pass
-
- def set_defaults(self, defaults):
- #defaults.db_server = x.x.x.x
- #defaults.db_type = mysql #for later development
- #defaults.setport = "3306"
- #defaults.username = "blaat"
- #defaults.password = "pass"
- #defaults.dbname = "revisor-hubdb"
- #defaults.configfile = "blaat"
- pass
+
+ def set_defaults(self, defaults):
+ #defaults.db_server = x.x.x.x
+ #defaults.db_type = mysql #for later development
+ #defaults.setport = "3306"
+ #defaults.username = "blaat"
+ #defaults.password = "pass"
+ #defaults.dbname = "revisor-hubdb"
+ #defaults.configfile = "blaat"
+ pass
class RevisorXMLRPCInterface(object):
""" Functionality to expose to the XML-RPC interface. """
def __init__(self, cfg=None):
- #if cfg == None:
+ #if cfg == None:
# FIXME: Initialize ConfigStore or return Error
#pass
#else:
- #self.cfg = cfg
-
+ #self.cfg = cfg
+
#self.sessions = dict()
#self.next_session = 0
- pass
+ pass
class Session(object):
commit efe82349a05447c6dcd94d2a51164278292e4185
Author: noik <noik00(a)gmail.com>
Date: Thu Dec 11 17:22:42 2008 +0100
changed base.py to start modhub
and started creating a modhub which will act as a distributor for composing spins
diff --git a/revisor/base.py b/revisor/base.py
index 3e15c82..0348035 100644
--- a/revisor/base.py
+++ b/revisor/base.py
@@ -104,27 +104,21 @@ class RevisorBase:
self.log.debug(_("Running Revisor in CLI mode..."), level=1)
self.cli = revisor.cli.RevisorCLI(self)
self.cli.run()
-
elif hasattr(self.cfg,"server_mode"):
- # added hubmode
- if self.cfg.hub_mode:
- self.log.debug(_("Running Revisor in Hub mode..."), level=1)
- self.server = self.plugins.modhub
- self.server.run(base=self)
- pass
- if self.cfg.server_mode:
- self.log.debug(_("Running Revisor in RPC Server mode..."), level=1)
- self.server = self.plugins.modserver
- self.server.run(base=self)
- elif self.cfg.gui_mode:
- self.log.debug(_("Running Revisor in GUI mode..."), level=1)
- self.gui = self.plugins.modgui
- self.gui.run(base=self)
-
- elif self.cfg.gui_mode:
- self.log.debug(_("Running Revisor in GUI mode..."), level=1)
- self.gui = self.plugins.modgui
- self.gui.run(base=self)
+ # added hubmode
+ if self.cfg.hub_mode:
+ self.log.debug(_("Running Revisor in Hub mode..."), level=1)
+ self.server = self.plugins.modhub
+ self.cfg.gui_mode = False #hack!
+ self.server.run(base=self)
+ elif self.cfg.server_mode:
+ self.log.debug(_("Running Revisor in RPC Server mode..."), level=1)
+ self.server = self.plugins.modserver
+ self.server.run(base=self)
+ elif self.cfg.gui_mode:
+ self.log.debug(_("Running Revisor in GUI mode..."), level=1)
+ self.gui = self.plugins.modgui
+ self.gui.run(base=self)
def create_logger(self):
"""Create a logger instance using cli_options.debuglevel"""
diff --git a/revisor/modhub/__init__.py b/revisor/modhub/__init__.py
index 18a1397..4af145c 100644
--- a/revisor/modhub/__init__.py
+++ b/revisor/modhub/__init__.py
@@ -1,5 +1,3 @@
-# modhub!!
-
# Translation
from rhpl.translate import _, N_, getDefaultLangs
@@ -7,23 +5,76 @@ import revisor
import revisor.base
import revisor.cfg
+import SimpleXMLRPCServer
+import xmlrpclib
+import os
+
+#import logger.Logger
+
class RevisorHub():
+ """ Hub Mode """
def __init__(self):
+ # blaat
print "HELLO HUB!!!!!!!"
- pass
-
+
+ def do_xmlrpc(self, cfg):
+ """ Get our xmlrpc hub running. """
+ xinterface = RevisorXMLRPCInterface(cfg)
+ hub = RevisorXMLRPCServer(('', int(cfg.hub_port)))
+ hub.register_introspection_functions()
+ cfg.log.info("XMLRPC Server running on port %s" % cfg.hub_port)
+ hub.register_instance(xinterface)
+ while True:
+ try:
+ hub.serve_forever()
+ except IOError:
+ # interrupted? try to serve again
+ time.sleep(0.5)
+
def run(self, base):
print "HUB mode started!"
- pass
+ if base.cfg.fork_mode:
+ pid = os.fork()
+ self.do_xmlrpc(base.cfg)
+ else:
+ try:
+ self.do_xmlrpc(base.cfg)
+ pass
+ except KeyboardInterrupt:
+ #base.log.info("Shutting down...")
+ pass
def add_options(self, parser):
modhub_group = parser.add_option_group("Hub Options")
modhub_group.add_option( "--hub",
- dest = "hub_mode",
- action = "store_true",
- default = False,
- help = _("Use the hub mode for distributed composing"))
+ dest = "hub_mode",
+ action = "store_true",
+ default = False,
+ help = _("Use the Hub mode for distributed composing."))
+ modhub_group.add_option( "--hub-port",
+ dest = "hub_port",
+ action = "store",
+ default = "9321",
+ help = _("Port to start Hub mode on."),
+ metavar = "[hub-port]")
+ modhub_group.add_option("--forkhub",
+ dest = "forkhub_mode",
+ action = "store",
+ default = False,
+ help = _("Start the Hub mode and fork."),
+ metavar = "[boolean]")
+
+ #def check_options(self, cfg, cli_options):
+ # Cheater! Found a cheater!
+ #print cli_options.server_mode
+ #if cli_options.server_mode:
+ #cfg.server_mode = False
+ #cfg.hub_mode = True
+ #cfg.gui_mode = False
+ #cfg.cli_mode = False
+ #print "blaat"
+ #pass
def set_defaults(self, defaults):
#defaults.db_server = x.x.x.x
@@ -34,6 +85,31 @@ class RevisorHub():
#defaults.dbname = "revisor-hubdb"
#defaults.configfile = "blaat"
pass
+
+
+class RevisorXMLRPCInterface(object):
+ """ Functionality to expose to the XML-RPC interface. """
+
+ def __init__(self, cfg=None):
+ #if cfg == None:
+ # FIXME: Initialize ConfigStore or return Error
+ #pass
+ #else:
+ #self.cfg = cfg
- #def check_options(self, cfg, cli_options):
- #pass
+ #self.sessions = dict()
+ #self.next_session = 0
+ pass
+
+
+class Session(object):
+ def __init__(self, id):
+ self.id = id
+ print "Session initted & ended"
+
+
+class RevisorXMLRPCServer(SimpleXMLRPCServer.SimpleXMLRPCServer):
+ """ The actual XML-RPC Server object"""
+ def __init__(self, args):
+ self.allow_reuse_address = True
+ SimpleXMLRPCServer.SimpleXMLRPCServer.__init__(self, args)
commit 3a4b3d1116f899a2b346a3fe3d921f8b2037ab1f
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Thu Dec 11 16:43:06 2008 +0100
In verbose mode, spit out the names of the packages
diff --git a/scripts/find-default-groups.py b/scripts/find-default-groups.py
index 941b79b..154fddd 100755
--- a/scripts/find-default-groups.py
+++ b/scripts/find-default-groups.py
@@ -132,5 +132,14 @@ def main():
print "%d mandatory packages, %d default packages, %d packages in total (after depsolving)" % (ayum.total_mandatory,ayum.total_default,len(ayum.tsInfo.getMembers()))
+ if cli_options.verbose:
+ pkg_names = []
+ for pkg in ayum.tsInfo.getMembers():
+ pkg_names.append(pkg.name)
+ pkg_names.sort()
+
+ for name in pkg_names:
+ print name
+
if __name__ == '__main__':
main()
commit a111c64f35f74990bd72c05e072c9a83b32f73d2
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Thu Dec 11 16:42:51 2008 +0100
Remove packages from sample-ks.cfg
diff --git a/conf/conf.d/sample-ks.cfg b/conf/conf.d/sample-ks.cfg
index 5cc91b7..4dfeb7e 100644
--- a/conf/conf.d/sample-ks.cfg
+++ b/conf/conf.d/sample-ks.cfg
@@ -37,11 +37,4 @@ install
xconfig --defaultdesktop=GNOME --startxonboot
%packages
-# Let's put something a little more interesting here
-# just to show off some of the power of kickstart
-kernel
-kernel-devel
-vim-enhanced
-yum
--yum-updatesd
%end
commit ec727fcbbad208ff2ac8c635a1d897d34e827fe2
Author: revisor development <revisor(a)guest-dhcp-244.si.hhs.nl>
Date: Wed Dec 10 17:09:13 2008 +0100
Added cfg statements
commented check_options because of error
diff --git a/revisor/cfg.py b/revisor/cfg.py
index b3d4d89..328074c 100644
--- a/revisor/cfg.py
+++ b/revisor/cfg.py
@@ -983,6 +983,7 @@ class Defaults:
self.gui_mode = False
self.cli_mode = False
self.server_mode = False
+ self.hub_mode = False
self.headless_mode = False
# Report sizes maximum length
diff --git a/revisor/modhub/__init__.py b/revisor/modhub/__init__.py
index d7a0fe1..18a1397 100644
--- a/revisor/modhub/__init__.py
+++ b/revisor/modhub/__init__.py
@@ -35,5 +35,5 @@ class RevisorHub():
#defaults.configfile = "blaat"
pass
- def check_options(self, cfg, cli_options):
- pass
+ #def check_options(self, cfg, cli_options):
+ #pass
commit 415ed7679ab34e53cac378d546ecebc04547bb3c
Author: revisor development <revisor(a)guest-dhcp-244.si.hhs.nl>
Date: Wed Dec 10 17:00:46 2008 +0100
Commited an extra file to start hub(not tested yet)
diff --git a/revisor/base.py b/revisor/base.py
index 1ba89df..3e15c82 100644
--- a/revisor/base.py
+++ b/revisor/base.py
@@ -106,7 +106,13 @@ class RevisorBase:
self.cli.run()
elif hasattr(self.cfg,"server_mode"):
- if self.cfg.server_mode:
+ # added hubmode
+ if self.cfg.hub_mode:
+ self.log.debug(_("Running Revisor in Hub mode..."), level=1)
+ self.server = self.plugins.modhub
+ self.server.run(base=self)
+ pass
+ if self.cfg.server_mode:
self.log.debug(_("Running Revisor in RPC Server mode..."), level=1)
self.server = self.plugins.modserver
self.server.run(base=self)
commit 2c016ed128a0611a46867039d7c70662b6167bbc
Author: revisor development <revisor(a)guest-dhcp-244.si.hhs.nl>
Date: Wed Dec 10 16:44:26 2008 +0100
Added new module <modhub> for creating a server which controls distributed composing of spins.
Can't get the commandline interface to work.
diff --git a/configure.ac b/configure.ac
index 2ec88ac..0c9a226 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,6 +40,7 @@ revisor/modreuseinstaller/Makefile
revisor/modserver/Makefile
revisor/modvirt/Makefile
revisor/modwui/Makefile
+revisor/modhub/Makefile
unity/Makefile
])
diff --git a/revisor/Makefile.am b/revisor/Makefile.am
index 414507a..76cf61c 100644
--- a/revisor/Makefile.am
+++ b/revisor/Makefile.am
@@ -32,4 +32,5 @@ SUBDIRS = \
modreuseinstaller \
modserver \
modvirt \
- modwui
+ modwui \
+ modhub
diff --git a/revisor/modhub/Makefile.am b/revisor/modhub/Makefile.am
new file mode 100644
index 0000000..b88bd6f
--- /dev/null
+++ b/revisor/modhub/Makefile.am
@@ -0,0 +1,8 @@
+PYTHON_FILES = \
+ __init__.py
+
+EXTRA_DIST = \
+ $(PYTHON_FILES)
+
+pydir = $(pythondir)/revisor/modhub
+py_PYTHON = $(PYTHON_FILES)
diff --git a/revisor/modhub/__init__.py b/revisor/modhub/__init__.py
new file mode 100644
index 0000000..d7a0fe1
--- /dev/null
+++ b/revisor/modhub/__init__.py
@@ -0,0 +1,39 @@
+# modhub!!
+
+# Translation
+from rhpl.translate import _, N_, getDefaultLangs
+
+import revisor
+import revisor.base
+import revisor.cfg
+
+class RevisorHub():
+
+ def __init__(self):
+ print "HELLO HUB!!!!!!!"
+ pass
+
+ def run(self, base):
+ print "HUB mode started!"
+ pass
+
+ def add_options(self, parser):
+ modhub_group = parser.add_option_group("Hub Options")
+ modhub_group.add_option( "--hub",
+ dest = "hub_mode",
+ action = "store_true",
+ default = False,
+ help = _("Use the hub mode for distributed composing"))
+
+ def set_defaults(self, defaults):
+ #defaults.db_server = x.x.x.x
+ #defaults.db_type = mysql #for later development
+ #defaults.setport = "3306"
+ #defaults.username = "blaat"
+ #defaults.password = "pass"
+ #defaults.dbname = "revisor-hubdb"
+ #defaults.configfile = "blaat"
+ pass
+
+ def check_options(self, cfg, cli_options):
+ pass
diff --git a/revisor/plugins.py b/revisor/plugins.py
index 4a9d749..fae8758 100644
--- a/revisor/plugins.py
+++ b/revisor/plugins.py
@@ -39,7 +39,8 @@ class RevisorPlugins:
'modrebrand': False,
'modreuseinstaller': False,
'modvirt': False,
- 'modserver': False
+ 'modserver': False,
+ 'modhub': False
}
self.check_plugins(init=init)
commit 7149d203f755fda15d3817a8ee883acb784b449f
Author: Fabian Affolter <fabian(a)bernewireless.net>
Date: Mon Dec 8 21:23:01 2008 +0000
Updated German translation
Transmitted-via: Transifex (translate.fedoraproject.org)
diff --git a/po/Changelog b/po/Changelog
index 96a31ec..65fb1ca 100644
--- a/po/Changelog
+++ b/po/Changelog
@@ -1,4 +1,6 @@
-Updatet brazilian portuguese translation
+Updated German translation
+
+Transmitted-via: Transifex (translate.fedoraproject.org)Updatet brazilian portuguese translation
Transmitted-via: Transifex (translate.fedoraproject.org)Updated Polish translation
diff --git a/po/de.po b/po/de.po
index 01a77c9..570deac 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: revisor.master.de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-05 01:30+0000\n"
-"PO-Revision-Date: 2008-11-07 12:04+0100\n"
+"POT-Creation-Date: 2008-12-01 01:26+0000\n"
+"PO-Revision-Date: 2008-12-08 22:18+0100\n"
"Last-Translator: Fabian Affolter <fab(a)fedoraproject.org>\n"
"Language-Team: German <i18(a)redhat.com>\n"
"MIME-Version: 1.0\n"
@@ -108,7 +108,7 @@ msgstr "Über Revisor"
#: ../revisor/modgui/glade/base_screen.glade.in.h:37
#: ../revisor/modgui/glade/revisor.glade.h:39
msgid "Authors"
-msgstr "Authoren"
+msgstr "Autoren"
#: ../revisor/modgui/glade/base_screen.glade.in.h:38
msgid "Fedora Unity:"
@@ -238,7 +238,7 @@ msgstr "Schreibe Abbild auf _USB-Gerät"
#: ../revisor/modgui/glade/finished_screen.glade.h:12
msgid "_Continue..."
-msgstr "_Weiter..."
+msgstr "_Weiter ..."
#: ../revisor/modgui/glade/lm_auth.glade.h:1
msgid "Authentication Configuration"
@@ -254,7 +254,7 @@ msgstr "Authentifikation:"
#: ../revisor/modgui/glade/lm_auth.glade.h:4
msgid "Enable Hesiod Support"
-msgstr "Aktivere Hesiod Unterstützung"
+msgstr "Aktivere Hesiod-Unterstützung"
#: ../revisor/modgui/glade/lm_auth.glade.h:5
msgid "Enable Kerberos 5 Authentication"
@@ -274,7 +274,7 @@ msgstr "Aktiviere SMB-Authentifikation"
#: ../revisor/modgui/glade/lm_auth.glade.h:9
msgid "Enable nscd"
-msgstr "Enable nscd"
+msgstr "Aktiviere nscd"
#: ../revisor/modgui/glade/lm_auth.glade.h:10
msgid "Hesiod"
@@ -282,15 +282,15 @@ msgstr "Hesiod"
#: ../revisor/modgui/glade/lm_auth.glade.h:11
msgid "Hesiod Authentication"
-msgstr "Hesiod Authentifikation"
+msgstr "Hesiod-Authentifikation"
#: ../revisor/modgui/glade/lm_auth.glade.h:12
msgid "Hesiod LHS:"
-msgstr "Hesiod LHS:"
+msgstr "Hesiod-LHS:"
#: ../revisor/modgui/glade/lm_auth.glade.h:13
msgid "Hesiod RHS:"
-msgstr "Hesiod RHS:"
+msgstr "Hesiod-RHS:"
#: ../revisor/modgui/glade/lm_auth.glade.h:14
msgid "Kerberos 5"
@@ -645,7 +645,7 @@ msgstr "Benutzername:"
#: ../revisor/modgui/glade/load_kickstart.glade.h:2
msgid "Customize package manifest defined in kickstart data"
-msgstr "Passe Paketliste in den kickstart Daten an."
+msgstr "Passe Paketliste in den kickstart-Daten an."
#: ../revisor/modgui/glade/load_kickstart.glade.h:3
msgid "Customize/Review details about locale, users/passwords, security/authentication, networking and Xorg"
@@ -653,7 +653,7 @@ msgstr "Individualisiere/Überprüfe Details über lokale User/passwords, Sicher
#: ../revisor/modgui/glade/load_kickstart.glade.h:4
msgid "Include Kickstart file on Installation Media"
-msgstr "Inklusive Kickstar-Datei auf dem Installationsmedium"
+msgstr "Inklusive Kickstart-Datei auf dem Installationsmedium"
#: ../revisor/modgui/glade/load_kickstart.glade.h:5
msgid "Kickstart Configuration File:"
@@ -668,7 +668,7 @@ msgid ""
"Select a kickstart file to be used to populate options for your selected media.\n"
"If you did not select Live media creation, some options will be ignored.\n"
"This step is not required and options loaded from the kickstart may also be customized further."
-msgstr "Wähle eine Kickstart-Datei um sie mit den ausgewählten Medien zu bestücken. Falls die Live media Kreation nicht ausgewählt wurde werden manche Optionen ignoriert. Dieser Schritt ist nicht erforderlich und Optionen die vom Kickstart geladen wurden, werden weiter angepasst."
+msgstr "Wähle eine Kickstart-Datei um sie mit den ausgewählten Medien zu bestücken. Falls die Live-Medium-Kreation nicht ausgewählt wurde werden manche Optionen ignoriert. Dieser Schritt ist nicht erforderlich und Optionen die vom Kickstart geladen wurden, werden weiter angepasst."
#: ../revisor/modgui/glade/load_kickstart.glade.h:10
msgid "Set installer to boot with kickstart by default"
@@ -752,7 +752,7 @@ msgstr "<b>RPM-Paket-Last-Grösse:</b>"
#: ../revisor/modgui/glade/ready_screen.glade.h:5
msgid "Build Unattended Install Media"
-msgstr "Baue unbeaufsichtigtes Installations Medium"
+msgstr "Baue Installations-Medium zur unbeaufsichtigten Installation"
#: ../revisor/modgui/glade/ready_screen.glade.h:6
msgid "Not Calculated, Yet"
@@ -887,7 +887,7 @@ msgstr "Ziel-Verzeichnis:"
#: ../revisor/modgui/glade/revisor.glade.h:42
msgid "Dynamically Set Header Label"
-msgstr "Dynamische gesetzteHeader-Bezeichnungen"
+msgstr "Dynamische gesetzte Header-Bezeichnungen"
#: ../revisor/modgui/glade/revisor.glade.h:44
msgid "Message"
@@ -905,7 +905,7 @@ msgstr "Bitte wählen Sie den Typ(en) von Medien, welche Sie zusammenstellen wol
#: ../revisor/modgui/glade/revisor.glade.h:46
msgid "Progress - Revisor"
-msgstr "Forschritt - Revisor"
+msgstr "Fortschritt - Revisor"
#: ../revisor/modgui/glade/revisor.glade.h:48
#: ../revisor/modgui/glade/revisor_configuration.glade.h:21
@@ -1081,7 +1081,7 @@ msgstr "Wähle Medium-Typ(en)"
#: ../revisor/modgui/glade/select_media_advanced.glade.h:9
msgid "Virtualization Media"
-msgstr "Virtualization-Medium"
+msgstr "Virtualisations-Medium"
#: ../revisor/modgui/glade/select_media.glade.h:1
#: ../revisor/modgui/glade/select_media_installation.glade.h:1
@@ -1304,7 +1304,7 @@ msgstr "Einrichtung des Transaktionssets"
#: ../revisor/base.py:261
msgid "Getting myself a piece of the RPMDB"
-msgstr "HOle mir selber ein Stück der RPMDB"
+msgstr "Hole mir selber ein Stück der RPMDB"
#: ../revisor/base.py:268
msgid "Apparently we're running on an Enterprise Linux system (we can tell from the way yum sets up the RPM Database)"
@@ -1423,7 +1423,7 @@ msgstr "Von Gruppen (optional): Füge %s-%s:%s-%s.%s zur Transaktion hinzu"
#: ../revisor/base.py:470
#, python-format
msgid "No include parameter for group %s, using defaults"
-msgstr "Keine enthaltenen Paramenter für Gruppe %s, beim Verwenden der Standarteinstellung"
+msgstr "Keine enthaltenen Parameter für Gruppe %s, beim Verwenden der Standarteinstellung"
#: ../revisor/base.py:492
#: ../revisor/base.py:696
@@ -1439,7 +1439,7 @@ msgstr "Von Paket-List, inklusive: %s"
#: ../revisor/base.py:509
#, python-format
msgid "Package %s is in excludeList, continuing"
-msgstr "Paket %s ist in excludeList, fortfahren"
+msgstr "Paket %s ist in Ausschluss-Liste, fortfahren"
#: ../revisor/base.py:517
msgid "No packages found!"
@@ -1464,7 +1464,7 @@ msgstr "Fand Paketübereinstimmung '%s': %s"
#: ../revisor/base.py:553
#, python-format
msgid "From Packages: Not adding %s now because it is in the ignore list"
-msgstr "Von Paketen: Jetzt nicht %s hinzufügen, da es in der Ignore List ist."
+msgstr "Von Paketen: Jetzt nicht %s hinzufügen, da es in der Ignorieren-Liste ist."
#: ../revisor/base.py:564
#, python-format
@@ -1479,7 +1479,7 @@ msgstr "Konnte Paket nicht finden %s-%s-%s.%s"
#: ../revisor/base.py:569
#, python-format
msgid "From Packages (exact string %s-%s-%s.%s), selecting %s-%s-%s.%s"
-msgstr "Von den Paketen (extraiere String %s-%s-%s.%s), wähle %s-%s-%s.%s"
+msgstr "Von den Paketen (extrahiere String %s-%s-%s.%s), wähle %s-%s-%s.%s"
#: ../revisor/base.py:589
#: ../revisor/base.py:744
@@ -1512,7 +1512,7 @@ msgstr ""
#: ../revisor/base.py:604
msgid "This is what was selected to be installed:"
-msgstr "Das sind die Ausgewählen Installationen:"
+msgstr "Das sind die ausgewählten Installationen:"
#: ../revisor/base.py:617
#, python-format
@@ -1536,11 +1536,11 @@ msgstr "Füge hinzu %s-%s:%s-%s.%s"
#: ../revisor/base.py:765
msgid "Initting progress bar for "
-msgstr "Initialisiere Forschrittsanzeige für"
+msgstr "Initialisiere Fortschrittsanzeige für"
#: ../revisor/base.py:772
msgid "Apparently we have not yet entered the Build Media stage"
-msgstr "Offensichtlich wurde noch nicht die Build Meida Plattform geöffnet"
+msgstr "Offensichtlich wurde noch nicht die Build Media-Plattform geöffnet"
#: ../revisor/base.py:801
#: ../revisor/misc.py:156
@@ -1559,7 +1559,7 @@ msgstr "Nicht auflösbare Abhängigkeit %s %s %s in %s.%s"
#: ../revisor/misc.py:190
#, 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 for %s-%s:%s-%s.%s (benötigt %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:833
#: ../revisor/misc.py:196
@@ -1577,7 +1577,7 @@ msgid ""
"The following packages were excluded using the kickstart package manifest, but were included for dependency resolving:\n"
" - %s"
msgstr ""
-"Die folgenden Pakete wurde ausgeschlossen durch das Kickstart-Paket-Manifest, wurden aber zum Auflösen von Abhängigkeiten wieder eingesclossen:\n"
+"Die folgenden Pakete wurde ausgeschlossen durch das Kickstart-Paket-Manifest, wurden aber zum Auflösen von Abhängigkeiten wieder eingeschlossen:\n"
" - %s"
#: ../revisor/base.py:862
@@ -1622,197 +1622,210 @@ msgstr ""
msgid "The package set after dependency resolving does not match the packages selected in the kickstart manifest"
msgstr "Die Paketeinstellung nach Aufhebung der Abhängigkeit stimmt nicht mit den Paketen überein, die in der kickstart Liste ausgewählt wurden."
-#: ../revisor/base.py:938
+#: ../revisor/base.py:941
#, python-format
msgid "No such repository: %s"
msgstr "Kein solches Repository: %s"
-#: ../revisor/base.py:940
+#: ../revisor/base.py:943
#, python-format
msgid "Enabling %s repository"
msgstr "Aktiviere %s Repository"
-#: ../revisor/base.py:958
+#: ../revisor/base.py:962
#, python-format
msgid "Disabling %s repository"
msgstr "Deaktiviere %s Repository"
-#: ../revisor/base.py:979
+#: ../revisor/base.py:969
+msgid "Creating a list of SRPMs"
+msgstr "Erzeuge Liste der SRPMs"
+
+#: ../revisor/base.py:984
+msgid "Source RPM PO already in the list"
+msgstr "Quellen-RPM-PO bereits in der Liste"
+
+#: ../revisor/base.py:986
+#, python-format
+msgid "Source RPM found in non-source repository %s"
+msgstr "Quellen-RPM in nicht Quellen-Repository%s gefunden"
+
+#: ../revisor/base.py:988
#, python-format
msgid "Error: Cannot find a source rpm for %s"
msgstr "Fehler: Kann Quellen-RPM nicht finden für %s"
-#: ../revisor/base.py:981
+#: ../revisor/base.py:990
#: ../revisor/modgui/build_media.py:106
#: ../revisor/modgui/build_media.py:142
#: ../revisor/modgui/build_media.py:219
msgid "Downloading Source Packages"
msgstr "Herunterladen der Quellen-Pakete"
-#: ../revisor/base.py:1010
+#: ../revisor/base.py:1019
#: ../revisor/progress.py:441
#, python-format
msgid "Downloading %s"
msgstr "Herunterladen %s"
-#: ../revisor/base.py:1040
+#: ../revisor/base.py:1049
#: ../revisor/modgui/build_media.py:101
#: ../revisor/modgui/build_media.py:214
msgid "Downloading Packages"
msgstr "Herunterladen der Pakete"
-#: ../revisor/base.py:1049
+#: ../revisor/base.py:1058
msgid "Unable to find a suitable mirror."
-msgstr "Es kann kein geeigneter Mirror gefunden werden. "
+msgstr "Es kann kein geeigneter Spiegel gefunden werden. "
-#: ../revisor/base.py:1061
+#: ../revisor/base.py:1070
#, python-format
msgid "Errors were encountered while downloading packages: %s"
msgstr "Beim Herunterladen der Pakete sind Fehler aufgetreten: %s"
-#: ../revisor/base.py:1102
+#: ../revisor/base.py:1111
#, python-format
msgid "Overriding auto package selection with user package selection for %s..."
msgstr "Übergeordnete Autopaket Auswahl mit Benutzerpaket Auswahl für %s..."
-#: ../revisor/base.py:1115
+#: ../revisor/base.py:1124
#, python-format
msgid "Adding required package %s-%s:%s-%s.%s"
msgstr "Benötigtes Paket hinzufügen %s-%s:%s-%s.%s"
#. This list has already been resolved
-#: ../revisor/base.py:1118
+#: ../revisor/base.py:1127
#, python-format
msgid "%s. This is a required package."
msgstr "%s. Dies ist ein benötigtes Paket."
-#: ../revisor/base.py:1130
+#: ../revisor/base.py:1139
#, python-format
msgid "Adding suggested package %s-%s:%s-%s.%s"
msgstr "Empfohlenes Paket hinzufügen %s-%s:%s-%s.%s"
-#: ../revisor/base.py:1140
+#: ../revisor/base.py:1149
#, python-format
msgid "Packages that do not need to be on the media: %s"
msgstr "Pakete die nicht in Media sein müssen: %s"
-#: ../revisor/base.py:1165
-#: ../revisor/base.py:1191
+#: ../revisor/base.py:1174
+#: ../revisor/base.py:1200
msgid "Did not succeed in adding in all required packages"
msgstr "Wurde nicht erfolgreich in alle erforderlichen Paketen hinzugefügt"
-#: ../revisor/base.py:1199
+#: ../revisor/base.py:1208
msgid "Populating statistics"
msgstr "Grundgesamtheit"
-#: ../revisor/base.py:1215
+#: ../revisor/base.py:1224
#, python-format
msgid "Package %s-%s:%s-%s.%s does not seem to have a archivesize header"
msgstr "Paket %s-%s:%s-%s.%s scheint keinen Archivegrössen-Kopf zu haben"
-#: ../revisor/base.py:1223
+#: ../revisor/base.py:1232
#, python-format
msgid "Package %s-%s:%s-%s.%s does not seem to have a installedsize header"
msgstr "Paket %s-%s:%s-%s.%s scheint keinen Installationsgrössen-Kopf zu haben"
-#: ../revisor/base.py:1231
+#: ../revisor/base.py:1240
#, python-format
msgid "Package %s-%s:%s-%s.%s does not seem to have a packagesize header"
msgstr "Paket %s-%s:%s-%s.%s scheint keinen Paketgrössen-Kopf zu haben"
-#: ../revisor/base.py:1241
+#: ../revisor/base.py:1250
#, python-format
msgid "Total size of all packages (archivesize): %s %s"
msgstr "Totale Grösse aller Pakete, (Archivegrösse): %s %s"
-#: ../revisor/base.py:1242
+#: ../revisor/base.py:1251
#, python-format
msgid "Total size of all packages, (installedsize): %s %s"
msgstr "Totale Grösse aller installierten Pakete, (Installationsgrösse): %s %s"
-#: ../revisor/base.py:1243
+#: ../revisor/base.py:1252
#, python-format
msgid "Total size of all packages, (packagesize): %s %s"
msgstr "Totale Grösse aller Pakete, (Paketgrösse): %s %s"
-#: ../revisor/base.py:1278
+#: ../revisor/base.py:1287
#, python-format
msgid "Report of the %d most space consuming packages"
msgstr "Bericht über die %d grössten Pakete"
-#: ../revisor/base.py:1373
-#: ../revisor/base.py:1387
-#: ../revisor/base.py:2008
+#: ../revisor/base.py:1382
+#: ../revisor/base.py:1396
+#: ../revisor/base.py:2017
#, python-format
msgid "Creating pkgdir: %s"
msgstr "Erzeuge pkgdir: %s"
#. Now for each txmbr in
#. Link the localPkg() result into the build tree
-#: ../revisor/base.py:1396
+#: ../revisor/base.py:1405
msgid "Linking in packages"
msgstr "Verkettung in Paketen"
-#: ../revisor/base.py:1415
-#: ../revisor/base.py:2032
+#: ../revisor/base.py:1424
+#: ../revisor/base.py:2041
#, python-format
msgid "Package hard link failed: %s: %s"
msgstr "Paket-Hardlink fehlgeschlagen: %s: %s"
-#: ../revisor/base.py:1420
-#: ../revisor/base.py:2037
+#: ../revisor/base.py:1429
+#: ../revisor/base.py:2046
#, python-format
msgid "Copying: %s to %s"
msgstr "Kopiere: %s zu %s"
-#: ../revisor/base.py:1423
-#: ../revisor/base.py:2040
+#: ../revisor/base.py:1432
+#: ../revisor/base.py:2049
#, python-format
msgid "Symlinking: %s to %s"
msgstr "Symlinking: %s zu %s"
-#: ../revisor/base.py:1426
-#: ../revisor/base.py:2043
+#: ../revisor/base.py:1435
+#: ../revisor/base.py:2052
msgid "Package symlink succeeded"
msgstr "Paket symlink erfolgreich"
-#: ../revisor/base.py:1428
-#: ../revisor/base.py:1435
-#: ../revisor/base.py:2045
-#: ../revisor/base.py:2052
+#: ../revisor/base.py:1437
+#: ../revisor/base.py:1444
+#: ../revisor/base.py:2054
+#: ../revisor/base.py:2061
#, python-format
msgid "Package link failed, trying copy: %s: %s"
msgstr "Paket-Link fehlgeschlagen, versuche zu kopieren: %s: %s"
-#: ../revisor/base.py:1445
+#: ../revisor/base.py:1454
msgid "Creating Repository Information"
msgstr "Erzeuge Repository-Information"
#. FIXME: Optionally recompose installer images
-#: ../revisor/base.py:1460
+#: ../revisor/base.py:1469
msgid "Building Installation Images"
msgstr "Baue Installationsabbilder"
-#: ../revisor/base.py:1466
+#: ../revisor/base.py:1475
msgid "Using already existing installer images"
msgstr "Benutze bereits vorhanden Installer-Abbilder"
-#: ../revisor/base.py:1480
+#: ../revisor/base.py:1489
msgid "Linking in release notes"
msgstr "Verkettung in Versionshinweisen"
-#: ../revisor/base.py:1492
+#: ../revisor/base.py:1501
#, python-format
msgid "Copying updates.img from %s to %s"
msgstr "Kopiere updates.img von %s zu %s"
-#: ../revisor/base.py:1501
+#: ../revisor/base.py:1510
#: ../revisor/pungi.py:414
#, python-format
msgid "copy_dir '%s' not accessible"
msgstr "copy_dir '%s' nicht zugreifbar"
-#: ../revisor/base.py:1512
+#: ../revisor/base.py:1521
#, python-format
msgid "Size of the installation tree is %s MB"
msgstr "Grösse des Installationsbaum ist %s MB"
@@ -1821,61 +1834,61 @@ 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:1562
+#: ../revisor/base.py:1571
msgid "Running pkgorder"
msgstr "Durchlaufe pkgorder"
-#: ../revisor/base.py:1625
+#: ../revisor/base.py:1634
msgid "Appending group core and base"
msgstr "Füge Gruppe core und base hinzu"
-#: ../revisor/base.py:1632
+#: ../revisor/base.py:1641
#, python-format
msgid "Appending default group %s"
msgstr "Füge Standard-Gruppe %s hinzu"
-#: ../revisor/base.py:1672
+#: ../revisor/base.py:1681
#, python-format
msgid "Appending non-default group %s"
msgstr "Füge nicht-Standard-Gruppe %s hinzu"
-#: ../revisor/base.py:1678
+#: ../revisor/base.py:1687
#, python-format
msgid "Appending non-default support group %s"
msgstr "Füge nicht-Standard-Unterstützungsgruppe %s hinzu"
-#: ../revisor/base.py:1745
+#: ../revisor/base.py:1754
#, python-format
msgid "Not running package ordering, using file %s instead"
msgstr "Führe Paket-Auflistung nicht durch, benutze deshalb Datei %s"
-#: ../revisor/base.py:1747
+#: ../revisor/base.py:1756
msgid "Not running package ordering"
msgstr "Führe Paketsortierung nicht durch"
-#: ../revisor/base.py:1779
+#: ../revisor/base.py:1788
msgid "^Install using kickstart"
msgstr "^Installation mit Kickstart"
#. Split Tree
-#: ../revisor/base.py:1802
+#: ../revisor/base.py:1811
#, python-format
msgid "Splitting Build Tree (%s)"
msgstr "Trenne Build-Baum (%s)"
#. Split repo
-#: ../revisor/base.py:1808
+#: ../revisor/base.py:1817
#, python-format
msgid "Splitting Repository (%s)"
msgstr "Trenne Repository (%s)"
-#: ../revisor/base.py:1822
+#: ../revisor/base.py:1831
#: ../revisor/modgui/build_media.py:244
#, python-format
msgid "Creating %s ISO Image #%d"
msgstr "Erzeuge %s ISO-Abbild #%d"
-#: ../revisor/base.py:1827
+#: ../revisor/base.py:1836
#: ../revisor/modgui/build_media.py:248
#, python-format
msgid "Creating %s ISO Image"
@@ -1883,114 +1896,114 @@ msgstr "Erzeuge %s ISO-Abbild"
#. 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:1841
+#: ../revisor/base.py:1850
msgid "Implanting MD5 into ISO Images"
msgstr "Erzeuge MD5 in ISO Abbildungen"
#. mediatype = built_image["mediatype"]
#. if not mediatype == 'source':
-#: ../revisor/base.py:1849
+#: ../revisor/base.py:1858
#, python-format
msgid "Implanting md5 into ISO Image: %s"
msgstr "Erzeuge md5 in ISO Abbild: %s"
-#: ../revisor/base.py:1855
+#: ../revisor/base.py:1864
msgid "Cannot implant ISO md5sum"
msgstr "ISO md5sum kann nicht erzeugt werden"
#. Do some SHA1SUMMONING
-#: ../revisor/base.py:1863
+#: ../revisor/base.py:1872
msgid "Creating SHA1SUMs for Images"
msgstr "Erzeuge SHA1SUMs für Abbild"
-#: ../revisor/base.py:1879
+#: ../revisor/base.py:1888
msgid "Creating Rescue ISO Image"
msgstr "Erzeuge Rettungs-ISO-Abbild"
-#: ../revisor/base.py:1939
+#: ../revisor/base.py:1948
#, python-format
msgid "Copying %s to %s (%d files)"
msgstr "Kopiere %s nach %s (%d Dateien)"
-#: ../revisor/base.py:1943
+#: ../revisor/base.py:1952
#, python-format
msgid "Moving %s to %s (%d files)"
msgstr "Verschiebe %s nach %s (%d Dateien)"
-#: ../revisor/base.py:1946
+#: ../revisor/base.py:1955
#, python-format
msgid ""
"Moving of the source tree failed (trying copy):\n"
"\n"
"%s"
msgstr ""
-"Verschieben des Source-Tree gescheitert (versuche zu kopieren):\n"
+"Verschieben des Quellen-Zweig gescheitert (versuche zu kopieren):\n"
"\n"
"%s"
-#: ../revisor/base.py:1949
+#: ../revisor/base.py:1958
#, python-format
msgid ""
"Copying of the source tree failed:\n"
"\n"
"%s"
msgstr ""
-"Kopieren des Source-Trees gescheitert:\n"
+"Kopieren des Quellen-Zweiges gescheitert:\n"
"\n"
"%s"
-#: ../revisor/base.py:1954
+#: ../revisor/base.py:1963
#: ../revisor/pungi.py:410
#, python-format
msgid "Copying %s to %s"
msgstr "Kopiere %s zu %s"
-#: ../revisor/base.py:1958
+#: ../revisor/base.py:1967
#, python-format
msgid ""
"Copying of the installation tree failed:\n"
"\n"
"%s"
msgstr ""
-"Kopieren des Installations Source-Tree gescheitert:\n"
+"Kopieren des Installations-Quellenzweigs gescheitert:\n"
"\n"
"%s"
-#: ../revisor/base.py:1964
+#: ../revisor/base.py:1973
msgid "Creating ext3 filesystem"
msgstr "Erzeuge ext3-Dateisystem"
-#: ../revisor/base.py:1971
+#: ../revisor/base.py:1980
msgid "Configuring System"
msgstr "Konfiguriere System"
#. Now for each txmbr in
#. Link the localPkg() result into the build tree
-#: ../revisor/base.py:2017
+#: ../revisor/base.py:2026
msgid "Linking in Source packages"
msgstr "Verkettung in Quellen-Paketen"
-#: ../revisor/base.py:2072
+#: ../revisor/base.py:2081
#, python-format
msgid "Setting rundir to %s"
msgstr "Setze rundir auf %s"
-#: ../revisor/base.py:2078
+#: ../revisor/base.py:2087
#, python-format
msgid "Directory %s could not be created. Aborting"
msgstr "Verzeichnis %s kann nicht erzeugt werden. Abbruch"
-#: ../revisor/base.py:2080
+#: ../revisor/base.py:2089
#, python-format
msgid "Running command: %s"
msgstr "Führe Befehl aus: %s"
-#: ../revisor/base.py:2081
+#: ../revisor/base.py:2090
#, python-format
msgid "Extra information: %s %s %s"
msgstr "Extra-Information: %s %s %s"
-#: ../revisor/base.py:2109
+#: ../revisor/base.py:2118
#, python-format
msgid "Got an error from %s (return code %s)"
msgstr "Erhalte einen Fehler von %s (return code %s)"
@@ -2020,7 +2033,7 @@ msgstr "Überprüfe Arbeitsverzeichnis"
#: ../revisor/cfg.py:338
#, python-format
msgid "The directories Revisor uses in %s already exist. This could possibly hold data from a previous run. Please remove or move them to a safe location, then confirm to continue. If you do not move or remove the files, Revisor will simply delete them."
-msgstr "Das Revisor-Verzeichnis, das in %s verwendet wird, existiert schon. Dies kann möglicherweise Daten von einen vorherigen durchlauf enthalten. Bitte löschen oder verschieben Sie diese zu einer sicheren Speicherstelle und fahren sie fort. Falls die die Dateien nicht verschieben oder löschen wird Revisor sie einfach löschen."
+msgstr "Das Revisor-Verzeichnis, das in %s verwendet wird, existiert schon. Dies kann möglicherweise Daten von einen vorherigen Durchlauf enthalten. Bitte löschen oder verschieben Sie diese zu einer sicheren Speicherstelle und fahren sie fort. Falls die die Dateien nicht verschieben oder löschen wird Revisor sie einfach löschen."
#: ../revisor/cfg.py:262
#: ../revisor/cfg.py:340
@@ -2084,7 +2097,7 @@ msgstr "Setze Ziel-Verzeichnis auf %s:"
#: ../revisor/modvirt/__init__.py:73
#, python-format
msgid "Cannot access %s, please check the permissions so we can try again."
-msgstr "Zugriff zu %s verweigert, bitte überprüfen Sie die Berechtigungen und versuchen Sie es nocheinmal."
+msgstr "Zugriff zu %s verweigert, bitte überprüfen Sie die Berechtigungen und versuchen Sie es noch einmal."
#: ../revisor/cfg.py:403
#, python-format
@@ -2094,7 +2107,7 @@ msgstr "Architektur-Liste: %r"
#: ../revisor/cfg.py:435
#, python-format
msgid "Repository %s specified in the kickstart already exists"
-msgstr "Repository %s angegebene in der Kickstart-Datei exisitiert bereits"
+msgstr "Repository %s angegebene in der Kickstart-Datei existiert bereits"
#: ../revisor/cfg.py:440
#, python-format
@@ -2123,11 +2136,11 @@ msgstr "Die Yum-Systemkonfigurationsdatei /etc/yum.conf kann nicht mit Revisor a
#: ../revisor/cfg.py:561
#, python-format
msgid "File %s does not exist (used as 'main' configuration directive in model %s)"
-msgstr "Datei %s existiert nicht (verwendet als 'main' Konfigurationsanweisunge in Darstellung %s)"
+msgstr "Datei %s existiert nicht (verwendet als 'main' Konfigurationsanweisungen in Darstellung %s)"
#: ../revisor/cfg.py:567
msgid "The ISO label cannot be longer then 32 characters due to Joliet limitations"
-msgstr "Die ISO Kennung darf nicht länger als 32 Zeichen sein, laut Joliet Beschränkungen"
+msgstr "Die ISO Kennung darf nicht länger als 32 Zeichen sein, laut Joliet-Beschränkungen"
#: ../revisor/cfg.py:577
#, python-format
@@ -2193,118 +2206,120 @@ msgstr "Darstellung %s konfiguriert in der Konfigurationsdatei %s, aber eine sol
msgid "Tried to load model %s but it doesn't exist inconfiguration file %s"
msgstr "Es wurde versucht Darstellung %s zu laden aber die Darstellung existiert nicht in der Konfigurationsdatei %s"
-#: ../revisor/cfg.py:710
+#: ../revisor/cfg.py:713
#, python-format
msgid "Model %s has no configuration directive 'main' which is required"
msgstr "Darstellung %s hat keine Konfigurationsanweisung 'main' ist erforderlich"
-#: ../revisor/cfg.py:713
+#: ../revisor/cfg.py:716
#, python-format
msgid "Testing for configuration parameter %s"
msgstr "Testen des Konfigurationsparameters %s"
-#: ../revisor/cfg.py:742
+#: ../revisor/cfg.py:745
#, python-format
msgid "Setting %s to %r (from configuration file model %s)"
msgstr "Einstellungen %s auf %r (aus dem Konfigurationsdatei-Modell %s)"
-#: ../revisor/cfg.py:776
+#: ../revisor/cfg.py:779
#, python-format
msgid "Configuration file %s not readable"
msgstr "Konfigurationsdatei %s nicht lesbar "
-#: ../revisor/cfg.py:779
+#: ../revisor/cfg.py:782
#: ../revisor/modgui/configuration.py:465
#, python-format
msgid "Reading configuration file %s"
msgstr "Lesen Konfigurations-Datei %s"
-#: ../revisor/cfg.py:783
+#: ../revisor/cfg.py:786
#, python-format
msgid "Invalid configuration file %s"
msgstr "Ungültige Konfigurationsdatei %s"
-#: ../revisor/cfg.py:786
+#: ../revisor/cfg.py:789
#, python-format
msgid "No master configuration section [revisor] in configuration file %s"
msgstr "Kein Master-Konfigurationsabschnitt [revisor] in Konfigurationsdatei %s"
-#: ../revisor/cfg.py:820
+#: ../revisor/cfg.py:823
#, python-format
msgid "Setting %s to %r (from configuration file)"
msgstr "Setze %s auf %r (aus Konfigurationsdatei)"
-#: ../revisor/cfg.py:824
+#: ../revisor/cfg.py:827
msgid "Setting options from command-line"
msgstr "Setze Optionen von der Kommandozeile"
-#: ../revisor/cfg.py:838
-#: ../revisor/cfg.py:845
+#: ../revisor/cfg.py:841
+#: ../revisor/cfg.py:848
#, python-format
msgid "Setting %s to %r (from command line)"
msgstr "Setze %s auf %r (von der Kommandozeile)"
-#: ../revisor/cfg.py:840
+#: ../revisor/cfg.py:843
#, python-format
msgid "Checked setting %s through plugin"
msgstr "Einstellungen %s durch Plugin geprüft"
-#: ../revisor/cfg.py:843
+#: ../revisor/cfg.py:846
#, python-format
msgid "No check_setting_%s()"
msgstr "Keine check_setting_%s()"
-#: ../revisor/cfg.py:847
+#: ../revisor/cfg.py:850
#, python-format
msgid "Not setting %s to %r (command line matches default)"
msgstr "Setze %s nicht auf %r (Kommandozeile stimmt mit dem Standard überein)"
-#: ../revisor/cfg.py:889
+#: ../revisor/cfg.py:892
msgid "Updates.img is only usable with installation media. Please remove --updates-img or also build installation media."
msgstr "Updates.img ist brauchbar mit Installationsmedien. Bitte entfernen Sie --updates-img oder bauen Sie auch Installationsmedien."
-#: ../revisor/cfg.py:893
+#: ../revisor/cfg.py:896
msgid "Kickstart failed"
msgstr "Kickstart fehlgeschlagen"
-#: ../revisor/cfg.py:898
+#: ../revisor/cfg.py:903
+#: ../revisor/cfg.py:908
#, python-format
msgid "Kickstart file %s not readable"
msgstr "Kickstart-Datei %s nicht lesbar."
-#: ../revisor/cfg.py:900
+#: ../revisor/cfg.py:905
+#: ../revisor/cfg.py:910
#, python-format
msgid "Kickstart file %s fails to load, continuing with defaults"
msgstr "Kickstart-Datei %s laden fehlgeschlagen, weiter mit Standard"
-#: ../revisor/cfg.py:903
+#: ../revisor/cfg.py:913
msgid "No kickstart file specified"
-msgstr "Keine Kicstart-Datei festgelegt"
+msgstr "Keine Kickstart-Datei festgelegt"
-#: ../revisor/cfg.py:906
-#: ../revisor/cfg.py:927
+#: ../revisor/cfg.py:916
+#: ../revisor/cfg.py:937
msgid "No media specified"
msgstr "Kein Medium festgelegt"
-#: ../revisor/cfg.py:909
+#: ../revisor/cfg.py:919
msgid "When composing in respin mode, you can only select one type of media install, live or virtual. You can however select multiple media such as cd, dvd, etc."
msgstr "Wenn zusammengestellt wird im Respin-Modus, können Sie nur einen Typ von Medium-Installation wählen, entweder live oder virtuell. Sie können aber verschiedene Medien-Type, wie CD, DVD, usw. auswählen. "
-#: ../revisor/cfg.py:954
+#: ../revisor/cfg.py:964
#, python-format
msgid "pulling self.packages_list[%r][%r][%r][%r]"
-msgstr "pulling self.packages_list[%r][%r][%r][%r]"
+msgstr "Ziehe self.packages_list[%r][%r][%r][%r]"
-#: ../revisor/cfg.py:959
+#: ../revisor/cfg.py:969
#, python-format
msgid "returning pkg_list: %r"
msgstr "returning pkg_list: %r"
-#: ../revisor/cfg.py:1077
+#: ../revisor/cfg.py:1087
msgid "Run from image"
msgstr "Laufe von Abbild"
-#: ../revisor/cfg.py:1078
+#: ../revisor/cfg.py:1088
msgid "Run from RAM - requires 1 GB+"
msgstr "Laufe von RAM - benötigt 1 GB+"
@@ -2331,7 +2346,7 @@ msgstr "Installiere Software"
#: ../revisor/image.py:142
msgid "SELinux requested but not enabled on host"
-msgstr "SELinux wird benötigt, ist aber nicht aktiviert auf dem Host"
+msgstr "SELinux wird benötigt, ist aber nicht aktiviert auf dem Rechner"
#: ../revisor/image.py:194
#, python-format
@@ -2346,250 +2361,250 @@ msgstr "Setze self.cfg.payload_livemedia auf %s (von der totalen Installationsgr
#. #
#. # Runtime Options
#. #
-#: ../revisor/__init__.py.in:85
+#: ../revisor/__init__.py.in:86
msgid "Runtime Options"
msgstr "Laufzeit-Optionen"
-#: ../revisor/__init__.py.in:90
+#: ../revisor/__init__.py.in:91
msgid "Use the CLI rather then GUI"
msgstr "Benutze das CLI statt des GUI"
-#: ../revisor/__init__.py.in:95
+#: ../revisor/__init__.py.in:96
msgid "Force Revisor to use the GUI. Does not fallback to CLI and thus shows GUI related errors"
msgstr "Zwinge Revisor zur Benutzung des GUI. Geht nicht zurück zu CLI und zeigt GUI-bezogene Fehler an"
-#: ../revisor/__init__.py.in:100
+#: ../revisor/__init__.py.in:101
msgid "List available models"
msgstr "Liste der verfügbaren Modelle"
-#: ../revisor/__init__.py.in:105
+#: ../revisor/__init__.py.in:106
msgid "Development mode. Skips some tasks that take time."
msgstr "Entwicklungsmodus. Überspringt ein paar Schritte, welche viel Zeit brauchen."
-#: ../revisor/__init__.py.in:110
+#: ../revisor/__init__.py.in:111
msgid "Report the sizes of all RPMs selected in a list"
msgstr "Zeige die Grösse von allen gewählten RPMs in dieser Liste"
-#: ../revisor/__init__.py.in:115
+#: ../revisor/__init__.py.in:116
msgid "Force Revisor to interpret the package manifest as complete package nevra (name, epoch, version, release and architecture). Implies --kickstart-exact"
msgstr "Forciere Revisor zum Interpretieren des Paket-Manifest als komplettes Paket nevra (name, epoch, version, release und architecture). Braucht --kickstart-exact"
-#: ../revisor/__init__.py.in:120
+#: ../revisor/__init__.py.in:121
msgid "Tells Revisor to ignore @core and @base (or %packages --nobase) and only add what is in the package manifest"
msgstr "Sagt Revisor, dass @core und @base ignoriert werden (oder %package --nobase) und nur hinzugefügt wird, was im Paket-Manifest ist"
-#: ../revisor/__init__.py.in:126
+#: ../revisor/__init__.py.in:127
msgid "Should Revisor not clean up at all (0), clean up it's temporary build data (1), or everything -this includes the yum cache (2)"
msgstr "Soll Revisor nicht alles aufräumen (0), räume nur temporäre Bau-Daten auf (1) oder alle, inklusive des Yum-Zwischenspeichers, (2)"
-#: ../revisor/__init__.py.in:132
+#: ../revisor/__init__.py.in:133
msgid "Size of the USB Thumb Drive. Default to 4G."
msgstr "Grösse des USB-Speichergerätes. Standardmässig 4 GB."
-#: ../revisor/__init__.py.in:141
+#: ../revisor/__init__.py.in:142
msgid "Set debugging level (0 by default)"
msgstr "Setze Debugging-Stufe (0 standardmässig)"
-#: ../revisor/__init__.py.in:150
+#: ../revisor/__init__.py.in:151
msgid "Answer all questions as 'yes'"
msgstr "Beantworte alle Fragen mit 'ja'"
#. #
#. # Configuration Options
#. #
-#: ../revisor/__init__.py.in:155
+#: ../revisor/__init__.py.in:156
msgid "Configuration Options"
msgstr "Konfigurationsoptionen"
#. Might be disabled for testing purposes
#. default = os.path.join(BASE_CONFD_DIR,"fedora-7-gold.cfg"),
-#: ../revisor/__init__.py.in:162
+#: ../revisor/__init__.py.in:163
msgid "Use kickstart file"
msgstr "Benutze Kickstart-Datei"
-#: ../revisor/__init__.py.in:168
+#: ../revisor/__init__.py.in:169
msgid "Save options to given file (as a kickstart)"
msgstr "Speichern Sie die Optionen in eine Datei (als kickstart)"
-#: ../revisor/__init__.py.in:174
+#: ../revisor/__init__.py.in:175
msgid "Revisor configuration file to use"
-msgstr "Zu benutzende Revisor Konfigurationsdatei"
+msgstr "Zu benutzende Revisor-Konfigurationsdatei"
-#: ../revisor/__init__.py.in:180
+#: ../revisor/__init__.py.in:181
msgid "Get the sources to go with the binaries"
msgstr "Bekommen Sie die Quellen, welche mit den Binaries kommen"
-#: ../revisor/__init__.py.in:185
+#: ../revisor/__init__.py.in:186
msgid "Destination directory for products"
msgstr "Ziel-Verzeichnis für Produkte"
-#: ../revisor/__init__.py.in:191
+#: ../revisor/__init__.py.in:192
msgid "Working directory"
msgstr "Arbeitsverzeichnis"
-#: ../revisor/__init__.py.in:197
+#: ../revisor/__init__.py.in:198
msgid "Model to use for composing"
msgstr "Modell zum Benutzen für die Zusammenstellung"
-#: ../revisor/__init__.py.in:203
+#: ../revisor/__init__.py.in:204
msgid "Mode to use for composing updated spins"
msgstr "Modus zum Benutzen für die Zusammenstellung von aktualisierten Spins"
-#: ../revisor/__init__.py.in:208
+#: ../revisor/__init__.py.in:209
msgid "Sometimes, it's better to copy local data rather then (sym)linking it. If you have enough space..."
msgstr "Manchmal ist es besser lokale Dateien zu kopieren statt zu ver(sym)linken. Wenn Sie genügend Platz haben... "
-#: ../revisor/__init__.py.in:213
+#: ../revisor/__init__.py.in:214
msgid "Directory to copy onto the media"
msgstr "Verzeichnis zum Kopieren auf das Medium"
#. #
#. # Installation Media Options
#. #
-#: ../revisor/__init__.py.in:218
+#: ../revisor/__init__.py.in:219
msgid "Installation Media Options"
msgstr "Installationsmedium-Typen"
-#: ../revisor/__init__.py.in:223
+#: ../revisor/__init__.py.in:224
msgid "Create Installation Media CDs (Capacity per disc: 685MB)"
msgstr "Erzeuge Installations-Medium CDs (Kapazität pro Disc: 685 MB)"
-#: ../revisor/__init__.py.in:228
+#: ../revisor/__init__.py.in:229
msgid "Create Installation Media DVDs (Capacity per disc: 4.3GB)"
msgstr "Erzeuge Installations-Medium DVDs (Kapazität pro Disc: 4.3 GB)"
-#: ../revisor/__init__.py.in:233
+#: ../revisor/__init__.py.in:234
msgid "Create Installation Media Dual-Layered DVDs (Capacity per disc: 8.5GB)"
msgstr "Erzeuge Installations-Medium Duallayer-DVDs (Kapazität pro Disc: 8.5 GB)"
-#: ../revisor/__init__.py.in:238
+#: ../revisor/__init__.py.in:239
msgid "Create Installation Media Blu-Ray Discs (Capacity per disc: 50GB)"
msgstr "Erzeuge Installations-Medium Blue-Ray-Discs ((Kapazität pro Disc: 50 GB))"
-#: ../revisor/__init__.py.in:243
+#: ../revisor/__init__.py.in:244
msgid "Create Unified ISO from install tree"
msgstr "Erzeuge Unified-ISO aus dem Installationsbaum"
-#: ../revisor/__init__.py.in:254
+#: ../revisor/__init__.py.in:255
msgid "Create the Installation Tree."
msgstr "Erzeuge den Installationsbaum."
-#: ../revisor/__init__.py.in:259
+#: ../revisor/__init__.py.in:260
msgid "Create Media without graphical installer."
msgstr "Erstelle Medium ohne grafischen Installer."
-#: ../revisor/__init__.py.in:264
+#: ../revisor/__init__.py.in:265
msgid "Include kickstart file on media or in the tree"
msgstr "Kickstart-Datei auf Medium oder in Baum integrieren"
-#: ../revisor/__init__.py.in:269
+#: ../revisor/__init__.py.in:270
msgid "In the bootloader menu (isolinux.cfg), set kickstart to boot by default (works with --kickstart-include)"
msgstr "Im Bootloader-Menü (isolinux.cfg), setze Kickstart zum Starten als Standard (arbeitet mit --kickstart-include)"
-#: ../revisor/__init__.py.in:274
+#: ../revisor/__init__.py.in:275
msgid "Filter anything from comps that is not in the package set"
msgstr "Filtere alles von comps, was nicht im Paket-Set ist"
-#: ../revisor/__init__.py.in:279
+#: ../revisor/__init__.py.in:280
msgid "Use Revisor's comps file instead of those from the repositories"
msgstr "Benutze Revisors comps-Datei statt diesen aus den Repositories "
-#: ../revisor/__init__.py.in:284
+#: ../revisor/__init__.py.in:285
msgid "Comps file to include on the installation media"
msgstr "Inklusive comp-Datei auf dem Installationsmedium"
-#: ../revisor/__init__.py.in:289
+#: ../revisor/__init__.py.in:290
msgid "Include specified updates.img on installation media."
msgstr "Inklusive spezielles updates.img auf dem Installationsmedium"
-#: ../revisor/__init__.py.in:295
+#: ../revisor/__init__.py.in:296
msgid "Product Name"
msgstr "Produktname"
-#: ../revisor/__init__.py.in:300
+#: ../revisor/__init__.py.in:301
msgid "Product Path (e.g. Fedora/ or Packages/ -but without the appending slash)"
msgstr "Produkt-Pfad (z. B. Fedora/ oder Pakate/ -aber ohne abschliessenden Schrägstrich)"
-#: ../revisor/__init__.py.in:305
+#: ../revisor/__init__.py.in:306
msgid "ISO Label Base. Note that other things are appended but that the length can be 32 chars maximum."
msgstr "ISO-Bezeichnung Base. Beachten Sie, dass andere Dinge angehängt werden können, aber das die maximale Länge nur 32 Zeichen sein kann."
-#: ../revisor/__init__.py.in:310
+#: ../revisor/__init__.py.in:311
msgid "The base name for the ISOs"
msgstr "Der Basisname für die ISO(s) angegeben"
-#: ../revisor/__init__.py.in:315
+#: ../revisor/__init__.py.in:316
msgid "Product Version"
msgstr "Produkt-Version"
-#: ../revisor/__init__.py.in:320
+#: ../revisor/__init__.py.in:321
msgid "Base Product Version - relevant to required packages and pykickstart compatibility"
msgstr "Basis-Produktversion - relevant für die Erhaltung der Paket- und pykickstart-Kompatibilität"
#. #
#. # Utility Media Options
#. #
-#: ../revisor/__init__.py.in:325
+#: ../revisor/__init__.py.in:326
msgid "Utility Media Options"
msgstr "Hilfsmedium-Optionen"
-#: ../revisor/__init__.py.in:330
+#: ../revisor/__init__.py.in:331
msgid "Create Rescue Media"
msgstr "Erzeuge Rettungsmedium"
#. #
#. # Live Media Options
#. #
-#: ../revisor/__init__.py.in:335
+#: ../revisor/__init__.py.in:336
msgid "Live Media Options"
msgstr "Live-Medien-Optionen"
-#: ../revisor/__init__.py.in:340
+#: ../revisor/__init__.py.in:341
msgid "Create Live Media CD/DVD"
msgstr "Erzeuge Live-Medium CD/DVD"
-#: ../revisor/__init__.py.in:345
+#: ../revisor/__init__.py.in:346
msgid "Create Live Media Thumb Drive Image (will be depreciated)"
msgstr "Erzeuge Live Medium Speicherstick-Abbild (wird entfernt)"
-#: ../revisor/__init__.py.in:350
+#: ../revisor/__init__.py.in:351
msgid "Create Live Media Hard Disk Image (will be depreciated)"
msgstr "Erzeuge Live-Medium Harddisk-Abbild (wird entfernt)"
-#: ../revisor/__init__.py.in:355
+#: ../revisor/__init__.py.in:356
msgid "Create Live Media Raw Hard Disk Image"
-msgstr "Erzeuge Live-Medium Roh-HarddiskAbbild"
+msgstr "Erzeuge Live-Medium Roh-Harddisk-Abbild"
-#: ../revisor/__init__.py.in:360
+#: ../revisor/__init__.py.in:361
msgid "Interactively work in the live image before building the ISO image."
msgstr "Interaktive Arbeiten im Live-Abbild vor dem Bauen des ISO-Abbildes."
-#: ../revisor/__init__.py.in:365
+#: ../revisor/__init__.py.in:366
msgid "Skip file system compression."
msgstr "Überspringe Dateisystem-Komprimierung"
-#: ../revisor/__init__.py.in:370
+#: ../revisor/__init__.py.in:371
msgid "Skip prelinking the contents of the filesystem."
msgstr "Überspringe das vorgängige Verlinken des Inhalts auf dem Dateisystems."
-#: ../revisor/__init__.py.in:375
+#: ../revisor/__init__.py.in:376
msgid "Ignore filesystem overhead. Useless blocks will not be removed from the filesystem."
msgstr "Ignoriere Dateisystem-Overhead. Unnötige Blöcke werden nicht vom Dateisystem entfernt."
-#: ../revisor/__init__.py.in:380
+#: ../revisor/__init__.py.in:381
msgid "Set the preferred kernel. One of normal, PAE, xen or debug."
msgstr "Setze den bevorzugten Kernel. Einer von normal, PAE, xen oder debug."
-#: ../revisor/__init__.py.in:421
+#: ../revisor/__init__.py.in:422
#, python-format
msgid " %s - No Description"
msgstr " %s - Keine Beschreibung"
-#: ../revisor/__init__.py.in:441
+#: ../revisor/__init__.py.in:442
msgid "Interrupted by user"
msgstr "Unterbrochen durch Benutzer"
-#: ../revisor/__init__.py.in:448
+#: ../revisor/__init__.py.in:449
msgid "Traceback occurred, please report a bug at http://fedorahosted.org/revisor"
msgstr "Traceback aufgetreten, bitte unter http://fedorahosted.org/revisor einen Fehlerbericht ausfüllen"
@@ -2695,7 +2710,7 @@ msgstr "Kann Laufzeit nicht setzen für Plugin %s: %s"
#: ../revisor/plugins.py:117
#, python-format
msgid "Not setting runtime for plugin %s: No function 'set_runtime()'"
-msgstr "Kein laufzeiteinstellungen für Plugin %s: Kein Funktion 'set_runtime()'"
+msgstr "Kein Laufzeiteinstellungen für Plugin %s: Kein Funktion 'set_runtime()'"
#: ../revisor/plugins.py:134
#, python-format
@@ -2715,7 +2730,7 @@ msgstr "Kann Optionen nicht prüfen für Plugin %s: %s"
#: ../revisor/plugins.py:156
#, python-format
msgid "Not checking options for plugin %s: No function 'check_options()'"
-msgstr "Keien Prüfoptionen für Plugin %s: Keine Funktion 'check_options()'"
+msgstr "Keine Prüfoptionen für Plugin %s: Keine Funktion 'check_options()'"
#: ../revisor/plugins.py:192
#, python-format
@@ -2773,14 +2788,14 @@ msgstr "Kann Hook %s für Plugin %s nicht ausführen: %s"
#: ../revisor/modgui/build_media.py:282
#: ../revisor/modgui/build_media.py:291
msgid "Pending..."
-msgstr "Bevorstehend..."
+msgstr "Offen ..."
#: ../revisor/progress.py:80
#: ../revisor/progress.py:83
#: ../revisor/modgui/build_media.py:292
#: ../revisor/modgui/build_media.py:295
msgid "Running..."
-msgstr "Läuft..."
+msgstr "Läuft ..."
#: ../revisor/progress.py:84
#: ../revisor/progress.py:87
@@ -2812,7 +2827,7 @@ msgstr "Unfähig %s zu öffnen: %s"
#: ../revisor/progress.py:367
#, python-format
msgid "Installing %s"
-msgstr "Installe %s"
+msgstr "Installiere %s"
#: ../revisor/progress.py:226
#: ../revisor/progress.py:387
@@ -2859,7 +2874,7 @@ msgstr "Fehler: Kann Zielverzeichnis %s nicht neu erstellen"
#: ../revisor/pungi.py:342
msgid "Getting relnotes..."
-msgstr "Beziehen Versionshinweise..."
+msgstr "Beziehen Versionshinweise ..."
#: ../revisor/pungi.py:363
#, python-format
@@ -2874,7 +2889,7 @@ msgstr "Kopiere %s"
#: ../revisor/pungi.py:389
#, python-format
msgid "Could not access directory %s, cannot copy extra files onto the media."
-msgstr "Kann nciht auf Verzeichnis %s zugreifen, kann extra Dateien nicht auf das Medium kopieren."
+msgstr "Kann nicht auf Verzeichnis %s zugreifen, kann extra Dateien nicht auf das Medium kopieren."
#: ../revisor/pungi.py:395
#, python-format
@@ -2906,13 +2921,13 @@ msgid "Hacking anaconda's .discinfo because it'll shit itself if it reads it's o
msgstr "Hacke Anacondas .discinfo, weil Dinge macht, welche es nicht sollte."
#: ../revisor/modcobbler/__init__.py:69
-#: ../revisor/modcobbler/__init__.py:218
-#: ../revisor/modcobbler/__init__.py:255
+#: ../revisor/modcobbler/__init__.py:219
+#: ../revisor/modcobbler/__init__.py:256
#, python-format
msgid "There is a problem connecting to %s"
msgstr "Es gibt ein Problem bei der Verbindung %s"
-#: ../revisor/modcobbler/__init__.py:82
+#: ../revisor/modcobbler/__init__.py:83
#, python-format
msgid ""
" Distro: %s\n"
@@ -2921,58 +2936,58 @@ msgstr ""
" Distro: %s\n"
" Existierende Profile:"
-#: ../revisor/modcobbler/__init__.py:82
+#: ../revisor/modcobbler/__init__.py:83
msgid "name"
msgstr "Name"
-#: ../revisor/modcobbler/__init__.py:84
+#: ../revisor/modcobbler/__init__.py:85
#, python-format
msgid " Profile: %s"
msgstr " Profil: %s"
-#: ../revisor/modcobbler/__init__.py:86
+#: ../revisor/modcobbler/__init__.py:87
msgid "No listing found on cobbler server."
msgstr "Keinen horchenden Cobbler-Server gefunden."
-#: ../revisor/modcobbler/__init__.py:103
+#: ../revisor/modcobbler/__init__.py:104
msgid "Add compose to a Cobbler server as both a Distribution and Profile."
msgstr "Ergänzt Zusammenstellung auf einem Cobbler Server als eine Distribution und Profil."
-#: ../revisor/modcobbler/__init__.py:110
+#: ../revisor/modcobbler/__init__.py:111
msgid "Add compose options as a Profile to a Cobbler server. [Requires --cobbler-use-distro]"
msgstr "Füge Zusammenstellungsoptionen als Profil zu einem Cobbler-Server. [benötigt --cobbler-use-distro]"
-#: ../revisor/modcobbler/__init__.py:117
+#: ../revisor/modcobbler/__init__.py:118
msgid "Use a Cobbler distro as source for package data."
msgstr "Benutze Cobbler-Profil als Quelle für die Paket-Daten."
-#: ../revisor/modcobbler/__init__.py:124
+#: ../revisor/modcobbler/__init__.py:125
msgid "Use a Cobbler profile as source for kickstart data."
msgstr "Benutze Cobbler-Profil als Quelle für die Kickstart-Daten."
-#: ../revisor/modcobbler/__init__.py:131
+#: ../revisor/modcobbler/__init__.py:132
msgid "List options provided by cobbler."
msgstr "Liste Optionen, welche von Cobbler bereitgestellt werden, auf."
-#: ../revisor/modcobbler/__init__.py:137
+#: ../revisor/modcobbler/__init__.py:138
msgid "Use remote cobbler server."
msgstr "Benutze entfernten Cobbler-Server"
-#: ../revisor/modcobbler/__init__.py:143
+#: ../revisor/modcobbler/__init__.py:144
msgid "Remote cobbler server port."
msgstr "Entfernter Cobbler-Server-Port"
-#: ../revisor/modcobbler/__init__.py:200
+#: ../revisor/modcobbler/__init__.py:201
msgid "Specifying a Cobbler server is only supported for read-only actions. Currently, --cobbler-use-distro and --cobbler-use-profile."
msgstr "Angeben eine Cobbler-Server ist nur für lesende Aktionen unterstützt. Momentan --cobbler-use-distro und --cobbler-use-profile."
-#: ../revisor/modcobbler/__init__.py:225
+#: ../revisor/modcobbler/__init__.py:226
#, python-format
msgid "The distro '%s' does not exist."
msgstr "Die Distribution '%s' existiert nicht."
-#: ../revisor/modcobbler/__init__.py:239
-#: ../revisor/modcobbler/__init__.py:262
+#: ../revisor/modcobbler/__init__.py:240
+#: ../revisor/modcobbler/__init__.py:263
#, python-format
msgid "The profile '%s' does not exist."
msgstr "Das Profil '%s' existiert nicht."
@@ -3082,7 +3097,7 @@ msgstr "Konfiguriere Netzwerk"
#: ../revisor/modgui/build_media.py:151
#: ../revisor/modgui/build_media.py:259
msgid "Create RAM Filesystem"
-msgstr "Erzeuge RAM Dateisystem"
+msgstr "Erzeuge RAM-Dateisystem"
#: ../revisor/modgui/build_media.py:152
#: ../revisor/modgui/build_media.py:260
@@ -3092,7 +3107,7 @@ msgstr "Bezeichne System um"
#: ../revisor/modgui/build_media.py:153
#: ../revisor/modgui/build_media.py:261
msgid "Configure Bootloader"
-msgstr "Konfiguriere BootLoader"
+msgstr "Konfiguriere Boot-Loader"
#: ../revisor/modgui/build_media.py:156
msgid "Launch shell"
@@ -3101,7 +3116,7 @@ msgstr "Starte Shell"
#: ../revisor/modgui/build_media.py:159
#: ../revisor/modgui/build_media.py:267
msgid "Unmounting filesystems"
-msgstr "Unmounting Datei-Systeme"
+msgstr "Hänge Datei-Systeme aus"
#: ../revisor/modgui/build_media.py:163
#: ../revisor/modgui/build_media.py:271
@@ -3146,7 +3161,7 @@ msgstr "Erzeuge Live-ISO-Abbild"
#: ../revisor/modgui/configuration.py:123
msgid "You have not specified a Base URL or Mirror List"
-msgstr "Sie haben keinen Basis-URL oder Mirror-Liste angegeben"
+msgstr "Sie haben keinen Basis-URL oder Spiegel-Liste angegeben"
#: ../revisor/modgui/configuration.py:126
msgid "GPG Check enabled but no valid GPG Key file found"
@@ -3169,7 +3184,7 @@ msgstr "%s ist keine gültige Revisor Konfigurationsdatei"
#: ../revisor/modgui/configuration.py:238
msgid "The configured model does not have the mandatory 'main' configuration directive."
-msgstr "Das konfigurierte Modell hat die zwingend vorausgesetzte 'main'-Abbschnitt in der Konfigurationsdirektive nicht."
+msgstr "Das konfigurierte Modell hat die zwingend vorausgesetzte 'main'-Abschnitt in der Konfigurationsdirektive nicht."
#: ../revisor/modgui/configuration.py:240
msgid "Invalid model. Please choose a valid model."
@@ -3208,7 +3223,7 @@ msgstr "Prüfe aktuelles Verzeichnis."
#: ../revisor/modgui/__init__.py:122
msgid "GUI Mode didn't get RevisorBase instance, which is fatal."
-msgstr "GUI-Modus gibt keine RevisorBase-Instanz zurüch, dies ist fatal."
+msgstr "GUI-Modus gibt keine RevisorBase-Instanz zurück, dies ist fatal."
#: ../revisor/modgui/__init__.py:191
#, python-format
@@ -3338,7 +3353,7 @@ msgstr "Paket %s war nicht markiert in Gruppe %s"
#: ../revisor/modgui/package_selection.py:427
#, python-format
msgid "No package named %s available to be installed: %s"
-msgstr "Kein Paketmit Namen %s verfügbar zum Installieren: %s"
+msgstr "Kein Paket mit Namen %s verfügbar zum Installieren: %s"
#: ../revisor/modgui/package_selection.py:441
msgid "Adding in packages from Kickstart Data, please wait"
@@ -3415,7 +3430,7 @@ msgstr "Kein Live-Medium-Typ gewählt, mindestens ein Typ von Live-Medium wähle
#: ../revisor/modgui/select_media.py:376
msgid "No virtualization media type selected, select at least one type of virtualization media."
-msgstr "Kein VIrtualisierungsmedium-Typ gewählt, mindestens ein Typ von Virtualieisierungsmedium wählen."
+msgstr "Kein VIrtualisierungsmedium-Typ gewählt, mindestens ein Typ von Virtualisierungsmedium wählen."
#: ../revisor/modgui/select_media.py:433
msgid "No utility media type selected, select at least one type of utility media."
@@ -3451,7 +3466,7 @@ msgstr "Kann comps nicht finden. Kein comps, keine Ruhm"
#: ../revisor/modisolinux/__init__.py:48
msgid "Custom isolinux.cfg to replace the standard isolinux.cfg with."
-msgstr "Benutzerspezifische isolinux.cfg zum Erstetzen der Standard isolinux-cfg."
+msgstr "Benutzerspezifische isolinux.cfg zum Ersetzen der Standard isolinux-cfg."
#: ../revisor/modisolinux/__init__.py:57
msgid "Both --kickstart-default and --isolinux-cfg have been specified, while they are mutually exclusive. --isolinux-cfg is going to be used."
@@ -3491,7 +3506,7 @@ msgstr "Entferne Paket: %s-%s:%s-%s.%s für Rebranding"
#: ../revisor/modrebrand/__init__.py:91
msgid "Rebrand name. Revisor will select <name>-logos, <name>-release and <name>-release-notes packages, if available."
-msgstr "Rebrand Name. Revisor wird <name>-logos, <name>-release und <name>-release-notes packages wählen, falls verfügbar."
+msgstr "Rebrand Name. Revisor wird <name>-logos, <name>-release und <name>-release-notes-Paket wählen, falls verfügbar."
#: ../revisor/modreuseinstaller/__init__.py:48
msgid "The URI to a tree we're supposed to reuse the installer images from."
@@ -3500,23 +3515,23 @@ msgstr ""
#: ../revisor/modreuseinstaller/__init__.py:62
#, python-format
msgid "Could not access %s/%s, required for reusing a previous tree. Cancelling the reuse of installer images"
-msgstr "Konte auf %s/%s nicht zugreigen, dies wird aber benötigt für die Wiederverwendung des vorherigen Baums. Breche Weiderverwendung von Installer-Abbildern ab"
+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/modserver/__init__.py:88
+#: ../revisor/modserver/__init__.py:87
msgid "Use the server mode for XML-RPC"
msgstr "Benutze Server-Modus für XML-RPC"
-#: ../revisor/modserver/__init__.py:93
+#: ../revisor/modserver/__init__.py:92
msgid "Port to start Server on."
msgstr "Der Port, auf dem der Server gestartet wird."
-#: ../revisor/modserver/__init__.py:99
+#: ../revisor/modserver/__init__.py:98
msgid "Start the XML-RPC server and fork."
msgstr "Starte den XML-RPC-Server und forke."
#: ../revisor/modvirt/__init__.py:86
msgid "Virtualization Media Options"
-msgstr "Virtualization-Medium-Optionen"
+msgstr "Optionen für Virtualisations-Medium"
#: ../revisor/modvirt/__init__.py:93
msgid "Build Xen virtual machine. (not implemented yet)"
@@ -3536,7 +3551,7 @@ msgstr "KVM virtuelle Maschine Laufwerksgrösse, in MB. (Standard: 3000 MB) (mom
#: ../revisor/modvirt/__init__.py:123
msgid "Virtual machine file system type. (Default: ext3) (not implemented yet)"
-msgstr "Virtuelle Maschinen Dateisystemstyp. (Standard: ext3) (momentan nicht implementiert)"
+msgstr "Virtuelle Maschinen Dateisystemtyp. (Standard: ext3) (momentan nicht implementiert)"
#: ../revisor/modvirt/__init__.py:130
msgid "Make virtual machine drive a sparse filesystem. (not implemented yet)"
@@ -3552,7 +3567,7 @@ msgstr "Baue virtuelle Maschine als Appliance unter Benutzen eines einfachen roh
#: ../revisor/modvirt/__init__.py:244
msgid "Unable to create virtual machine instance."
-msgstr "Nich möglich eine virtuelle Maschinen-Instanz zu erzeugen."
+msgstr "Nicht möglich eine virtuelle Maschinen-Instanz zu erzeugen."
#: ../revisor/modvirt/__init__.py:305
msgid "Error creating ext3 filesystem"
commit 19b4073a2bd8db72913ad540345d5f23e4750f53
Merge: ac73334... 6493572...
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Sat Dec 6 02:46:23 2008 +0100
Merge branch 'F-10'
commit ac73334c4f10fe1f242074b9f88cbe4f42a22c0d
Author: Henrique Junior <henriquecsj(a)gmail.com>
Date: Wed Dec 3 00:03:04 2008 +0000
Updatet brazilian portuguese translation
Transmitted-via: Transifex (translate.fedoraproject.org)
diff --git a/po/Changelog b/po/Changelog
index 97641d6..96a31ec 100644
--- a/po/Changelog
+++ b/po/Changelog
@@ -1,4 +1,6 @@
-Updated Polish translation
+Updatet brazilian portuguese translation
+
+Transmitted-via: Transifex (translate.fedoraproject.org)Updated Polish translation
Transmitted-via: Transifex (translate.fedoraproject.org)update po/zh_CN.po
diff --git a/po/pt_BR.po b/po/pt_BR.po
index dc10205..aeb77d3 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: pt_BR\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-05 01:30+0000\n"
-"PO-Revision-Date: 2008-11-20 20:34-0300\n"
-"Last-Translator: Henrique (LonelySpooky) Junior <lspooky(a)fedoraproject.org>\n"
+"POT-Creation-Date: 2008-12-01 01:26+0000\n"
+"PO-Revision-Date: 2008-12-02 22:00-0300\n"
+"Last-Translator: Henrique (LonelySpooky) Junior <henriquecsj(a)gmail.com>\n"
"Language-Team: Brazilian Portuguese <fedora-docs-br(a)redhat.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -1638,197 +1638,210 @@ msgstr ""
msgid "The package set after dependency resolving does not match the packages selected in the kickstart manifest"
msgstr "O pacote selecionado após a resolução de dependências não bate com os pacotes selecionados no manifesto do kickstart"
-#: ../revisor/base.py:938
+#: ../revisor/base.py:941
#, python-format
msgid "No such repository: %s"
msgstr "Nenhum repositório: %s"
-#: ../revisor/base.py:940
+#: ../revisor/base.py:943
#, python-format
msgid "Enabling %s repository"
msgstr "Habilitando repositório %s"
-#: ../revisor/base.py:958
+#: ../revisor/base.py:962
#, python-format
msgid "Disabling %s repository"
msgstr "Desabilitando o repositório %s"
-#: ../revisor/base.py:979
+#: ../revisor/base.py:969
+msgid "Creating a list of SRPMs"
+msgstr "Criando uma lista de SRPMs"
+
+#: ../revisor/base.py:984
+msgid "Source RPM PO already in the list"
+msgstr "RPM fonte PO já está na lista"
+
+#: ../revisor/base.py:986
+#, python-format
+msgid "Source RPM found in non-source repository %s"
+msgstr "RPM fonte encontrado no repositório de não-fontes %s"
+
+#: ../revisor/base.py:988
#, python-format
msgid "Error: Cannot find a source rpm for %s"
msgstr "Erro: Não foi possível encontrar um rpm fonte para %s"
-#: ../revisor/base.py:981
+#: ../revisor/base.py:990
#: ../revisor/modgui/build_media.py:106
#: ../revisor/modgui/build_media.py:142
#: ../revisor/modgui/build_media.py:219
msgid "Downloading Source Packages"
msgstr "Baixando Pacotes Fontes"
-#: ../revisor/base.py:1010
+#: ../revisor/base.py:1019
#: ../revisor/progress.py:441
#, python-format
msgid "Downloading %s"
msgstr "Baixando %s"
-#: ../revisor/base.py:1040
+#: ../revisor/base.py:1049
#: ../revisor/modgui/build_media.py:101
#: ../revisor/modgui/build_media.py:214
msgid "Downloading Packages"
msgstr "Baixando Pacotes"
-#: ../revisor/base.py:1049
+#: ../revisor/base.py:1058
msgid "Unable to find a suitable mirror."
msgstr "Não foi possível encontrar um mirror adequado."
-#: ../revisor/base.py:1061
+#: ../revisor/base.py:1070
#, python-format
msgid "Errors were encountered while downloading packages: %s"
msgstr "Foram encontrados erros ao baixar os pacotes: %s"
-#: ../revisor/base.py:1102
+#: ../revisor/base.py:1111
#, python-format
msgid "Overriding auto package selection with user package selection for %s..."
msgstr "Substituindo a seleção automática de pacotes pela seleção de pacotes do usuário para %s"
-#: ../revisor/base.py:1115
+#: ../revisor/base.py:1124
#, python-format
msgid "Adding required package %s-%s:%s-%s.%s"
msgstr "Adicionando pacote necessário %s-%s:%s-%s.%s"
#. This list has already been resolved
-#: ../revisor/base.py:1118
+#: ../revisor/base.py:1127
#, python-format
msgid "%s. This is a required package."
msgstr "%s. Este é um pacote necessário."
-#: ../revisor/base.py:1130
+#: ../revisor/base.py:1139
#, python-format
msgid "Adding suggested package %s-%s:%s-%s.%s"
msgstr "Adicionando o pacote sugerido %s-%s:%s-%s.%s"
-#: ../revisor/base.py:1140
+#: ../revisor/base.py:1149
#, python-format
msgid "Packages that do not need to be on the media: %s"
msgstr "Pacotes que não têm necessidade de estar na mídia: %s"
-#: ../revisor/base.py:1165
-#: ../revisor/base.py:1191
+#: ../revisor/base.py:1174
+#: ../revisor/base.py:1200
msgid "Did not succeed in adding in all required packages"
msgstr "Não houve êxito ao adicionar todos os pacotes necessários"
-#: ../revisor/base.py:1199
+#: ../revisor/base.py:1208
msgid "Populating statistics"
msgstr "Povoando estatísticas"
-#: ../revisor/base.py:1215
+#: ../revisor/base.py:1224
#, python-format
msgid "Package %s-%s:%s-%s.%s does not seem to have a archivesize header"
msgstr "O pacote %s-%s:%s-%s.%s não parece ter um cabeçalho archivesize"
-#: ../revisor/base.py:1223
+#: ../revisor/base.py:1232
#, python-format
msgid "Package %s-%s:%s-%s.%s does not seem to have a installedsize header"
msgstr "O pacote %s-%s:%s-%s.%s não parece ter um cabeçalho inslalledsize"
-#: ../revisor/base.py:1231
+#: ../revisor/base.py:1240
#, python-format
msgid "Package %s-%s:%s-%s.%s does not seem to have a packagesize header"
msgstr "O pacote %s-%s:%s-%s.%s não parece ter um cabeçalho packagesize"
-#: ../revisor/base.py:1241
+#: ../revisor/base.py:1250
#, python-format
msgid "Total size of all packages (archivesize): %s %s"
msgstr "Tamanho total de todos os pacotes (archivesize): %s %s"
-#: ../revisor/base.py:1242
+#: ../revisor/base.py:1251
#, python-format
msgid "Total size of all packages, (installedsize): %s %s"
msgstr "Tamanho total de todos os pacotes, (installedsize): %s %s"
-#: ../revisor/base.py:1243
+#: ../revisor/base.py:1252
#, python-format
msgid "Total size of all packages, (packagesize): %s %s"
msgstr "tamanho total de todos os pacotes, (packagesize): %s %s"
-#: ../revisor/base.py:1278
+#: ../revisor/base.py:1287
#, python-format
msgid "Report of the %d most space consuming packages"
msgstr "Relatório dos %d pacotes que mais consomem espaço"
-#: ../revisor/base.py:1373
-#: ../revisor/base.py:1387
-#: ../revisor/base.py:2008
+#: ../revisor/base.py:1382
+#: ../revisor/base.py:1396
+#: ../revisor/base.py:2017
#, python-format
msgid "Creating pkgdir: %s"
msgstr "Criando pkgdir: %s"
#. Now for each txmbr in
#. Link the localPkg() result into the build tree
-#: ../revisor/base.py:1396
+#: ../revisor/base.py:1405
msgid "Linking in packages"
msgstr "Vinculando pacotes"
-#: ../revisor/base.py:1415
-#: ../revisor/base.py:2032
+#: ../revisor/base.py:1424
+#: ../revisor/base.py:2041
#, python-format
msgid "Package hard link failed: %s: %s"
msgstr "A vinculação absoluta do pacote falhou: %s: %s"
-#: ../revisor/base.py:1420
-#: ../revisor/base.py:2037
+#: ../revisor/base.py:1429
+#: ../revisor/base.py:2046
#, python-format
msgid "Copying: %s to %s"
msgstr "Copiando: %s para %s"
-#: ../revisor/base.py:1423
-#: ../revisor/base.py:2040
+#: ../revisor/base.py:1432
+#: ../revisor/base.py:2049
#, python-format
msgid "Symlinking: %s to %s"
msgstr "Vinculando simbolicamente: %s para %s"
-#: ../revisor/base.py:1426
-#: ../revisor/base.py:2043
+#: ../revisor/base.py:1435
+#: ../revisor/base.py:2052
msgid "Package symlink succeeded"
msgstr "A ligação simbólica foi bem sucedida"
-#: ../revisor/base.py:1428
-#: ../revisor/base.py:1435
-#: ../revisor/base.py:2045
-#: ../revisor/base.py:2052
+#: ../revisor/base.py:1437
+#: ../revisor/base.py:1444
+#: ../revisor/base.py:2054
+#: ../revisor/base.py:2061
#, python-format
msgid "Package link failed, trying copy: %s: %s"
msgstr "A vinculação do pacote falhou, tentando copiar: %s: %s"
-#: ../revisor/base.py:1445
+#: ../revisor/base.py:1454
msgid "Creating Repository Information"
msgstr "Criando Informações do Repositório"
#. FIXME: Optionally recompose installer images
-#: ../revisor/base.py:1460
+#: ../revisor/base.py:1469
msgid "Building Installation Images"
msgstr "Construindo Imagens de Instalação"
-#: ../revisor/base.py:1466
+#: ../revisor/base.py:1475
msgid "Using already existing installer images"
msgstr "Usando imagens já existentes do instalador"
-#: ../revisor/base.py:1480
+#: ../revisor/base.py:1489
msgid "Linking in release notes"
msgstr "Vinculando notas de versão"
-#: ../revisor/base.py:1492
+#: ../revisor/base.py:1501
#, python-format
msgid "Copying updates.img from %s to %s"
msgstr "Copiando updates.img de %s para %s"
-#: ../revisor/base.py:1501
+#: ../revisor/base.py:1510
#: ../revisor/pungi.py:414
#, python-format
msgid "copy_dir '%s' not accessible"
msgstr "copy_dir \"%s\" não está acessível"
-#: ../revisor/base.py:1512
+#: ../revisor/base.py:1521
#, python-format
msgid "Size of the installation tree is %s MB"
msgstr "O tamanho da árvore de instalação é de %s MB"
@@ -1837,61 +1850,61 @@ msgstr "O tamanho da árvore de instalação é de %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:1562
+#: ../revisor/base.py:1571
msgid "Running pkgorder"
msgstr "Executando pkgorder"
-#: ../revisor/base.py:1625
+#: ../revisor/base.py:1634
msgid "Appending group core and base"
msgstr "Anexando grupo core e base"
-#: ../revisor/base.py:1632
+#: ../revisor/base.py:1641
#, python-format
msgid "Appending default group %s"
msgstr "Anexando grupo padrão %s"
-#: ../revisor/base.py:1672
+#: ../revisor/base.py:1681
#, python-format
msgid "Appending non-default group %s"
msgstr "Anexando grupo não-padrão %s"
-#: ../revisor/base.py:1678
+#: ../revisor/base.py:1687
#, python-format
msgid "Appending non-default support group %s"
msgstr "Anexando grupo de suporte não-padrão %s"
-#: ../revisor/base.py:1745
+#: ../revisor/base.py:1754
#, python-format
msgid "Not running package ordering, using file %s instead"
msgstr "Não executando ordenação de arquivo, usando arquivo %s no lugar"
-#: ../revisor/base.py:1747
+#: ../revisor/base.py:1756
msgid "Not running package ordering"
msgstr "Ordenação de pacotes não está sendo executado"
-#: ../revisor/base.py:1779
+#: ../revisor/base.py:1788
msgid "^Install using kickstart"
msgstr "Instalar utilizando o kickstart"
#. Split Tree
-#: ../revisor/base.py:1802
+#: ../revisor/base.py:1811
#, python-format
msgid "Splitting Build Tree (%s)"
msgstr "Dividindo a Árvore de Construção (%s)"
#. Split repo
-#: ../revisor/base.py:1808
+#: ../revisor/base.py:1817
#, python-format
msgid "Splitting Repository (%s)"
msgstr "Dividindo o Repositório (%s)"
-#: ../revisor/base.py:1822
+#: ../revisor/base.py:1831
#: ../revisor/modgui/build_media.py:244
#, python-format
msgid "Creating %s ISO Image #%d"
msgstr "Criando Imagem ISO %s #%d"
-#: ../revisor/base.py:1827
+#: ../revisor/base.py:1836
#: ../revisor/modgui/build_media.py:248
#, python-format
msgid "Creating %s ISO Image"
@@ -1899,41 +1912,41 @@ msgstr "Criando Imagem ISO %s"
#. 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:1841
+#: ../revisor/base.py:1850
msgid "Implanting MD5 into ISO Images"
msgstr "Implantando MD5 dentro das Imagens ISO"
#. mediatype = built_image["mediatype"]
#. if not mediatype == 'source':
-#: ../revisor/base.py:1849
+#: ../revisor/base.py:1858
#, python-format
msgid "Implanting md5 into ISO Image: %s"
msgstr "Implantando MD5 dentro da Imagem ISO: %s"
-#: ../revisor/base.py:1855
+#: ../revisor/base.py:1864
msgid "Cannot implant ISO md5sum"
msgstr "incapaz de implantar md5sum da ISO"
#. Do some SHA1SUMMONING
-#: ../revisor/base.py:1863
+#: ../revisor/base.py:1872
msgid "Creating SHA1SUMs for Images"
msgstr "Criando SHA1SUMs para as imagens"
-#: ../revisor/base.py:1879
+#: ../revisor/base.py:1888
msgid "Creating Rescue ISO Image"
msgstr "Criando Imagem ISO de resgate"
-#: ../revisor/base.py:1939
+#: ../revisor/base.py:1948
#, python-format
msgid "Copying %s to %s (%d files)"
msgstr "Copiando %s para %s (%d arquivos)"
-#: ../revisor/base.py:1943
+#: ../revisor/base.py:1952
#, python-format
msgid "Moving %s to %s (%d files)"
msgstr "Copiando %s para %s (%d arquivos)"
-#: ../revisor/base.py:1946
+#: ../revisor/base.py:1955
#, python-format
msgid ""
"Moving of the source tree failed (trying copy):\n"
@@ -1944,7 +1957,7 @@ msgstr ""
"\n"
"%s"
-#: ../revisor/base.py:1949
+#: ../revisor/base.py:1958
#, python-format
msgid ""
"Copying of the source tree failed:\n"
@@ -1955,13 +1968,13 @@ msgstr ""
"\n"
"%s"
-#: ../revisor/base.py:1954
+#: ../revisor/base.py:1963
#: ../revisor/pungi.py:410
#, python-format
msgid "Copying %s to %s"
msgstr "Copiando %s para %s"
-#: ../revisor/base.py:1958
+#: ../revisor/base.py:1967
#, python-format
msgid ""
"Copying of the installation tree failed:\n"
@@ -1972,41 +1985,41 @@ msgstr ""
"\n"
"%s"
-#: ../revisor/base.py:1964
+#: ../revisor/base.py:1973
msgid "Creating ext3 filesystem"
msgstr "Criando sistema de arquivos ext3"
-#: ../revisor/base.py:1971
+#: ../revisor/base.py:1980
msgid "Configuring System"
msgstr "Configurando o sistema"
#. Now for each txmbr in
#. Link the localPkg() result into the build tree
-#: ../revisor/base.py:2017
+#: ../revisor/base.py:2026
msgid "Linking in Source packages"
msgstr "Vinculando pacotes fonte"
-#: ../revisor/base.py:2072
+#: ../revisor/base.py:2081
#, python-format
msgid "Setting rundir to %s"
msgstr "Definindo o diretório de execução para %s"
-#: ../revisor/base.py:2078
+#: ../revisor/base.py:2087
#, python-format
msgid "Directory %s could not be created. Aborting"
msgstr "O diretório %s não pôde ser criado. Interrompendo"
-#: ../revisor/base.py:2080
+#: ../revisor/base.py:2089
#, python-format
msgid "Running command: %s"
msgstr "Executando comando: %s"
-#: ../revisor/base.py:2081
+#: ../revisor/base.py:2090
#, python-format
msgid "Extra information: %s %s %s"
msgstr "Informação extra: %s %s %s"
-#: ../revisor/base.py:2109
+#: ../revisor/base.py:2118
#, python-format
msgid "Got an error from %s (return code %s)"
msgstr "Um erro ocorreu em %s (código de retorno %s)"
@@ -2209,118 +2222,120 @@ msgstr "Modelo %s configurado no arquivo de configuração %s, mas não existe t
msgid "Tried to load model %s but it doesn't exist inconfiguration file %s"
msgstr "Tentei carregar o modelo %s, mas ele não existe no arquivo de configuração %s"
-#: ../revisor/cfg.py:710
+#: ../revisor/cfg.py:713
#, python-format
msgid "Model %s has no configuration directive 'main' which is required"
msgstr "Modelo %s não tem nenhuma configuração diretiva 'main', que é exigida"
-#: ../revisor/cfg.py:713
+#: ../revisor/cfg.py:716
#, python-format
msgid "Testing for configuration parameter %s"
msgstr "Testando para os parâmetros de configuração %s"
-#: ../revisor/cfg.py:742
+#: ../revisor/cfg.py:745
#, python-format
msgid "Setting %s to %r (from configuration file model %s)"
msgstr "Definindo %s para %r (a partir do modelo do arquivo de configuração %s)"
-#: ../revisor/cfg.py:776
+#: ../revisor/cfg.py:779
#, python-format
msgid "Configuration file %s not readable"
msgstr "Arquivo de configuração %s não está legível"
-#: ../revisor/cfg.py:779
+#: ../revisor/cfg.py:782
#: ../revisor/modgui/configuration.py:465
#, python-format
msgid "Reading configuration file %s"
msgstr "Lendo o arquivo de configuração %s"
-#: ../revisor/cfg.py:783
+#: ../revisor/cfg.py:786
#, python-format
msgid "Invalid configuration file %s"
msgstr "Arquivo de configuração inválido %s"
-#: ../revisor/cfg.py:786
+#: ../revisor/cfg.py:789
#, python-format
msgid "No master configuration section [revisor] in configuration file %s"
msgstr "Nenhuma seção de configuração mestra [revisor] no arquivo de configuração %s"
-#: ../revisor/cfg.py:820
+#: ../revisor/cfg.py:823
#, python-format
msgid "Setting %s to %r (from configuration file)"
msgstr "Definindo %s para %r (a partir do arquivo de configuração)"
-#: ../revisor/cfg.py:824
+#: ../revisor/cfg.py:827
msgid "Setting options from command-line"
msgstr "Definindo opções a partir da linha de comandos"
-#: ../revisor/cfg.py:838
-#: ../revisor/cfg.py:845
+#: ../revisor/cfg.py:841
+#: ../revisor/cfg.py:848
#, python-format
msgid "Setting %s to %r (from command line)"
msgstr "Definindo %s para %r (a partir da linha de comando)"
-#: ../revisor/cfg.py:840
+#: ../revisor/cfg.py:843
#, python-format
msgid "Checked setting %s through plugin"
msgstr "Checado o ajuste %s através de plug-in"
-#: ../revisor/cfg.py:843
+#: ../revisor/cfg.py:846
#, python-format
msgid "No check_setting_%s()"
msgstr "Nenhum check_setting_%s()"
-#: ../revisor/cfg.py:847
+#: ../revisor/cfg.py:850
#, python-format
msgid "Not setting %s to %r (command line matches default)"
msgstr "Não definindo %s para %r (linha de comando de acordo com o padrão)"
-#: ../revisor/cfg.py:889
+#: ../revisor/cfg.py:892
msgid "Updates.img is only usable with installation media. Please remove --updates-img or also build installation media."
msgstr "O updates.img somente é usável com uma mídia de instalação. Por favor, remova o --updates-img ou construa uma mídia de instalação. "
-#: ../revisor/cfg.py:893
+#: ../revisor/cfg.py:896
msgid "Kickstart failed"
msgstr "Kickstart falhou"
-#: ../revisor/cfg.py:898
+#: ../revisor/cfg.py:903
+#: ../revisor/cfg.py:908
#, python-format
msgid "Kickstart file %s not readable"
msgstr "O arquivo kickstart %s não está legível"
-#: ../revisor/cfg.py:900
+#: ../revisor/cfg.py:905
+#: ../revisor/cfg.py:910
#, python-format
msgid "Kickstart file %s fails to load, continuing with defaults"
msgstr "O arquivo kickstart %s falhou ao carregar, continuando com os padrões"
-#: ../revisor/cfg.py:903
+#: ../revisor/cfg.py:913
msgid "No kickstart file specified"
msgstr "Nenhum arquivo kickstart especificado"
-#: ../revisor/cfg.py:906
-#: ../revisor/cfg.py:927
+#: ../revisor/cfg.py:916
+#: ../revisor/cfg.py:937
msgid "No media specified"
msgstr "Nenhuma mídia foi especificada"
-#: ../revisor/cfg.py:909
+#: ../revisor/cfg.py:919
msgid "When composing in respin mode, you can only select one type of media install, live or virtual. You can however select multiple media such as cd, dvd, etc."
msgstr "Ao compor no modo respin, você somente pode selecionar um tipo de instalação de mídia, live ou virtual. Entretanto, você pode selecionar múltiplas mídias como cd, dvd, etc."
-#: ../revisor/cfg.py:954
+#: ../revisor/cfg.py:964
#, python-format
msgid "pulling self.packages_list[%r][%r][%r][%r]"
msgstr "Puxando self.packages_list[%r][%r][%r][%r]"
-#: ../revisor/cfg.py:959
+#: ../revisor/cfg.py:969
#, python-format
msgid "returning pkg_list: %r"
msgstr "retornando pkg_list: %r"
-#: ../revisor/cfg.py:1077
+#: ../revisor/cfg.py:1087
msgid "Run from image"
msgstr "Executar a partir da imagem"
-#: ../revisor/cfg.py:1078
+#: ../revisor/cfg.py:1088
msgid "Run from RAM - requires 1 GB+"
msgstr "Executar a partir da RAM - requer 1 GB+"
@@ -2362,250 +2377,250 @@ msgstr "Definindo self.cfg.payload_livemedia para %s (do tamanho total de RPMs i
#. #
#. # Runtime Options
#. #
-#: ../revisor/__init__.py.in:85
+#: ../revisor/__init__.py.in:86
msgid "Runtime Options"
msgstr "Opções de Tempo de Execução"
-#: ../revisor/__init__.py.in:90
+#: ../revisor/__init__.py.in:91
msgid "Use the CLI rather then GUI"
msgstr "Utilizar CLI preferencialmente ao invés da GUI"
-#: ../revisor/__init__.py.in:95
+#: ../revisor/__init__.py.in:96
msgid "Force Revisor to use the GUI. Does not fallback to CLI and thus shows GUI related errors"
msgstr "Forçar o Revisor a usar a GUI. Não voltar a CLI e, assim, mostrar os erros relacionados a GUI"
-#: ../revisor/__init__.py.in:100
+#: ../revisor/__init__.py.in:101
msgid "List available models"
msgstr "Lista de modelos disponíveis"
-#: ../revisor/__init__.py.in:105
+#: ../revisor/__init__.py.in:106
msgid "Development mode. Skips some tasks that take time."
msgstr "Modo de desenvolvimento. Pula algumas tarefas que tomam tempo."
-#: ../revisor/__init__.py.in:110
+#: ../revisor/__init__.py.in:111
msgid "Report the sizes of all RPMs selected in a list"
msgstr "Reporta os tamanhos de todos os RPMs selecionados em uma lista"
-#: ../revisor/__init__.py.in:115
+#: ../revisor/__init__.py.in:116
msgid "Force Revisor to interpret the package manifest as complete package nevra (name, epoch, version, release and architecture). Implies --kickstart-exact"
msgstr "Forçar o revisor a interpretar o manifesto do pacote como um nevra completo de pacote (nome, data, versão, release e arquitetura) implica --kickstart-exact"
-#: ../revisor/__init__.py.in:120
+#: ../revisor/__init__.py.in:121
msgid "Tells Revisor to ignore @core and @base (or %packages --nobase) and only add what is in the package manifest"
msgstr "Diz ao Revisor para ignorar o @core e o @base (ou %packages --nobase) e só adicionar o que está no manifesto do pacote"
-#: ../revisor/__init__.py.in:126
+#: ../revisor/__init__.py.in:127
msgid "Should Revisor not clean up at all (0), clean up it's temporary build data (1), or everything -this includes the yum cache (2)"
msgstr "O Revisor não deve fazer limpeza alguma (0), limpar seus dados de criação (1), ou tudo -isto inclui o cache do yum"
-#: ../revisor/__init__.py.in:132
+#: ../revisor/__init__.py.in:133
msgid "Size of the USB Thumb Drive. Default to 4G."
msgstr "Tamanho da unidade flash USB. Padrão para 4G."
-#: ../revisor/__init__.py.in:141
+#: ../revisor/__init__.py.in:142
msgid "Set debugging level (0 by default)"
msgstr "Definindo o nível de depuração (0 por padrão)"
-#: ../revisor/__init__.py.in:150
+#: ../revisor/__init__.py.in:151
msgid "Answer all questions as 'yes'"
msgstr "Responder \"sim\" para todas as perguntas"
#. #
#. # Configuration Options
#. #
-#: ../revisor/__init__.py.in:155
+#: ../revisor/__init__.py.in:156
msgid "Configuration Options"
msgstr "Opções de Configuração"
#. Might be disabled for testing purposes
#. default = os.path.join(BASE_CONFD_DIR,"fedora-7-gold.cfg"),
-#: ../revisor/__init__.py.in:162
+#: ../revisor/__init__.py.in:163
msgid "Use kickstart file"
msgstr "Utilizar arquivo kickstart"
-#: ../revisor/__init__.py.in:168
+#: ../revisor/__init__.py.in:169
msgid "Save options to given file (as a kickstart)"
msgstr "Salvar opções para um arquivo especificado (como um kickstart)"
-#: ../revisor/__init__.py.in:174
+#: ../revisor/__init__.py.in:175
msgid "Revisor configuration file to use"
msgstr "Arquivo de configuração do Revisor a ser utilizado"
-#: ../revisor/__init__.py.in:180
+#: ../revisor/__init__.py.in:181
msgid "Get the sources to go with the binaries"
msgstr "Obter os fontes para combinar com os binários"
-#: ../revisor/__init__.py.in:185
+#: ../revisor/__init__.py.in:186
msgid "Destination directory for products"
msgstr "Diretório de destino para os produtos"
-#: ../revisor/__init__.py.in:191
+#: ../revisor/__init__.py.in:192
msgid "Working directory"
msgstr "Diretório de Trabalho"
-#: ../revisor/__init__.py.in:197
+#: ../revisor/__init__.py.in:198
msgid "Model to use for composing"
msgstr "Modelo a ser usado para a composição"
-#: ../revisor/__init__.py.in:203
+#: ../revisor/__init__.py.in:204
msgid "Mode to use for composing updated spins"
msgstr "Modelo a ser usado para compor versões de atualização"
-#: ../revisor/__init__.py.in:208
+#: ../revisor/__init__.py.in:209
msgid "Sometimes, it's better to copy local data rather then (sym)linking it. If you have enough space..."
msgstr "Algumas vezes é melhor copiar dados locais em vez de lincá-los simbolicamente. Se você tiver espaço o suficiente..."
-#: ../revisor/__init__.py.in:213
+#: ../revisor/__init__.py.in:214
msgid "Directory to copy onto the media"
msgstr "Diretório para copiar para a mídia"
#. #
#. # Installation Media Options
#. #
-#: ../revisor/__init__.py.in:218
+#: ../revisor/__init__.py.in:219
msgid "Installation Media Options"
msgstr "Opções de Mídia de Instalação"
-#: ../revisor/__init__.py.in:223
+#: ../revisor/__init__.py.in:224
msgid "Create Installation Media CDs (Capacity per disc: 685MB)"
msgstr "Criar Mídias de Instalação para CDs (685 MB por disco)"
-#: ../revisor/__init__.py.in:228
+#: ../revisor/__init__.py.in:229
msgid "Create Installation Media DVDs (Capacity per disc: 4.3GB)"
msgstr "Criar Mídia de Instalação para DVDs (4.3GB por disco)"
-#: ../revisor/__init__.py.in:233
+#: ../revisor/__init__.py.in:234
msgid "Create Installation Media Dual-Layered DVDs (Capacity per disc: 8.5GB)"
msgstr "Criar Mídias de Instalação para DVDs de Dupla Camada (8.5GB por disco)"
-#: ../revisor/__init__.py.in:238
+#: ../revisor/__init__.py.in:239
msgid "Create Installation Media Blu-Ray Discs (Capacity per disc: 50GB)"
msgstr "Criar Mídias de Instalação para discos Blu-Ray (50GB por disco)"
-#: ../revisor/__init__.py.in:243
+#: ../revisor/__init__.py.in:244
msgid "Create Unified ISO from install tree"
msgstr "Criar ISO Unificada a partir da árvore de instalação"
-#: ../revisor/__init__.py.in:254
+#: ../revisor/__init__.py.in:255
msgid "Create the Installation Tree."
msgstr "Criar a árvore de instalação"
-#: ../revisor/__init__.py.in:259
+#: ../revisor/__init__.py.in:260
msgid "Create Media without graphical installer."
msgstr "Criar a mídia sem instalador gráfico."
-#: ../revisor/__init__.py.in:264
+#: ../revisor/__init__.py.in:265
msgid "Include kickstart file on media or in the tree"
msgstr "Incluir arquivo kickstart na mídia ou na árvore"
-#: ../revisor/__init__.py.in:269
+#: ../revisor/__init__.py.in:270
msgid "In the bootloader menu (isolinux.cfg), set kickstart to boot by default (works with --kickstart-include)"
msgstr "No menu do bootloader (isolinux.cfg), definir o kickstart para inicializar por padrão (funciona com --kickstart-include)"
-#: ../revisor/__init__.py.in:274
+#: ../revisor/__init__.py.in:275
msgid "Filter anything from comps that is not in the package set"
msgstr "Filtrar qualquer coisa do comps que não está na definição de pacotes"
-#: ../revisor/__init__.py.in:279
+#: ../revisor/__init__.py.in:280
msgid "Use Revisor's comps file instead of those from the repositories"
msgstr "Usar o arquivo comps do Revisor em vez daqueles dos repositórios"
-#: ../revisor/__init__.py.in:284
+#: ../revisor/__init__.py.in:285
msgid "Comps file to include on the installation media"
msgstr "Arquivo comps para incluir na mídia de instalação"
-#: ../revisor/__init__.py.in:289
+#: ../revisor/__init__.py.in:290
msgid "Include specified updates.img on installation media."
msgstr "Incluir updates.img especificado na mídia de instalação."
-#: ../revisor/__init__.py.in:295
+#: ../revisor/__init__.py.in:296
msgid "Product Name"
msgstr "Nome do Produto"
-#: ../revisor/__init__.py.in:300
+#: ../revisor/__init__.py.in:301
msgid "Product Path (e.g. Fedora/ or Packages/ -but without the appending slash)"
msgstr "Caminho do Produto (i.e. Fedora/ ou Pacotes/ -mas sem a barra)"
-#: ../revisor/__init__.py.in:305
+#: ../revisor/__init__.py.in:306
msgid "ISO Label Base. Note that other things are appended but that the length can be 32 chars maximum."
msgstr "Base de Rótulo ISO. Observe que outras coisas são anexadas mas o tamanho pode ser de, no máximo, 32 caracteres."
-#: ../revisor/__init__.py.in:310
+#: ../revisor/__init__.py.in:311
msgid "The base name for the ISOs"
msgstr "O nome base para as ISOs"
-#: ../revisor/__init__.py.in:315
+#: ../revisor/__init__.py.in:316
msgid "Product Version"
msgstr "Versão do Produto"
-#: ../revisor/__init__.py.in:320
+#: ../revisor/__init__.py.in:321
msgid "Base Product Version - relevant to required packages and pykickstart compatibility"
msgstr "Versão Base do Produto - relevante para pacotes requeridos e compatibilidade com o pykickstart"
#. #
#. # Utility Media Options
#. #
-#: ../revisor/__init__.py.in:325
+#: ../revisor/__init__.py.in:326
msgid "Utility Media Options"
msgstr "Opções do utilitário de mídia"
-#: ../revisor/__init__.py.in:330
+#: ../revisor/__init__.py.in:331
msgid "Create Rescue Media"
msgstr "Criar mídia de resgate"
#. #
#. # Live Media Options
#. #
-#: ../revisor/__init__.py.in:335
+#: ../revisor/__init__.py.in:336
msgid "Live Media Options"
msgstr "Opções de Mídia Live"
-#: ../revisor/__init__.py.in:340
+#: ../revisor/__init__.py.in:341
msgid "Create Live Media CD/DVD"
msgstr "Criar CD/DVD Live"
-#: ../revisor/__init__.py.in:345
+#: ../revisor/__init__.py.in:346
msgid "Create Live Media Thumb Drive Image (will be depreciated)"
msgstr "Criar Imagem Live para Pen Drives (será depreciada)"
-#: ../revisor/__init__.py.in:350
+#: ../revisor/__init__.py.in:351
msgid "Create Live Media Hard Disk Image (will be depreciated)"
msgstr "Criar Imagem Live para Discos Rígidos (será depreciada)"
-#: ../revisor/__init__.py.in:355
+#: ../revisor/__init__.py.in:356
msgid "Create Live Media Raw Hard Disk Image"
msgstr "Criar Imagem Bruta de Mídia Live no Disco Rígido"
-#: ../revisor/__init__.py.in:360
+#: ../revisor/__init__.py.in:361
msgid "Interactively work in the live image before building the ISO image."
msgstr "Trabalhar interativamente na imagem live antes de construir a imagem ISO."
-#: ../revisor/__init__.py.in:365
+#: ../revisor/__init__.py.in:366
msgid "Skip file system compression."
msgstr "Pular compressão do sistema de arquivos"
-#: ../revisor/__init__.py.in:370
+#: ../revisor/__init__.py.in:371
msgid "Skip prelinking the contents of the filesystem."
msgstr "Pular prelink do conteúdo do sistema de arquivos."
-#: ../revisor/__init__.py.in:375
+#: ../revisor/__init__.py.in:376
msgid "Ignore filesystem overhead. Useless blocks will not be removed from the filesystem."
msgstr "Ignorar overhead do sistema de arquivos. Blocos desnecessários não serão removidos do sistema de arquivos."
-#: ../revisor/__init__.py.in:380
+#: ../revisor/__init__.py.in:381
msgid "Set the preferred kernel. One of normal, PAE, xen or debug."
msgstr "Defina o kernel preferido. Um normal, PAE, xen ou debug."
-#: ../revisor/__init__.py.in:421
+#: ../revisor/__init__.py.in:422
#, python-format
msgid " %s - No Description"
msgstr "%s - Sem descrição"
-#: ../revisor/__init__.py.in:441
+#: ../revisor/__init__.py.in:442
msgid "Interrupted by user"
msgstr "Interrompido pelo usuário"
-#: ../revisor/__init__.py.in:448
+#: ../revisor/__init__.py.in:449
msgid "Traceback occurred, please report a bug at http://fedorahosted.org/revisor"
msgstr "Um relatório de erro foi gerado, por favor relate o erro para http://fedorahosted.org/revisor"
@@ -2922,13 +2937,13 @@ msgid "Hacking anaconda's .discinfo because it'll shit itself if it reads it's o
msgstr "Hackeando o .discinfo do anaconda porque ele se prejudica ao ler as próprias saídas"
#: ../revisor/modcobbler/__init__.py:69
-#: ../revisor/modcobbler/__init__.py:218
-#: ../revisor/modcobbler/__init__.py:255
+#: ../revisor/modcobbler/__init__.py:219
+#: ../revisor/modcobbler/__init__.py:256
#, python-format
msgid "There is a problem connecting to %s"
msgstr "Há um problema de conexão com %s"
-#: ../revisor/modcobbler/__init__.py:82
+#: ../revisor/modcobbler/__init__.py:83
#, python-format
msgid ""
" Distro: %s\n"
@@ -2937,58 +2952,58 @@ msgstr ""
" Distro: %s\n"
" Perfis existentes:"
-#: ../revisor/modcobbler/__init__.py:82
+#: ../revisor/modcobbler/__init__.py:83
msgid "name"
msgstr "nome"
-#: ../revisor/modcobbler/__init__.py:84
+#: ../revisor/modcobbler/__init__.py:85
#, python-format
msgid " Profile: %s"
msgstr " Perfil: %s"
-#: ../revisor/modcobbler/__init__.py:86
+#: ../revisor/modcobbler/__init__.py:87
msgid "No listing found on cobbler server."
msgstr "Nenhuma listagem encontrada no servidor cobbler"
-#: ../revisor/modcobbler/__init__.py:103
+#: ../revisor/modcobbler/__init__.py:104
msgid "Add compose to a Cobbler server as both a Distribution and Profile."
msgstr "Adicionar a composição a um servidor Cobbler como uma Distribuição e como um Perfil."
-#: ../revisor/modcobbler/__init__.py:110
+#: ../revisor/modcobbler/__init__.py:111
msgid "Add compose options as a Profile to a Cobbler server. [Requires --cobbler-use-distro]"
msgstr "Adicionar a composição como um Perfil a um servidor Cobbler. [Requer --cobbler-use-distro]"
-#: ../revisor/modcobbler/__init__.py:117
+#: ../revisor/modcobbler/__init__.py:118
msgid "Use a Cobbler distro as source for package data."
msgstr "Utilizar uma distro Cobbler como fonte de pacotes"
-#: ../revisor/modcobbler/__init__.py:124
+#: ../revisor/modcobbler/__init__.py:125
msgid "Use a Cobbler profile as source for kickstart data."
msgstr "Utilizar um perfil Cobbler como fonte de dados Kickstart."
-#: ../revisor/modcobbler/__init__.py:131
+#: ../revisor/modcobbler/__init__.py:132
msgid "List options provided by cobbler."
msgstr "Listar opções fornecidas pelo Cobbler."
-#: ../revisor/modcobbler/__init__.py:137
+#: ../revisor/modcobbler/__init__.py:138
msgid "Use remote cobbler server."
msgstr "Utilizar um servidor Cobbler remoto."
-#: ../revisor/modcobbler/__init__.py:143
+#: ../revisor/modcobbler/__init__.py:144
msgid "Remote cobbler server port."
msgstr "Porta do servidor cobbler remoto."
-#: ../revisor/modcobbler/__init__.py:200
+#: ../revisor/modcobbler/__init__.py:201
msgid "Specifying a Cobbler server is only supported for read-only actions. Currently, --cobbler-use-distro and --cobbler-use-profile."
msgstr "A especificação de um servidor Cobbler somente é suportada por ações de somente leitura. Atualmente, --cobbler-use-distro e --cobbler-use-profile."
-#: ../revisor/modcobbler/__init__.py:225
+#: ../revisor/modcobbler/__init__.py:226
#, python-format
msgid "The distro '%s' does not exist."
msgstr "A distro \"%s\" não existe."
-#: ../revisor/modcobbler/__init__.py:239
-#: ../revisor/modcobbler/__init__.py:262
+#: ../revisor/modcobbler/__init__.py:240
+#: ../revisor/modcobbler/__init__.py:263
#, python-format
msgid "The profile '%s' does not exist."
msgstr "O perfil \"%s\" não existe."
@@ -3517,15 +3532,15 @@ msgstr "A URI para uma árvore, nós supostamente reutilizaríamos as imagens do
msgid "Could not access %s/%s, required for reusing a previous tree. Cancelling the reuse of installer images"
msgstr "Incapaz de acessar %s/%s, necessário para reutilizar uma árvore anterior.Cancelando a reutilização de imagens do instalador"
-#: ../revisor/modserver/__init__.py:88
+#: ../revisor/modserver/__init__.py:87
msgid "Use the server mode for XML-RPC"
msgstr "Usar o modo servidor para o XML-RPC"
-#: ../revisor/modserver/__init__.py:93
+#: ../revisor/modserver/__init__.py:92
msgid "Port to start Server on."
msgstr "Porta para iniciar o Servidor."
-#: ../revisor/modserver/__init__.py:99
+#: ../revisor/modserver/__init__.py:98
msgid "Start the XML-RPC server and fork."
msgstr "Iniciar o servidor XML-RPC e bifurcar"
1
0
Tag '2.1.4-1' created by Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org> at 2009-02-26 07:14 +0000
2.1.4-1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
iEYEABECAAYFAkmmQWYACgkQKN6f2pNCvwhgrQCfdgRrKaKNrTw2fS4zBXxzdT7Q
kX4AnikX57ApT0/EurPBkw1z749JB0yS
=vVtY
-----END PGP SIGNATURE-----
Changes since 2.1.1-5.fc9-358:
---
0 files changed
---
1
0
Tag '2.1.1-5.fc9' created by Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org> at 2008-06-30 17:41 +0000
2.1.1-5.fc9
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
iEYEABECAAYFAkhpGtQACgkQKN6f2pNCvwjL9gCgvHYeqyiuT+qArOb6KG6XvRum
iZgAoKkClGtpJk6gJHxzrkXRfhgujJjG
=wpg/
-----END PGP SIGNATURE-----
Changes since 2.1.1-4.fc9-32:
---
0 files changed
---
1
0
Tag '2.1.1-5.fc10' created by Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org> at 2008-06-30 17:40 +0000
2.1.1-5.fc10
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
iEYEABECAAYFAkhpGqIACgkQKN6f2pNCvwgeBwCfZj7YI3o4KUr9DjVr19qPXig3
lC8An01wqs5njtTrtRTQWySWpReJ5II9
=AHEi
-----END PGP SIGNATURE-----
Changes since 2.1.1-4.fc10-41:
---
0 files changed
---
1
0