[Piuparts-commits] [SCM] piuparts git repository branch, piatti, updated. 0.49-147-g5e9a5c3
Andreas Beckmann
anbe at debian.org
Mon Mar 4 09:54:44 UTC 2013
The following commit has been merged in the piatti branch:
commit 63bab25ef13091f0f75eafaa3b20dfbc78f4e8f3
Author: Andreas Beckmann <anbe at debian.org>
Date: Sun Mar 3 19:56:42 2013 +0100
p.conf: put flags-{start,end}-squeeze into the [DEFAULT] section
consolidate flags used several times
ConfigParser looks there by default
Signed-off-by: Andreas Beckmann <anbe at debian.org>
diff --git a/instances/piuparts.conf.goldwasser b/instances/piuparts.conf.goldwasser
index 19c4eb9..eacf260 100644
--- a/instances/piuparts.conf.goldwasser
+++ b/instances/piuparts.conf.goldwasser
@@ -3,7 +3,11 @@
#
# For more information on this setup see http://anonscm.debian.org/gitweb/?p=piuparts/piuparts.git;hb=piatti;a=blob;f=README_piatti.txt
#
-#
+
+[DEFAULT]
+flags-start-squeeze =
+ --no-eatmydata
+ -i /etc/shells
[global]
sections =
@@ -75,9 +79,7 @@ log-file = wheezy.log
[squeeze2wheezy]
piuparts-flags =
--warn-on-leftovers-after-purge
- --no-eatmydata
- --dpkg-noforce-unsafe-io
- -i /etc/shells
+ %(flags-start-squeeze)s
distro = squeeze
upgrade-test-distros = squeeze wheezy
upgrade-test-chroot-tgz = squeeze.tar.gz
diff --git a/instances/piuparts.conf.piatti b/instances/piuparts.conf.piatti
index f34f190..ade3dd2 100644
--- a/instances/piuparts.conf.piatti
+++ b/instances/piuparts.conf.piatti
@@ -3,7 +3,13 @@
#
# For more information on this setup see http://anonscm.debian.org/gitweb/?p=piuparts/piuparts.git;hb=piatti;a=blob;f=README_piatti.txt
#
-#
+
+[DEFAULT]
+flags-start-squeeze =
+ --no-eatmydata
+ -i /etc/shells
+flags-end-squeeze =
+ --scriptsdir /etc/piuparts/scripts-squeeze
[global]
sections =
@@ -87,8 +93,7 @@ log-file = wheezy.log
precedence = 3
piuparts-flags =
--warn-on-leftovers-after-purge
- --no-eatmydata
- -i /etc/shells
+ %(flags-start-squeeze)s
distro = squeeze
upgrade-test-distros = squeeze wheezy
upgrade-test-chroot-tgz = squeeze.tar.gz
@@ -100,10 +105,9 @@ log-file = squeeze2wheezy.log
precedence = 5
piuparts-flags =
--warn-on-leftovers-after-purge
- --no-eatmydata
- --scriptsdir /etc/piuparts/scripts-squeeze
--warn-on-debsums-errors
- -i /etc/shells
+ %(flags-start-squeeze)s
+ %(flags-end-squeeze)s
distro = squeeze
chroot-tgz = squeeze.tar.gz
max-reserved = 50
@@ -118,10 +122,9 @@ precedence = 99
piuparts-flags =
--warn-on-leftovers-after-purge
--dpkg-noforce-unsafe-io
- --no-eatmydata
- --scriptsdir /etc/piuparts/scripts-squeeze
--warn-on-debsums-errors
- -i /etc/shells
+ %(flags-start-squeeze)s
+ %(flags-end-squeeze)s
distro = lenny
upgrade-test-distros = lenny squeeze
upgrade-test-chroot-tgz = lenny.tar.gz
--
piuparts git repository
More information about the Piuparts-commits
mailing list