Merge lp:~cjwatson/click/info-extension into lp:click

[Colin Watson]

Make "click info" always try opening the input file as a package and only try to interpret it as a file in an installed package if that fails, rather than guessing by the input file extension.

Make "click info" always try opening the input file as a package and only try to interpret it as a file in an installed package if that fails, rather than guessing by the input file extension.

This fixes attempts to install packages that don't end with ".click" via "pkcon install-local", broken by the fix for bug 1324853.

Unmerged revisions

=== modified file 'click/commands/info.py'
--- click/commands/info.py	2014-08-08 10:13:30 +0000
+++ click/commands/info.py	2014-10-07 09:15:11 +0000
@@ -49,12 +49,12 @@
         if registry.has_package_name(arg):
             return json_object_to_python(registry.get_manifest(arg))
 
-    if arg.endswith(".click"):
+    try:
         with closing(DebFile(filename=arg)) as package:
             with package.control.get_file(
                     "manifest", encoding="UTF-8") as manifest_file:
                 return _load_manifest(manifest_file)
-    else:
+    except Exception:
         pkgdir = Click.find_package_directory(arg)
         manifest_path = glob.glob(
             os.path.join(pkgdir, ".click", "info", "*.manifest"))
 
=== modified file 'click/tests/integration/test_info.py'
--- click/tests/integration/test_info.py	2014-09-05 09:08:31 +0000
+++ click/tests/integration/test_info.py	2014-10-07 09:15:11 +0000
@@ -30,7 +30,6 @@
             self.click_binary, "info", path_to_click], universal_newlines=True)
         self.assertEqual(name, json.loads(output)["name"])
 
-
     def test_info_installed_click(self):
         name = "com.example.foo"
         user = os.environ.get("USER", "root")
@@ -55,3 +54,12 @@
              "/opt/click.ubuntu.com/%s/%s/README" % (name, version)],
             universal_newlines=True)
         self.assertEqual(name, json.loads(output)["name"])
+
+    def test_info_different_extension(self):
+        name = "org.example.info"
+        raw_path = self._make_click(name)
+        path = "%s.extra" % raw_path
+        os.rename(raw_path, path)
+        output = subprocess.check_output([
+            self.click_binary, "info", path], universal_newlines=True)
+        self.assertEqual(name, json.loads(output)["name"])
 
=== modified file 'debian/changelog'
--- debian/changelog	2014-09-29 14:18:41 +0000
+++ debian/changelog	2014-10-07 09:15:11 +0000
@@ -1,3 +1,16 @@
+click (0.4.34) UNRELEASED; urgency=medium
+
+  [ Michael Vogt ]
+  * Demote ubuntu-app-launch-tools from a click recommends to a suggests,
+    since they are not needed on server installs.
+
+  [ Colin Watson ]
+  * Make "click info" always try opening the input file as a package and
+    only try to interpret it as a file in an installed package if that
+    fails, rather than guessing by the input file extension.
+
+ -- Colin Watson <[e-mail]>  Wed, 01 Oct 2014 12:28:42 +0100
+
 click (0.4.33) utopic; urgency=medium
 
   [ Pete Woods ]
 
=== modified file 'debian/control'
--- debian/control	2014-09-05 09:39:06 +0000
+++ debian/control	2014-10-07 09:15:11 +0000
@@ -15,8 +15,8 @@
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, python3-click (= ${binary:Version}), adduser
-Recommends: click-apparmor, ubuntu-app-launch-tools | upstart-app-launch-tools
-Suggests: click-reviewers-tools (>= 0.9)
+Recommends: click-apparmor
+Suggests: click-reviewers-tools (>= 0.9), ubuntu-app-launch-tools | upstart-app-launch-tools
 Conflicts: click-package
 Replaces: click-package
 Provides: click-package