[Piuparts-commits] [piuparts] 01/02: Revert "piuparts.py: set scriptsdir to /etc/piuparts/scripts and run this scripts by default." See #752256 for a discussion why this was reverted and why it would be useful to have this still...

[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 8219a062c68981b245fd109af4cdf3b225bfd50f
Author: Holger Levsen <holger at layer-acht.org>
Date:   Mon Jul 14 14:16:40 2014 +0200

    Revert "piuparts.py: set scriptsdir to /etc/piuparts/scripts and run this scripts by default."
    See #752256 for a discussion why this was reverted and why it would be
    useful to have this still...
    
    This reverts commit 73478066a879fdaf5038acf60cbf9fed2432cb23.
---
 README.txt       | 2 --
 debian/changelog | 1 -
 piuparts.1.txt   | 2 +-
 piuparts.py      | 2 +-
 4 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/README.txt b/README.txt
index 2c5ad87..d6e3a68 100644
--- a/README.txt
+++ b/README.txt
@@ -171,8 +171,6 @@ piuparts: '--scriptsdir=/dir/with/the/scripts'
 This option can be given multiple times. The scripts from all
 directories will be merged together (and later ones may overwrite
 earlier scripts with the same filename).
-By default this is set to '/etc/piuparts/scripts', and there are
-other script directories shipped by the package as well.
 
 The script prefix determines in which step it is executed. You
 can run several scripts in every step, they are run in
diff --git a/debian/changelog b/debian/changelog
index 0ebaa1d..aff9211 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,6 @@ piuparts (0.59) UNRELEASED; urgency=low
 
   [ Holger Levsen ]
   * piuparts.py:
-    - set scriptsdir to /etc/piuparts/scripts and run this scripts by default.
     - mount selinuxfs read-only and on new location when possible. Thanks to
       Laurent Bigonville for the patch! (Closes: #682068)
     - Add to ignored_files:
diff --git a/piuparts.1.txt b/piuparts.1.txt
index a27f914..54cfbcb 100644
--- a/piuparts.1.txt
+++ b/piuparts.1.txt
@@ -198,7 +198,7 @@ Note that file: addresses works if the directories are made accessible from with
   Save chroot package selection and file meta data in FILE for later use. See the function install_and_upgrade_between_distros() in piuparts.py for defaults. Mostly useful for large scale distro upgrade tests.
 
 *--scriptsdir*='DIR'::
-  Directory where custom scripts are place, defaults to '/etc/piuparts/scripts'. For more information about this, read README.txt
+  Directory where are placed the custom scripts. For more information about this, read README_server.txt
 
 *--schroot*='SCHROOT-NAME'::
   Use schroot session named SCHROOT-NAME for the chroot, instead of building a new one with debootstrap.
diff --git a/piuparts.py b/piuparts.py
index c8ab79a..aaec972 100644
--- a/piuparts.py
+++ b/piuparts.py
@@ -160,7 +160,7 @@ class Settings:
         self.eatmydata = True
         self.dpkg_force_unsafe_io = True
         self.dpkg_force_confdef = False
-        self.scriptsdirs = [ "/etc/piuparts/scripts" ]
+        self.scriptsdirs = []
         self.bindmounts = []
         self.allow_database = False
         # chroot setup

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