[Piuparts-commits] [SCM] piuparts git repository branch, piatti, updated. 0.49-167-gc2d72c8

[Andreas Beckmann]

The following commit has been merged in the piatti branch:
commit a2ff176a03e327f21289c6c1bc03d8ab47e6f202
Author: Andreas Beckmann <anbe at debian.org>
Date:   Mon Mar 4 01:31:32 2013 +0100

    p-s: declare upgrade-test-chroot-tgz obsolete
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>

diff --git a/README.txt b/README.txt
index 795fe80..33c7ee1 100644
--- a/README.txt
+++ b/README.txt
@@ -603,11 +603,6 @@ section, too, and will serve as defaults for all other sections
  Setting this switches from doing install/purge tests to
  dist-upgrade tests. Not set by default.
 
-* "upgrade-test-chroot-tgz" is the name of the file the slave
- should use for the tarball to keep the chroot for the first
- distribution in upgrade-test-distros. If the file does not exist,
- the slave creates it.
-
 * "max-reserved" is the maximum number of packages the slave will
  reserve at once. It should be large enough that the host that
  runs master is not unduly stressed by frequent ssh logins and
diff --git a/conf/piuparts.conf.sample b/conf/piuparts.conf.sample
index 4a6c9c6..143c354 100644
--- a/conf/piuparts.conf.sample
+++ b/conf/piuparts.conf.sample
@@ -36,7 +36,6 @@ distro = sid
 # arch = amd64
 chroot-tgz = sid.tar.gz
 upgrade-test-distros =
-upgrade-test-chroot-tgz =
 max-reserved = 50
 debug = no
 
diff --git a/debian/changelog b/debian/changelog
index 29ab3f2..78c6b70 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,7 @@ piuparts (0.50) UNRELEASED; urgency=low
     - New per-section settings:
       + depends-sections
       + basetgz-directory
+    - Obsolete settings: upgrade-test-chroot-tgz.
     - Setting tmpdir is now mandatory for master/slave operation.
   * distros.conf:
     - New configuration file to describe full distributions (e.g.  sid,
diff --git a/piuparts-slave.py b/piuparts-slave.py
index d8e4a65..5f399c3 100644
--- a/piuparts-slave.py
+++ b/piuparts-slave.py
@@ -86,7 +86,6 @@ class Config(piupartslib.conf.Config):
                 "area": None,
                 "chroot-tgz": None,
                 "upgrade-test-distros": None,
-                "upgrade-test-chroot-tgz": None,
                 "basetgz-directory": ".",
                 "max-reserved": 1,
                 "debug": "no",
@@ -391,11 +390,6 @@ class Section:
         create_or_replace_chroot_tgz(self._config, self._get_tarball(),
                                      self._config.get_start_distro())
 
-        tarball = self._config["upgrade-test-chroot-tgz"]
-        if self._config["upgrade-test-distros"] and tarball:
-            create_or_replace_chroot_tgz(self._config, tarball,
-                                         self._config.get_start_distro())
-
         os.chdir(oldcwd)
 
     def _count_submittable_logs(self):

-- 
piuparts git repository