revisor/pungi.py | 2 ++
unity/scripts/respin.sh | 8 +++++---
2 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 0f15f40d706be0f8a204076a11640c3f8c9fb651
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Wed Sep 30 00:35:03 2009 +0200
Let's not use the mirrorlists anymore
diff --git a/unity/scripts/respin.sh b/unity/scripts/respin.sh
index ac6c1e3..7f7cd12 100755
--- a/unity/scripts/respin.sh
+++ b/unity/scripts/respin.sh
@@ -266,9 +266,9 @@ for version in ${VERSIONS}; do
grep "^ ${real_version}-${arch}-" | awk '{print
$1}' | grep -vE '[[:alpha:]]{2}_[[:alpha:]]{2}'`
fi
-# # Cheating for testing purposes
-# spins=`${revisor_cmd} --cli --config
/etc/revisor-unity/${real_version}-live-respin.conf --list-models 2>/dev/null | \
-# grep "^ ${real_version}-${arch}-" | awk '{print
$1}' | head -n 1`
+# # Cheating for testing purposes
+# spins=`${revisor_cmd} --cli --config
/etc/revisor-unity/${real_version}-live-respin.conf --list-models 2>/dev/null | \
+# grep "^ ${real_version}-${arch}-" | awk '{print
$1}' | grep lxde | head -n 1`
for spin in $spins; do
@@ -292,6 +292,7 @@ for version in ${VERSIONS}; do
echo "find /var/lib/rpm/ -name '__db.*' -delete; \\
cd /revisor; \\
autoreconf && ./configure; \\
+ sed -i -e 's/^mirrorlist/#mirrorlist/g'
/revisor/unity/conf/conf.d/*.conf; \\
./revisor.py --cli --config
unity/conf/${real_version}-live-respin.conf \\
--destination-directory ${REVISORDIR}/$datestamp/ \\
--model $spin --copy-local --debug 9 --logfile
/revisor/revisor-$spin.log \\
@@ -414,6 +415,7 @@ for version in ${VERSIONS}; do
echo -en "find /var/lib/rpm/ -name '__db.*' -delete; \\
cd /revisor; \\
autoreconf && ./configure; \\
+ sed -i -e 's/^mirrorlist/#mirrorlist/g'
/revisor/unity/conf/conf.d/*.conf; \\
./revisor.py --cli --config
unity/conf/${real_version}-install-respin.conf \\
--destination-directory ${REVISORDIR}/$datestamp/ \\
--model ${real_version}-$arch-respin --copy-local --debug 9
--logfile /revisor/revisor-${real_version}-$arch-respin.log \\
commit 13eac3bf51cb871281d348dc85c9fc823e6c6c24
Merge: c16fb65... 816cc4f...
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Wed Sep 30 00:10:12 2009 +0200
Merge branch 'master' of
ssh://git.fedorahosted.org/git/revisor
commit c16fb65234339465e91b1af0ba2f2853851b6ceb
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Sat Sep 12 20:47:39 2009 +0200
Remove tree if already exists
diff --git a/revisor/pungi.py b/revisor/pungi.py
index 987acaf..1ebb6bb 100644
--- a/revisor/pungi.py
+++ b/revisor/pungi.py
@@ -506,6 +506,8 @@ cost=500
createrepo.append('--outputdir')
if int(self.cfg.mediatypes[discdir]["discs"]) == 1:
+ if os.access('%s-%s-disc1' % (self.topdir,discdir)):
+ shutil.rmtree('%s-%s-disc1' % (self.topdir,discdir))
os.makedirs('%s-%s-disc1' % (self.topdir,discdir))
createrepo.append('%s-%s-disc1' % (self.topdir,discdir))