Merge lp:click/devel into lp:click

[Michael Vogt]

Click 0.4.37 (skipping 0.4.36 to workaround version conflicts in PPAs): bugfixes, geoip based chroot mirror selection

  [ Michael Vogt ]
  * lp:~mvo/click/no-error-no-missing-systemctl:
    - fix a spurious error message on systems without systemctl
  * lp:~mvo/click/do-not-crash-in-build-on-broken-symlinks:
    - do not crash when building a click package that contains broken
      symlinks
  * lp:~mvo/click/dpkg-less-verbose:
    - do not show dpkg output on install unless --verbose is used
  * lp:~mvo/click/lp1394256-run-user-hooks:
    - ensures that click user hooks are run for all logged in users when
      click is used with "--all-users".
  * lp:~mvo/click/qt5-qmake-cross-armhf:
    - add qt5-qmake-arm-linux-gnueabihf to chroot (LP: #1393698)
  * lp:~mvo/click/chroot-15.04-multiarch:
    - add ubuntu-sdk-libs-tools and oxide-codecs-extra to the chroot
  * lp:~mvo/click/lp1394256-run-user-hooks-on-remove-too:
    - Run the click remove user hooks for all logged in users.
  * click/chroot.py:
    - use string.format() for chroot TARGET selection
  * skip 0.4.36 version and go straight to 0.4.37 (LP: #1418086)

  [ Zoltan Balogh ]
  * lp:~bzoltan/click/vivid-transition_mirrors:
    - use geoip to guess the most suitable country mirror when creating
      the click chroot

[Michael Vogt (mvo)]

review: Approve

=== modified file 'click/build.py'
--- click/build.py	2014-05-05 13:10:19 +0000
+++ click/build.py	2015-02-13 12:37:00 +0000
@@ -274,7 +274,10 @@
             with open(md5sums_path, "w") as md5sums:
                 for path in sorted(self.list_files(root_path)):
                     md5 = hashlib.md5()
-                    with open(os.path.join(root_path, path), "rb") as f:
+                    p = os.path.join(root_path, path)
+                    if not os.path.exists(p):
+                        continue
+                    with open(p, "rb") as f:
                         while True:
                             buf = f.read(16384)
                             if not buf:
 
=== modified file 'click/chroot.py'
--- click/chroot.py	2014-11-13 10:20:37 +0000
+++ click/chroot.py	2015-02-13 12:37:00 +0000
@@ -26,6 +26,8 @@
     "ClickChrootDoesNotExistException",
     ]
 
+import urllib
+import urllib.request
 import os
 import pwd
 import re
@@ -34,6 +36,7 @@
 import subprocess
 import sys
 from textwrap import dedent
+from xml.etree import ElementTree
 
 
 framework_base = {
@@ -67,114 +70,121 @@
 # Please keep the lists of package names sorted.
 extra_packages = {
     "ubuntu-sdk-13.10": [
-        "libqt5opengl5-dev:TARGET",
-        "libqt5svg5-dev:TARGET",
-        "libqt5v8-5-dev:TARGET",
-        "libqt5webkit5-dev:TARGET",
-        "libqt5xmlpatterns5-dev:TARGET",
-        "qmlscene:TARGET",
-        "qt3d5-dev:TARGET",
-        "qt5-default:TARGET",
-        "qt5-qmake:TARGET",
-        "qtbase5-dev:TARGET",
-        "qtdeclarative5-dev:TARGET",
-        "qtmultimedia5-dev:TARGET",
-        "qtquick1-5-dev:TARGET",
-        "qtscript5-dev:TARGET",
-        "qtsensors5-dev:TARGET",
-        "qttools5-dev:TARGET",
+        "libqt5opengl5-dev:{TARGET}",
+        "libqt5svg5-dev:{TARGET}",
+        "libqt5v8-5-dev:{TARGET}",
+        "libqt5webkit5-dev:{TARGET}",
+        "libqt5xmlpatterns5-dev:{TARGET}",
+        "qmlscene:{TARGET}",
+        "qt3d5-dev:{TARGET}",
+        "qt5-default:{TARGET}",
+        "qt5-qmake:{TARGET}",
+        "qtbase5-dev:{TARGET}",
+        "qtdeclarative5-dev:{TARGET}",
+        "qtmultimedia5-dev:{TARGET}",
+        "qtquick1-5-dev:{TARGET}",
+        "qtscript5-dev:{TARGET}",
+        "qtsensors5-dev:{TARGET}",
+        "qttools5-dev:{TARGET}",
         "ubuntu-ui-toolkit-doc",
         ],
     "ubuntu-sdk-14.04": [
         "cmake",
-        "google-mock:TARGET",
+        "google-mock:{TARGET}",
         "intltool",
-        "libboost1.54-dev:TARGET",
-        "libjsoncpp-dev:TARGET",
-        "libprocess-cpp-dev:TARGET",
-        "libproperties-cpp-dev:TARGET",
-        "libqt5svg5-dev:TARGET",
-        "libqt5webkit5-dev:TARGET",
-        "libqt5xmlpatterns5-dev:TARGET",
-        "libunity-scopes-dev:TARGET",
+        "libboost1.54-dev:{TARGET}",
+        "libjsoncpp-dev:{TARGET}",
+        "libprocess-cpp-dev:{TARGET}",
+        "libproperties-cpp-dev:{TARGET}",
+        "libqt5svg5-dev:{TARGET}",
+        "libqt5webkit5-dev:{TARGET}",
+        "libqt5xmlpatterns5-dev:{TARGET}",
+        "libunity-scopes-dev:{TARGET}",
         # bug #1316930, needed for autopilot
         "python3",
-        "qmlscene:TARGET",
-        "qt3d5-dev:TARGET",
-        "qt5-default:TARGET",
-        "qtbase5-dev:TARGET",
-        "qtdeclarative5-dev:TARGET",
+        "qmlscene:{TARGET}",
+        "qt3d5-dev:{TARGET}",
+        "qt5-default:{TARGET}",
+        "qtbase5-dev:{TARGET}",
+        "qtdeclarative5-dev:{TARGET}",
         "qtdeclarative5-dev-tools",
-        "qtlocation5-dev:TARGET",
-        "qtmultimedia5-dev:TARGET",
-        "qtscript5-dev:TARGET",
-        "qtsensors5-dev:TARGET",
-        "qttools5-dev:TARGET",
-        "qttools5-dev-tools:TARGET",
+        "qtlocation5-dev:{TARGET}",
+        "qtmultimedia5-dev:{TARGET}",
+        "qtscript5-dev:{TARGET}",
+        "qtsensors5-dev:{TARGET}",
+        "qttools5-dev:{TARGET}",
+        "qttools5-dev-tools:{TARGET}",
         "ubuntu-ui-toolkit-doc",
         ],
     "ubuntu-sdk-14.10": [
         "cmake",
         "cmake-extras",
-        "google-mock:TARGET",
+        "google-mock:{TARGET}",
         "intltool",
-        "libboost1.55-dev:TARGET",
-        "libcontent-hub-dev:TARGET",
-        "libjsoncpp-dev:TARGET",
-        "libnet-cpp-dev:TARGET",
-        "libprocess-cpp-dev:TARGET",
-        "libproperties-cpp-dev:TARGET",
-        "libqt5keychain0:TARGET",
-        "libqt5sensors5-dev:TARGET",
-        "libqt5svg5-dev:TARGET",
-        "libqt5webkit5-dev:TARGET",
-        "libqt5xmlpatterns5-dev:TARGET",
-        "libunity-scopes-dev:TARGET",
+        "libboost1.55-dev:{TARGET}",
+        "libcontent-hub-dev:{TARGET}",
+        "libjsoncpp-dev:{TARGET}",
+        "libnet-cpp-dev:{TARGET}",
+        "libprocess-cpp-dev:{TARGET}",
+        "libproperties-cpp-dev:{TARGET}",
+        "libqt5keychain0:{TARGET}",
+        "libqt5sensors5-dev:{TARGET}",
+        "libqt5svg5-dev:{TARGET}",
+        "libqt5webkit5-dev:{TARGET}",
+        "libqt5xmlpatterns5-dev:{TARGET}",
+        "libunity-scopes-dev:{TARGET}",
         # bug #1316930, needed for autopilot
         "python3",
-        "qml-module-qt-labs-settings:TARGET",
-        "qml-module-qtmultimedia:TARGET",
-        "qml-module-qtquick-layouts:TARGET",
-        "qml-module-qtsensors:TARGET",
-        "qml-module-qtwebkit:TARGET",
-        "qmlscene:TARGET",
-        "qt3d5-dev:TARGET",
-        "qt5-default:TARGET",
-        "qtdeclarative5-accounts-plugin:TARGET",
+        "qml-module-qt-labs-settings:{TARGET}",
+        "qml-module-qtmultimedia:{TARGET}",
+        "qml-module-qtquick-layouts:{TARGET}",
+        "qml-module-qtsensors:{TARGET}",
+        "qml-module-qtwebkit:{TARGET}",
+        "qmlscene:{TARGET}",
+        "qt3d5-dev:{TARGET}",
+        "qt5-default:{TARGET}",
+        "qtdeclarative5-accounts-plugin:{TARGET}",
         "qtdeclarative5-dev-tools",
-        "qtdeclarative5-folderlistmodel-plugin:TARGET",
-        "qtdeclarative5-localstorage-plugin:TARGET",
-        "qtdeclarative5-online-accounts-client0.1:TARGET",
-        "qtdeclarative5-particles-plugin:TARGET",
-        "qtdeclarative5-poppler1.0:TARGET",
-        "qtdeclarative5-qtlocation-plugin:TARGET",
-        "qtdeclarative5-qtorganizer-plugin:TARGET",
-        "qtdeclarative5-qtpositioning-plugin:TARGET",
-        "qtdeclarative5-u1db1.0:TARGET",
-        "qtdeclarative5-ubuntu-content0.1:TARGET",
-        "qtdeclarative5-ubuntu-download-manager0.1:TARGET",
-        "qtdeclarative5-ubuntu-mediascanner0.1:TARGET",
-        "qtdeclarative5-ubuntu-syncmonitor0.1:TARGET",
-        "qtdeclarative5-ubuntu-telephony-phonenumber0.1:TARGET",
-        "qtdeclarative5-ubuntu-ui-toolkit-plugin:TARGET",
-        "qtdeclarative5-usermetrics0.1:TARGET",
-        "qtdeclarative5-xmllistmodel-plugin:TARGET",
-        "qtlocation5-dev:TARGET",
-        "qtmultimedia5-dev:TARGET",
-        "qtscript5-dev:TARGET",
-        "qttools5-dev:TARGET",
-        "qttools5-dev-tools:TARGET",
-        "ubuntu-html5-theme:TARGET",
+        "qtdeclarative5-folderlistmodel-plugin:{TARGET}",
+        "qtdeclarative5-localstorage-plugin:{TARGET}",
+        "qtdeclarative5-online-accounts-client0.1:{TARGET}",
+        "qtdeclarative5-particles-plugin:{TARGET}",
+        "qtdeclarative5-poppler1.0:{TARGET}",
+        "qtdeclarative5-qtlocation-plugin:{TARGET}",
+        "qtdeclarative5-qtorganizer-plugin:{TARGET}",
+        "qtdeclarative5-qtpositioning-plugin:{TARGET}",
+        "qtdeclarative5-u1db1.0:{TARGET}",
+        "qtdeclarative5-ubuntu-content0.1:{TARGET}",
+        "qtdeclarative5-ubuntu-download-manager0.1:{TARGET}",
+        "qtdeclarative5-ubuntu-mediascanner0.1:{TARGET}",
+        "qtdeclarative5-ubuntu-syncmonitor0.1:{TARGET}",
+        "qtdeclarative5-ubuntu-telephony-phonenumber0.1:{TARGET}",
+        "qtdeclarative5-ubuntu-ui-toolkit-plugin:{TARGET}",
+        "qtdeclarative5-usermetrics0.1:{TARGET}",
+        "qtdeclarative5-xmllistmodel-plugin:{TARGET}",
+        "qtlocation5-dev:{TARGET}",
+        "qtmultimedia5-dev:{TARGET}",
+        "qtscript5-dev:{TARGET}",
+        "qttools5-dev:{TARGET}",
+        "qttools5-dev-tools:{TARGET}",
+        "ubuntu-html5-theme:{TARGET}",
         "ubuntu-ui-toolkit-doc",
         ],
     "ubuntu-sdk-15.04": [
         # the sdk libs
-        "ubuntu-sdk-libs:TARGET",
-        "ubuntu-sdk-libs-dev:TARGET",
+        "ubuntu-sdk-libs:{TARGET}",
+        "ubuntu-sdk-libs-dev:{TARGET}",
+        # the native build tools
+        "ubuntu-sdk-libs-tools",
+        # FIXME: see
+        #  http://pad.lv/~mvo/oxide/crossbuild-friendly/+merge/234093
+        # we help the apt resolver here until the
+        #  oxideqt-codecs/oxidec-codecs-extras is sorted
+        "oxideqt-codecs-extra",
         ],
     "ubuntu-core-15.04-dev1": [
-        "ubuntu-core-libs:TARGET",
-        "ubuntu-core-libs-dev:TARGET",
+        "ubuntu-core-libs:{TARGET}",
+        "ubuntu-core-libs-dev:{TARGET}",
         ],
     }
 
@@ -185,6 +195,56 @@
 non_meta_re = re.compile(r'^[a-zA-Z0-9+,./:=@_-]+$')
 
 
+GEOIP_SERVER = "http://geoip.ubuntu.com/lookup"
+
+
+def get_geoip_country_code_prefix():
+    click_no_local_mirror = os.environ.get('CLICK_NO_LOCAL_MIRROR', 'auto')
+    if click_no_local_mirror == '1':
+        return ""
+    try:
+        with urllib.request.urlopen(GEOIP_SERVER) as f:
+            xml_data = f.read()
+        et = ElementTree.fromstring(xml_data)
+        return et.find("CountryCode").text.lower()+"."
+    except (ElementTree.ParseError, urllib.error.URLError):
+        pass
+    return ""
+
+def generate_sources(series, native_arch, target_arch,
+                     archive_mirror, ports_mirror, components):
+    """Generate a list of strings for apts sources.list.
+    Arguments:
+    series -- the distro series (e.g. vivid)
+    native_arch -- the native architecture (e.g. amd64)
+    target_arch -- the target architecture (e.g. armhf)
+    archive_mirror -- main mirror, e.g. http://archive.ubuntu.com/ubuntu
+    ports_mirror -- ports mirror, e.g. http://ports.ubuntu.com/ubuntu-ports
+    components -- the components as string, e.g. "main restricted universe"
+    """
+    pockets = ['%s' % series]
+    for pocket in ['updates', 'security']:
+        pockets.append('%s-%s' % (series, pocket))
+    sources = []
+    # write binary lines
+    arches = [target_arch]
+    if native_arch != target_arch:
+        arches.append(native_arch)
+    for arch in arches:
+        if arch not in primary_arches:
+            mirror = ports_mirror
+        else:
+            mirror = archive_mirror
+        for pocket in pockets:
+            sources.append("deb [arch=%s] %s %s %s" %
+                           (arch, mirror, pocket, components))
+    # write source lines
+    for pocket in pockets:
+        sources.append("deb-src %s %s %s" %
+                       (archive_mirror, pocket, components))
+    return sources
+
+
 def shell_escape(command):
     escaped = []
     for arg in command:
@@ -247,11 +307,7 @@
         if chroots_dir is None:
             chroots_dir = "/var/lib/schroot/chroots"
         self.chroots_dir = chroots_dir
-        # this doesn't work because we are running this under sudo
-        if 'DEBOOTSTRAP_MIRROR' in os.environ:
-            self.archive = os.environ['DEBOOTSTRAP_MIRROR']
-        else:
-            self.archive = "http://archive.ubuntu.com/ubuntu"
+
         if "SUDO_USER" in os.environ:
             self.user = os.environ["SUDO_USER"]
         elif "PKEXEC_UID" in os.environ:
@@ -330,31 +386,6 @@
                         users="\n".join(users),
                         mount=mount))
 
