[Piuparts-commits] [piuparts] 06/07: p: do not require --scriptsdir for proper operation

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch develop
in repository piuparts.

commit d7f31726f07bb61a26d073c9dac3057497c6c19d
Author: Andreas Beckmann <anbe at debian.org>
Date:   Sun Feb 26 01:05:30 2017 +0100

    p: do not require --scriptsdir for proper operation
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 debian/changelog | 1 +
 piuparts.py      | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ad44faa..9ec842a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ piuparts (0.76) UNRELEASED; urgency=medium
 
   [ Andreas Beckmann ]
   * piuparts.py:
+    - Do not require --scriptsdir for proper operation.  (Closes: #855038)
     - Make install_over_symlink tests fail by default, add
       --warn-on-install-over-symlink option to demote this to a warning.
   * piuparts.conf:
diff --git a/piuparts.py b/piuparts.py
index 686a56f..2b99a80 100644
--- a/piuparts.py
+++ b/piuparts.py
@@ -1789,15 +1789,15 @@ class Chroot:
     def run_scripts(self, step, ignore_errors=False):
         """ Run custom scripts to given step post-install|remove|purge"""
 
+        errorcodes = 0
         if not settings.scriptsdirs:
-            return
+            return errorcodes
         logging.info("Running scripts " + step)
         basepath = self.relative("tmp/scripts/")
         if not os.path.exists(basepath):
             logging.error("Scripts directory %s does not exist" % basepath)
             panic()
         list_scripts = sorted(os.listdir(basepath))
-        errorcodes=0
         for vfile in list_scripts:
             if vfile.startswith(step):
                 script = os.path.join("tmp/scripts", vfile)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/piuparts/piuparts.git