[Piuparts-commits] [piuparts] 01/01: piuparty.ps: apply patch from Maxime Lareo to allow usage of --keep-sources-list without --basetgz. (Closes: #841157)

[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 1dbeb91289b1ed6df041d6dcb28a07bdf3ea9449
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sat Feb 25 15:02:40 2017 +0100

    piuparty.ps: apply patch from Maxime Lareo to allow usage of --keep-sources-list without --basetgz. (Closes: #841157)
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 debian/changelog |  2 ++
 piuparts.1.txt   |  2 +-
 piuparts.py      | 10 ++++------
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c88d7e1..60d3db2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ piuparts (0.76) UNRELEASED; urgency=medium
     started than defined in the configuration. Also add a check to ensure that
     this optional argument is an integer and within the defined maximum number
     of slaves.
+  * piuparty.ps: apply patch from Maxime Lareo to allow usage of
+    --keep-sources-list without --basetgz. (Closes: #841157)
 
  -- Andreas Beckmann <anbe at debian.org>  Mon, 06 Feb 2017 01:11:27 +0100
 
diff --git a/piuparts.1.txt b/piuparts.1.txt
index 751e5ee..b9bd949 100644
--- a/piuparts.1.txt
+++ b/piuparts.1.txt
@@ -138,7 +138,7 @@ The tarball can be created with the '-s' option, or you can use one that *pbuild
  Use FILE as the keyring to use with debootstrap when creating chroots.
 
 *--keep-sources-list*::
-  Don't modify the chroot's etc/apt/sources.list (only makes sense with '--basetgz').
+  Don't modify the chroot's etc/apt/sources.list.
 
 *--list-installed-files*::
   List the files added to the chroot after the installation of the package and after the installation of the package dependencies.
diff --git a/piuparts.py b/piuparts.py
index e947a87..30cfaa9 100644
--- a/piuparts.py
+++ b/piuparts.py
@@ -2872,8 +2872,7 @@ def parse_command_line():
     parser.add_option("--keep-sources-list",
                       action="store_true", default=False,
                       help="Don't modify the chroot's " +
-                           "etc/apt/sources.list (only makes sense " +
-                           "with --basetgz).")
+                           "etc/apt/sources.list.")
 
     parser.add_option("-l", "--log-file", "--logfile", metavar="FILENAME",
                       help="Write log file to FILENAME in addition to " +
@@ -3182,10 +3181,9 @@ def parse_command_line():
     settings.distro_config = piupartslib.conf.DistroConfig(
         DISTRO_CONFIG_FILE, settings.debian_mirrors[0][0])
 
-    if settings.keep_sources_list and \
-       (not settings.basetgz or len(settings.debian_distros) > 1):
-        logging.error("--keep-sources-list only makes sense with --basetgz "
-                      "and only one distribution")
+    if settings.keep_sources_list and len(settings.debian_distros) > 1:
+        logging.error("--keep-sources-list only makes sense "
+                      "with only one distribution")
         exitcode = 1
 
     if not args:

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