Merge lp:~mvo/click/dpkg-less-verbose into lp:click/devel

[Michael Vogt]

This branch hides the dpkg unpack output by default unless "--verbose" is given.

[Colin Watson (cjwatson)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:547
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~mvo/click/dpkg-less-verbose/+merge/243532/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/click-devel-ci/125/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/click-devel-vivid-amd64-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/click-devel-vivid-armhf-ci/9
        deb: http://jenkins.qa.ubuntu.com/job/click-devel-vivid-armhf-ci/9/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/click-devel-vivid-i386-ci/9

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/click-devel-ci/125/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'click/commands/install.py'
--- click/commands/install.py	2014-09-10 12:28:49 +0000
+++ click/commands/install.py	2014-12-03 12:45:25 +0000
@@ -46,6 +46,9 @@
     parser.add_option(
         "--allow-unauthenticated", default=False, action="store_true",
         help="allow installing packages with no signatures")
+    parser.add_option(
+        "--verbose", default=False, action="store_true",
+        help="be more verbose on install")
     options, args = parser.parse_args(argv)
     if len(args) < 1:
         parser.error("need package file name")
@@ -59,7 +62,8 @@
         allow_unauthenticated=options.allow_unauthenticated)
     try:
         installer.install(
-            package_path, user=options.user, all_users=options.all_users)
+            package_path, user=options.user, all_users=options.all_users,
+            quiet=not options.verbose)
     except ClickInstallerError as e:
         print("Cannot install %s: %s" % (package_path, e), file=sys.stderr)
         return 1
 
=== modified file 'click/install.py'
--- click/install.py	2014-09-10 11:50:18 +0000
+++ click/install.py	2014-12-03 12:45:25 +0000
@@ -347,7 +347,7 @@
             os.mkdir(os.path.join(admin_dir, "updates"))
             os.mkdir(os.path.join(admin_dir, "triggers"))
 
-    def _unpack(self, path, user=None, all_users=False):
+    def _unpack(self, path, user=None, all_users=False, quiet=True):
         package_name, package_version = self.audit(path, check_arch=True)
 
         # Is this package already unpacked in an underlay (non-topmost)
@@ -401,9 +401,20 @@
             kwargs = {}
             if sys.version >= "3.2":
                 kwargs["pass_fds"] = (fd.fileno(),)
-            subprocess.check_call(
-                command, preexec_fn=partial(self._install_preexec, inst_dir),
-                env=env, **kwargs)
+            if quiet:
+                fn = subprocess.check_output
+                kwargs["stderr"] = subprocess.STDOUT
+            else:
+                fn = subprocess.check_call
+            try:
+                fn(command,
+                    preexec_fn=partial(self._install_preexec, inst_dir),
+                    env=env, universal_newlines=True,
+                    **kwargs)
+            except subprocess.CalledProcessError as e:
+                logging.error("%s failed with exit_code %s:\n%s" % (
+                    command, e.returncode, e.output))
+                raise
         for dirpath, dirnames, filenames in os.walk(inst_dir):
             for entry in dirnames + filenames:
                 entry_path = os.path.join(dirpath, entry)
@@ -441,9 +452,9 @@
 
         return package_name, package_version, old_version
 
-    def install(self, path, user=None, all_users=False):
+    def install(self, path, user=None, all_users=False, quiet=True):
         package_name, package_version, old_version = self._unpack(
-            path, user=user, all_users=all_users)
+            path, user=user, all_users=all_users, quiet=quiet)
 
         if user is not None or all_users:
             if all_users:
 
=== modified file 'click/tests/test_install.py'
--- click/tests/test_install.py	2014-08-19 06:32:16 +0000
+++ click/tests/test_install.py	2014-12-03 12:45:25 +0000
@@ -456,18 +456,12 @@
         with self.run_in_subprocess(
                 "click_get_frameworks_dir") as (enter, preloads):
             enter()
-            original_call = subprocess.call
+            original_call = subprocess.check_output
 
             def call_side_effect(*args, **kwargs):
-                if "TEST_VERBOSE" in os.environ:
-                    return original_call(
-                        ["touch", os.path.join(self.temp_dir, "sentinel")],
-                        **kwargs)
-                else:
-                    with open("/dev/null", "w") as devnull:
-                        return original_call(
-                            ["touch", os.path.join(self.temp_dir, "sentinel")],
-                            stdout=devnull, stderr=devnull, **kwargs)
+                return original_call(
+                    ["touch", os.path.join(self.temp_dir, "sentinel")],
+                    **kwargs)
 
             path = self.make_fake_package(
                 control_fields={
@@ -490,7 +484,7 @@
             db.add(root)
             installer = ClickInstaller(db)
             self._setup_frameworks(preloads, frameworks=["ubuntu-sdk-13.10"])
-            with mock.patch("subprocess.call") as mock_call:
+            with mock.patch("subprocess.check_output") as mock_call:
                 mock_call.side_effect = call_side_effect
                 self.assertRaises(
                     subprocess.CalledProcessError, installer.install, path)