[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.49-170-g8d5f89c

[Andreas Beckmann]

The following commit has been merged in the develop branch:
commit 8d5f89c64cbe0aca37b622fe0f2d0a48173a54f0
Author: Andreas Beckmann <anbe at debian.org>
Date:   Fri Mar 8 08:16:54 2013 +0100

    p-s: fix mismerge and drop superfluous comment
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>

diff --git a/README.txt b/README.txt
index 33c7ee1..dccda81 100644
--- a/README.txt
+++ b/README.txt
@@ -588,8 +588,7 @@ section, too, and will serve as defaults for all other sections
 * "chroot-tgz" is the name of the file the slave should use for
  the tarball containing the base chroot. The default name is
  generated automatically from the "distro" or "upgrade-test-distros"
- setting.  Overriding the default should no longer be necceessary.
- If the tarball doesn't exist, the slave creates it.
+ setting. If the tarball doesn't exist, the slave creates it.
 
 * "basetgz-directory" is the directory where "chroot-tgz" (or the
  automatically selected default name) is located. The default is
diff --git a/piuparts-slave.py b/piuparts-slave.py
index 5f399c3..acc5f8f 100644
--- a/piuparts-slave.py
+++ b/piuparts-slave.py
@@ -584,7 +584,6 @@ class Section:
                                    time.gmtime()))
 
         distupgrade = len(self._config.get_distros()) > 1
-        ret = 0
 
         command = self._config["piuparts-command"].split()
         if self._config["piuparts-flags"]:
@@ -607,6 +606,7 @@ class Section:
         command.extend(["--apt", "%s=%s" % (pname, pvers)])
 
         subdir = "fail"
+        ret = 0
 
         if not distupgrade:
             distro = self._config.get_distro()

-- 
piuparts git repository