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

[Holger Levsen]

Hi Maxime,

I've finally applied your patch to the develop branch…


-- 
cheers,
Holger


signature.asc
Description: Digital signature

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

[Holger Levsen]

control: found -1 0.72
thanks

Hi Maxime,

On Tue, Oct 18, 2016 at 11:54:38AM +0200, Maxime Lareo wrote:
> So this is the promised patch :

thanks for this very nice bug report, with rationale & documentation
update & nicely formatted with git! Awesome. I'm pretty sure it will be
included in 0.73, just giving myself a moment to think about it before
merging… :-)


-- 
cheers,
Holger


signature.asc
Description: Digital signature

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 
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   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





signature.asc
Description: OpenPGP digital signature

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

[Maxime Lareo]

Package: piuparts
Version: 0.72~bpo8+1
Severity: minor
User: product...@infomaniak.com
Usertags: infomaniak.com-packaging

Hello,

Pipuarts doesn't allow usage of the option "--keep-sources-list" without
the option "--basetgz", which is
useless in case of an existing schroot for piuparts with the right
sources list set.

In our situation, we already have multiple schroot ready for testing
different distributions and we also have an internal apt-mirror. So we
set schroot sources list to use this internal mirror and we don't want
piuparts to use any other external sources list.

I will send a patch to remove this "--basetgz" condition on
"--keep-sources-list" as soon as this bug get a number.

Thank you, Bye.

-- 
Maxime Lareo
Infomaniak Network SA

-- System Information:
Debian Release: 8.5
  APT prefers stable
  APT policy: (500, 'stable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.18.30-imu (SMP w/4 CPU cores)
Locale: LANG=fr_FR.utf8, LC_CTYPE=fr_FR.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Init: systemd (via /run/systemd/system)

Versions of packages piuparts depends on:
ii  debootstrap  1.0.67
ii  debsums  2.0.53
ii  dpkg 1.17.27
ii  lsb-release  4.1+Debian13+nmu1
ii  lsof 4.86+dfsg-1
ii  piuparts-common  0.72~bpo8+1
ii  python-debian0.1.27
pn  python:any   

Versions of packages piuparts recommends:
pn  adequate  

Versions of packages piuparts suggests:
ii  schroot  1.6.10-2~bpo8+1

-- no debconf information

-- debsums errors found:
debsums: changed file /usr/sbin/piuparts (from piuparts package)




signature.asc
Description: OpenPGP digital signature