[Piuparts-devel] Bug#841157: Piuparts: not allow usage of --keep-sources-list without --basetgz

[Maxime Lareo]

tags 841157 + patch
thanks

Hi again,

On Tue, 18 Oct 2016 08:37:53 +0200, Maxime Lareo wrote:
> I will send a patch to remove this "--basetgz" condition on
> "--keep-sources-list" as soon as this bug get a number.

So this is the promised patch :

-----8<---------------cut here------------------start----------->8---
From b27fdcc378f773d304191a45f39f6b64126baa6e Mon Sep 17 00:00:00 2001
From: Maxime Lareo <maxime.lareo at infomaniak.ch>
Date: Tue, 18 Oct 2016 11:46:09 +0200
Subject: [PATCH] piuparts.py: (#841157) allow usage of --keep-sources-list
 without --basetgz

---
 debian/changelog |  7 +++++++
 piuparts.1.txt   |  2 +-
 piuparts.py      | 10 ++++------
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d625897..62fe4cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+piuparts (0.72-1) UNRELEASED; urgency=medium
+
+  * piuparts.py:
+    - allow usage of --keep-sources-list without --basetgz. (Closes:
#841157)
+
+ -- Maxime Lareo <maxime.lareo at infomaniak.com>  Tue, 18 Oct 2016
11:40:56 +0200
+
 piuparts (0.72) unstable; urgency=medium

   [ Holger Levsen ]
diff --git a/piuparts.1.txt b/piuparts.1.txt
index a857f4d..23d98f0 100644
--- a/piuparts.1.txt
+++ b/piuparts.1.txt
@@ -133,7 +133,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 f69c955..96a0a4e 100644
--- a/piuparts.py
+++ b/piuparts.py
@@ -2794,8 +2794,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 " +
@@ -3098,10 +3097,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:
--
2.1.4

-----8<---------------cut here------------------end----------->8---

Thank you, Bye,

-- 
Maxime Lareo
Infomaniak Network SA



-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: OpenPGP digital signature
URL: <http://lists.alioth.debian.org/pipermail/piuparts-devel/attachments/20161018/e90c9c38/attachment.sig>