Merge lp:click into lp:~ubuntu-managed-branches/click/click

[Colin Watson]

Fix crash in "click hook run-user".

  * Make "click hook run-user" ensure that the user registration directory
    exists before dropping privileges and trying to create symlinks in it
    (LP: #1291192).

[lp:click]

380. By Colin Watson on 2014-03-12

Avoid ensure_dbing multiple times.

381. By Colin Watson on 2014-03-12

releasing package click version 0.4.18.2

382. By Colin Watson on 2014-03-12

Take a slightly different approach to fixing "click hook run-user": only
try to update user registration symlinks if they already exist in the
overlay database.

=== modified file 'click/tests/test_hooks.py'
--- click/tests/test_hooks.py	2014-03-11 17:15:54 +0000
+++ click/tests/test_hooks.py	2014-03-12 12:01:04 +0000
@@ -833,6 +833,30 @@
                 os.readlink(path_2))
             self.assertFalse(os.path.lexists(path_3))
 
+    def test_sync_without_user_db(self):
+        with self.run_in_subprocess(
+                "click_get_hooks_dir", "click_get_user_home",
+                ) as (enter, preloads):
+            enter()
+            preloads["click_get_user_home"].return_value = "/home/test-user"
+            with mkfile(
+                    os.path.join(self.temp_dir, "hooks", "test.hook")) as f:
+                print("User-Level: yes", file=f)
+                print("Pattern: %s/${id}.test" % self.temp_dir, file=f)
+            with mkfile(os.path.join(
+                    self.temp_dir, "test-package", "1.0", ".click", "info",
+                    "test-package.manifest")) as f:
+                json.dump({"hooks": {"test-app": {"test": "target"}}}, f)
+            all_users_db = Click.User.for_all_users(self.db)
+            all_users_db.set_version("test-package", "1.0")
+            self._setup_hooks_dir(
+                preloads, hooks_dir=os.path.join(self.temp_dir, "hooks"))
+            hook = Click.Hook.open(self.db, "test")
+            hook.sync(user_name="test-user")
+            self.assertFalse(os.path.exists(os.path.join(
+                self.temp_dir, ".click", "users", "test-user",
+                "test-package")))
+
     def test_sync_uses_deepest_copy(self):
         # If the same version of a package is unpacked in multiple
         # databases, then we make sure the user link points to the deepest

=== modified file 'debian/changelog'
--- debian/changelog	2014-03-11 17:22:10 +0000
+++ debian/changelog	2014-03-12 12:01:04 +0000
@@ -1,3 +1,19 @@
+click (0.4.18.3) UNRELEASED; urgency=medium
+
+  * Take a slightly different approach to fixing "click hook run-user": only
+    try to update user registration symlinks if they already exist in the
+    overlay database.
+
+ -- Colin Watson <[e-mail]>  Wed, 12 Mar 2014 11:59:49 +0000
+
+click (0.4.18.2) trusty; urgency=medium
+
+  * Make "click hook run-user" ensure that the user registration directory
+    exists before dropping privileges and trying to create symlinks in it
+    (LP: #1291192).
+
+ -- Colin Watson <[e-mail]>  Wed, 12 Mar 2014 11:59:31 +0000
+
 click (0.4.18.1) trusty; urgency=medium
 
   [ Colin Watson ]

=== modified file 'lib/click/hooks.vala'
--- lib/click/hooks.vala	2014-03-11 17:15:54 +0000
+++ lib/click/hooks.vala	2014-03-12 12:01:04 +0000
@@ -950,10 +950,14 @@
 			if (is_user_level) {
 				var user_db = new User.for_user
 					(db, user_name);
+				var overlay_path = Path.build_filename
+					(user_db.get_overlay_db (),
+					 package);
 				user_db.drop_privileges ();
 				try {
-					user_db.raw_set_version
-						(package, version);
+					if (exists (overlay_path))
+						user_db.raw_set_version
+							(package, version);
 					install_link (package, version,
 						      app_name,
 						      app.relative_path,

=== modified file 'lib/click/user.vala'
--- lib/click/user.vala	2014-03-11 17:15:54 +0000
+++ lib/click/user.vala	2014-03-12 12:01:04 +0000
@@ -301,7 +301,7 @@
 		return db_for_user (db.overlay, name);
 	}
 
-	private void
+	internal void
 	ensure_db () throws UserError
 	{
 		if (users == null)