-    def _generate_sources(self, series, native_arch, target_arch, components):
-        ports_mirror = "http://ports.ubuntu.com/ubuntu-ports"
-        pockets = ['%s' % series]
-        for pocket in ['updates', 'security']:
-            pockets.append('%s-%s' % (series, pocket))
-        sources = []
-        # write binary lines
-        arches = [target_arch]
-        if native_arch != target_arch:
-            arches.append(native_arch)
-        for arch in arches:
-            if arch not in primary_arches:
-                mirror = ports_mirror
-            else:
-                mirror = self.archive
-            for pocket in pockets:
-                sources.append("deb [arch=%s] %s %s %s" %
-                               (arch, mirror, pocket, components))
-        # write source lines
-        for pocket in pockets:
-            sources.append("deb-src %s %s %s" %
-                           (self.archive, pocket, components))
-
-        return sources
-
     def _generate_daemon_policy(self, mount):
         daemon_policy = "%s/usr/sbin/policy-rc.d" % mount
         with open(daemon_policy, "w") as policy:
@@ -409,7 +440,7 @@
                         build_pkgs=' '.join(build_pkgs)))
         return finish_script
 
-    def _debootstrap(self, components, mount):
+    def _debootstrap(self, components, mount, archive):
         subprocess.check_call([
             "debootstrap",
             "--arch", self.native_arch,
@@ -417,7 +448,7 @@
             "--components=%s" % ','.join(components),
             self.series,
             mount,
-            self.archive
+            archive
             ])
 
     @property
