[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.47-17-ga7f2df4

[Andreas Beckmann]

The following commit has been merged in the develop branch:
commit 5bfd88eee0fc156739b9b8f0a612cfb7217a8232
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Wed Sep 26 17:44:32 2012 +0200

    p: add --install-recommends option
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/debian/changelog b/debian/changelog
index c570c10..671cdd7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ piuparts (0.48) UNRELEASED; urgency=low
       ( test $(dirname $x) != $(readlink -f $(dirname $x)) )
     - Add debsums, processes, and broken-symlinks check after the first purge
       in --install-purge-install mode.
+    - Add --install-recommends option, disabled by default.
   * piuparts-master.py:
     - Enable recycling before initializing the real package db.
   * piuparts-slave.py:
diff --git a/piuparts.1.txt b/piuparts.1.txt
index 47d892c..0fd20cb 100644
--- a/piuparts.1.txt
+++ b/piuparts.1.txt
@@ -85,6 +85,9 @@ The tarball can be created with the '-s' option, or you can use one that *pbuild
 *--install-purge-install*::
   Purge package after installation and reinstall. All depedencies are installed during purge.
 
+*--install-recommends*::
+  Enable installation of Recommends.
+
 *--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 8152ca0..103c76c 100644
--- a/piuparts.py
+++ b/piuparts.py
@@ -141,6 +141,7 @@ class Settings:
         self.debian_distros = []
         self.keep_sources_list = False
         self.do_not_verify_signatures = False
+        self.install_recommends = False
         self.scriptsdirs = []
         self.bindmounts = []
         # chroot setup
@@ -901,11 +902,9 @@ class Chroot:
 
     def create_apt_conf(self):
         """Create /etc/apt/apt.conf.d/piuparts inside the chroot."""
-        lines = [
-            'APT::Get::Assume-Yes "yes";\n',
-            'APT::Install-Recommends "0";\n',
-            'APT::Install-Suggests "0";\n',
-            ]
+        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::Get::AllowUnauthenticated "%s";\n' % settings.apt_unauthenticated)
         if "HTTP_PROXY" in os.environ:
             proxy = os.environ["HTTP_PROXY"]
@@ -2443,6 +2442,10 @@ def parse_command_line():
                            "expressions for filenames to be " +
                            "ignored when comparing changes to chroot.")
 
+    parser.add_option("--install-recommends",
+                      action="store_true", default=False,
+                      help="Enable the installation of Recommends.")
+
     parser.add_option("-k", "--keep-tmpdir",
                       action="store_true", default=False,
                       help="Don't remove the temporary directory for the " +
@@ -2616,6 +2619,7 @@ def parse_command_line():
     else:
       settings.keyringoption="--keyring=%s" % settings.keyring
       settings.apt_unauthenticated="No"
+    settings.install_recommends = opts.install_recommends
     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

-- 
piuparts git repository