Merge lp:~marienz/apport/search-for-executable into lp:~ubuntu-core-dev/ubuntu/lucid/apport/ubuntu

[Marco Rodrigues]

[Martin Pitt (pitti)]

For backwards compatibility, please check if it is a valid package name first, and only then fall back to searching $PATH.

You might also consider calling "which" to search the PATH.

review: Needs Fixing

[Martin Pitt (pitti)]

Superseded by https://code.launchpad.net/~marienz/apport/search-for-executable/+merge/13943

review: Disapprove

Unmerged revisions

1623. By Marien Zwart <marienz@siren> on 2009-10-13

When given a single argument also search $PATH for it.

=== modified file 'apport/ui.py'
--- apport/ui.py	2009-11-06 12:56:15 +0000
+++ apport/ui.py	2009-11-06 22:25:19 +0000
@@ -501,20 +501,34 @@
             self.options.pid = sys.argv[1]
 
         # executable?
-        elif '/' in sys.argv[1]:
-            pkg = apport.packaging.get_file_package(sys.argv[1])
-            if not pkg:
-                optparser.error('%s does not belong to a package.' % sys.argv[1])
-                sys.exit(1)
-            self.args = []
-            self.options.filebug = True
-            self.options.package = pkg
-
-        # otherwise: package name
         else:
-            self.args = []
-            self.options.filebug = True
-            self.options.package = sys.argv[1]
+            if '/' in sys.argv[1]:
+                # Use as absolute path to the executable.
+                fullpath = sys.argv[1]
+            else:
+                # Search $PATH for it:
+                for path in os.environ['PATH'].split(os.pathsep):
+                    fullpath = os.path.join(path, sys.argv[1])
+                    # This follows symlinks, which is what we want.
+                    if os.path.isfile(fullpath):
+                        break
+                else:
+                    fullpath = None
+
+            if fullpath is not None:
+                pkg = apport.packaging.get_file_package(fullpath)
+                if not pkg:
+                    optparser.error('%s does not belong to a package.' % fullpath)
+                    sys.exit(1)
+                self.args = []
+                self.options.filebug = True
+                self.options.package = pkg
+
+            # otherwise: package name
+            else:
+                self.args = []
+                self.options.filebug = True
+                self.options.package = sys.argv[1]
 
     def format_filesize(self, size):
         '''Format the given integer as humanly readable and i18n'ed file size.'''