@@ -467,22 +498,37 @@
             proxy = os.environ["http_proxy"]
         if not proxy:
             proxy = subprocess.check_output(
-                'unset x; eval "$(apt-config shell x Acquire::HTTP::Proxy)"; echo "$x"',
+                'unset x; eval "$(apt-config shell x Acquire::HTTP::Proxy)"; \
+                 echo "$x"',
                 shell=True, universal_newlines=True).strip()
         build_pkgs = [
-            "build-essential", "fakeroot",
-            "apt-utils", self._make_cross_package("g++"),
-            self._make_cross_package("pkg-config"), "cmake",
-            "dpkg-cross", "libc-dev:%s" % self.target_arch
-            ]
+            # sort alphabetically
+            "apt-utils",
+            "build-essential",
+            "cmake",
+            "dpkg-cross",
+            "fakeroot",
+            "libc-dev:%s" % self.target_arch,
+            # build pkg names dynamically
+            self._make_cross_package("g++"),
+            self._make_cross_package("pkg-config"),
+        ]
         for package in extra_packages.get(self.framework_base, []):
-            package = package.replace(":TARGET", ":%s" % self.target_arch)
+            package = package.format(TARGET=self.target_arch)
             build_pkgs.append(package)
         os.makedirs(mount)
-        self._debootstrap(components, mount)
-        sources = self._generate_sources(self.series, self.native_arch,
-                                         self.target_arch,
-                                         ' '.join(components))
+
+        country_code = get_geoip_country_code_prefix()
+        archive = "http://%sarchive.ubuntu.com/ubuntu" % country_code
+        ports_mirror = "http://%sports.ubuntu.com/ubuntu-ports" % country_code
+        # this doesn't work because we are running this under sudo
+        if 'DEBOOTSTRAP_MIRROR' in os.environ:
+            archive = os.environ['DEBOOTSTRAP_MIRROR']
+        self._debootstrap(components, mount, archive)
+        sources = generate_sources(self.series, self.native_arch,
+                                   self.target_arch,
+                                   archive, ports_mirror,
+                                   ' '.join(components))
         with open("%s/etc/apt/sources.list" % mount, "w") as sources_list:
             for line in sources:
                 print(line, file=sources_list)
 
