[Piuparts-commits] [piuparts] 03/07: p: add option --install-suggests

[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 e96eb8d7ce22a91209ddec3e5a2c58959f4503a4
Author: Andreas Beckmann <anbe at debian.org>
Date:   Mon Mar 6 03:10:29 2017 +0100

    p: add option --install-suggests
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 debian/changelog | 1 +
 piuparts.1.txt   | 3 +++
 piuparts.py      | 8 +++++++-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 53ce6cf..9eb0edb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ piuparts (0.76) UNRELEASED; urgency=medium
     - 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.
+    - Add --install-suggests option.
   * piuparts.conf:
     - Use --warn-on-install-over-symlink for tests ending before stretch.
     - Enable scripts-log-alternatives for [sid] and [stretch].  (See: #850917)
diff --git a/piuparts.1.txt b/piuparts.1.txt
index b9bd949..943450c 100644
--- a/piuparts.1.txt
+++ b/piuparts.1.txt
@@ -128,6 +128,9 @@ The tarball can be created with the '-s' option, or you can use one that *pbuild
 *--install-recommends*::
   Enable installation of Recommends.
 
+*--install-suggests*::
+  Enable installation of Suggests.
+
 *--install-remove-install*::
   Remove package after installation and reinstall. For testing installation in config-files-remaining state.
 
diff --git a/piuparts.py b/piuparts.py
index 377e108..4e0904c 100644
--- a/piuparts.py
+++ b/piuparts.py
@@ -168,6 +168,7 @@ class Settings:
         self.do_not_verify_signatures = False
         self.no_check_valid_until = False
         self.install_recommends = False
+        self.install_suggests = False
         self.eatmydata = True
         self.dpkg_force_unsafe_io = True
         self.dpkg_force_confdef = False
@@ -967,7 +968,7 @@ class Chroot:
         """Create /etc/apt/apt.conf.d/piuparts inside the chroot."""
         lines = ['APT::Get::Assume-Yes "yes";\n']
         lines.append('APT::Install-Recommends "%d";\n' % int(settings.install_recommends))
-        lines.append('APT::Install-Suggests "0";\n')
+        lines.append('APT::Install-Suggests "%d";\n' % int(settings.install_suggests))
         lines.append('APT::Get::AllowUnauthenticated "%s";\n' % settings.apt_unauthenticated)
         lines.append('Acquire::PDiffs "false";\n')
         if settings.no_check_valid_until:
@@ -2865,6 +2866,10 @@ def parse_command_line():
                       action="store_true", default=False,
                       help="Enable the installation of Recommends.")
 
+    parser.add_option("--install-suggests",
+                      action="store_true", default=False,
+                      help="Enable the installation of Suggests.")
+
     parser.add_option("-k", "--keep-tmpdir",
                       action="store_true", default=False,
                       help="Don't remove the temporary directory for the " +
@@ -3095,6 +3100,7 @@ def parse_command_line():
         settings.apt_unauthenticated = "No"
     settings.no_check_valid_until = opts.no_check_valid_until
     settings.install_recommends = opts.install_recommends
+    settings.install_suggests = opts.install_suggests
     settings.eatmydata = not opts.no_eatmydata
     settings.dpkg_force_unsafe_io = not opts.dpkg_noforce_unsafe_io
     settings.dpkg_force_confdef = opts.dpkg_force_confdef

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