=== modified file 'click/commands/install.py'
--- click/commands/install.py	2014-09-10 12:28:49 +0000
+++ click/commands/install.py	2015-02-13 12:37:00 +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	2015-02-13 12:37:00 +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_build.py'
--- click/tests/test_build.py	2014-09-04 13:41:30 +0000
+++ click/tests/test_build.py	2015-02-13 12:37:00 +0000
@@ -134,6 +134,8 @@
         touch(os.path.join(scratch, ".git", "config"))
         with mkfile(os.path.join(scratch, "toplevel")) as f:
             f.write("test /toplevel\n")
+        os.symlink(
+            "file-does-not-exist", os.path.join(scratch, "broken-symlink"))
         with mkfile(os.path.join(scratch, "manifest.json")) as f:
             json.dump({
                 "name": "com.example.test",
 
=== modified file 'click/tests/test_chroot.py'
--- click/tests/test_chroot.py	2014-07-02 09:07:13 +0000
+++ click/tests/test_chroot.py	2015-02-13 12:37:00 +0000
@@ -28,6 +28,7 @@
 
 from click.chroot import (
     ClickChroot,
+    generate_sources,
     strip_dev_series_from_framework,
 )
 from click.tests.helpers import TestCase, mock
@@ -48,7 +49,7 @@
         self._maint_kwargs = kwargs
         return 0
 
-    def _debootstrap(self, components, mount):
+    def _debootstrap(self, components, mount, archive_server):
         os.makedirs(os.path.join(mount, "etc", "apt"))
         os.makedirs(os.path.join(mount, "usr", "sbin"))
         os.makedirs(os.path.join(mount, "sbin"))
@@ -110,8 +111,10 @@
     def test_gen_sources_archive_only(self):
         chroot = ClickChroot("amd64", "ubuntu-sdk-13.10", series="trusty")
         chroot.native_arch = "i386"
-        sources = chroot._generate_sources(
+        sources = generate_sources(
             chroot.series, chroot.native_arch, chroot.target_arch,
+            "http://archive.ubuntu.com/ubuntu",
+            "http://ports.ubuntu.com/ubuntu-ports",
             "main")
         self.assertEqual([
             'deb [arch=amd64] http://archive.ubuntu.com/ubuntu trusty main',
@@ -128,8 +131,10 @@
     def test_gen_sources_mixed_archive_ports(self):
         chroot = ClickChroot("armhf", "ubuntu-sdk-13.10", series="trusty")
         chroot.native_arch = "i386"
-        sources = chroot._generate_sources(
+        sources = generate_sources(
             chroot.series, chroot.native_arch, chroot.target_arch,
+            "http://archive.ubuntu.com/ubuntu",
+            "http://ports.ubuntu.com/ubuntu-ports",
             "main")
         self.assertEqual([
             'deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports trusty main',
@@ -146,8 +151,10 @@
     def test_gen_sources_ports_only(self):
         chroot = ClickChroot("armhf", "ubuntu-sdk-13.10", series="trusty")
         chroot.native_arch = "armel"
-        sources = chroot._generate_sources(
+        sources = generate_sources(
             chroot.series, chroot.native_arch, chroot.target_arch,
+            "http://archive.ubuntu.com/ubuntu",
+            "http://ports.ubuntu.com/ubuntu-ports",
             "main")
         self.assertEqual([
             'deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports trusty main',
@@ -164,8 +171,10 @@
     def test_gen_sources_native(self):
         chroot = ClickChroot("i386", "ubuntu-sdk-14.04", series="trusty")
         chroot.native_arch = "i386"
-        sources = chroot._generate_sources(
+        sources = generate_sources(
             chroot.series, chroot.native_arch, chroot.target_arch,
+            "http://archive.ubuntu.com/ubuntu",
+            "http://ports.ubuntu.com/ubuntu-ports",
             "main")
         self.assertEqual([
             'deb [arch=i386] http://archive.ubuntu.com/ubuntu trusty main',
 
=== modified file 'click/tests/test_install.py'
--- click/tests/test_install.py	2014-08-19 06:32:16 +0000
+++ click/tests/test_install.py	2015-02-13 12:37:00 +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)
 
=== modified file 'debian/changelog'
--- debian/changelog	2014-11-14 12:29:14 +0000
+++ debian/changelog	2015-02-13 12:37:00 +0000
@@ -1,3 +1,33 @@
+click (0.4.37) UNRELEASED; urgency=low
+
+  [ Michael Vogt ]
+  * lp:~mvo/click/no-error-no-missing-systemctl:
+    - fix a spurious error message on systems without systemctl
+  * lp:~mvo/click/do-not-crash-in-build-on-broken-symlinks:
+    - do not crash when building a click package that contains broken
+      symlinks
+  * lp:~mvo/click/dpkg-less-verbose:
+    - do not show dpkg output on install unless --verbose is used
+  * lp:~mvo/click/lp1394256-run-user-hooks:
+    - ensures that click user hooks are run for all logged in users when
+      click is used with "--all-users".
+  * lp:~mvo/click/qt5-qmake-cross-armhf:
+    - add qt5-qmake-arm-linux-gnueabihf to chroot (LP: #1393698)
+  * lp:~mvo/click/chroot-15.04-multiarch:
+    - add ubuntu-sdk-libs-tools and oxide-codecs-extra to the chroot
+  * lp:~mvo/click/lp1394256-run-user-hooks-on-remove-too:
+    - Run the click remove user hooks for all logged in users.
+  * click/chroot.py:
+    - use string.format() for chroot TARGET selection
+  * skip 0.4.36 version and go straight to 0.4.37 (LP: #1418086)
+
+  [ Zoltan Balogh ]
+  * lp:~bzoltan/click/vivid-transition_mirrors:
+    - use geoip to guess the most suitable country mirror when creating
+      the click chroot
+
+ -- Ubuntu daily release <[e-mail]>  Fri, 14 Nov 2014 12:29:14 +0000
+
 click (0.4.35) vivid; urgency=low
 
   [ Michael Vogt ]
 
=== modified file 'debian/click.postinst'
--- debian/click.postinst	2014-10-14 09:47:48 +0000
+++ debian/click.postinst	2015-02-13 12:37:00 +0000
@@ -13,7 +13,9 @@
 
 	# dh-systemd has no support yet for user systemd units
 	# so we need to do this manually here
-	systemctl --global enable click-user-hooks.service || true
+        if which systemctl >/dev/null 2>&1; then
+	    systemctl --global enable click-user-hooks.service || true
+        fi
 fi
 
 #DEBHELPER#
 
=== modified file 'lib/click/user.vala'
--- lib/click/user.vala	2014-09-29 13:23:12 +0000
+++ lib/click/user.vala	2015-02-13 12:37:00 +0000
@@ -33,8 +33,21 @@
  * symlinks per user.
  */
 
+
 namespace Click {
 
+	struct LogindUser {
+		uint32 uid;
+		string name;
+		string ObjectPath;
+	}
+
+	/* the logind dbus interface */
+	[DBus (name = "org.freedesktop.login1.Manager")]
+	interface LogindManager : Object {
+		public abstract LogindUser[] ListUsers () throws IOError;
+	}
+
 /* Pseudo-usernames selected to be invalid as a real username, and alluding
  * to group syntaxes used in other systems.
  */
@@ -596,6 +609,53 @@
 		if (! is_pseudo_user)
 			package_install_hooks (db, package,
 					       old_version, version, name);
+
+		// run user hooks for all logged in users
+		if (name == ALL_USERS)
+			run_user_install_hooks_for_all_logged_in_users (package, old_version, version);
+	}
+
+	private string[]
+	get_logged_in_users()
+	{
+		string[] logged_in_users = {};
+		try {
+			LogindManager logind = Bus.get_proxy_sync (
+				BusType.SYSTEM,
+				"org.freedesktop.login1",
+				"/org/freedesktop/login1");
+			var users = logind.ListUsers();
+			foreach (LogindUser user in users)
+			{
+				// FIXME: ideally we would read from /etc/adduser.conf
+				if(user.uid >= 1000 && user.uid <= 30000)
+				{
+					logged_in_users += user.name;
+				}
+			}
+		} catch (Error e) {
+			warning ("Can not connect to logind");
+		}
+		return logged_in_users;
+	}
+
+	private void
+	run_user_install_hooks_for_all_logged_in_users (string package, 
+													string? old_version,
+													string version) throws IOError
+	{
+		foreach (string username in get_logged_in_users())
+			package_install_hooks (db, package,
+								   old_version, version, username);
+	}
+
+	private void
+	run_user_remove_hooks_for_all_logged_in_users (string package, 
+												   string old_version) throws IOError
+	{
+		foreach (string username in get_logged_in_users())
+			package_remove_hooks (db, package,
+								  old_version, username);
 	}
 
 	private bool
@@ -688,6 +748,10 @@
 
 		if (! is_pseudo_user)
 			package_remove_hooks (db, package, old_version, name);
+
+		// run user hooks for all logged in users
+		if (name == ALL_USERS)
+			run_user_remove_hooks_for_all_logged_in_users (package, old_version);
 	}
 
 	/**