Merge lp:~brian-murray/ubuntu/disco/apport/usrmerge-changes into lp:~ubuntu-core-dev/ubuntu/disco/apport/ubuntu

[Brian Murray]

I disable the /etc/passwd test because I wasn't really sure what it did and the ExecutablePath part was not passing any more. If you have an idea let me know!

[lp:~brian-murray/ubuntu/disco/apport/usrmerge-changes]

2663. By Brian Murray on 2018-12-20

reorder bindirs so /usr stuff comes first and modify interpreter_path test appropriately

=== modified file 'apport/report.py'
--- apport/report.py	2018-05-09 23:30:27 +0000
+++ apport/report.py	2018-12-20 23:42:02 +0000
@@ -417,7 +417,7 @@
             return
 
         cmdargs = self['ProcCmdline'].split('\0')
-        bindirs = ['/bin/', '/sbin/', '/usr/bin/', '/usr/sbin/']
+        bindirs = ['/usr/bin/', '/usr/sbin/', '/bin/', '/sbin/']
 
         # filter out interpreter options
         while len(cmdargs) >= 2 and cmdargs[1].startswith('-'):
 
=== modified file 'backends/packaging-apt-dpkg.py'
--- backends/packaging-apt-dpkg.py	2018-12-20 17:45:47 +0000
+++ backends/packaging-apt-dpkg.py	2018-12-20 23:42:02 +0000
@@ -481,6 +481,13 @@
         match = self.__fgrep_files(file, likely_lists)
         if not match:
             match = self.__fgrep_files(file, all_lists)
+        # with usrmerge some binaries appear in usr but their .list file
+        # doesn't reflect that so strip the /usr from the path
+        if not match and file.startswith('/usr'):
+            file = file[4:]
+            match = self.__fgrep_files('%s' % file, likely_lists)
+            if not match:
+                match = self.__fgrep_files('%s' % file, all_lists)
 
         if match:
             return os.path.splitext(os.path.basename(match))[0].split(':')[0]
 
=== modified file 'test/test_report.py'
--- test/test_report.py	2017-08-29 23:44:45 +0000
+++ test/test_report.py	2018-12-20 23:42:02 +0000
@@ -134,7 +134,7 @@
         self.assertEqual(pr.pid, p.pid)
         p.communicate(b'\n')
         self.assertEqual(pr['ProcCmdline'], 'cat /foo\\ bar \\\\h \\\\\\ \\\\ -')
-        self.assertEqual(pr['ExecutablePath'], '/bin/cat')
+        self.assertEqual(pr['ExecutablePath'], '/usr/bin/cat')
         self.assertNotIn('InterpreterPath', pr)
         self.assertIn('/bin/cat', pr['ProcMaps'])
         self.assertIn('[stack]', pr['ProcMaps'])
@@ -316,7 +316,7 @@
             pr['ProcStatus'] = 'Name:\tzgrep'
             pr['ProcCmdline'] = '/bin/sh\0/bin/zgrep\0foo'
             pr._check_interpreted()
-            self.assertEqual(pr['ExecutablePath'], '/bin/zgrep')
+            self.assertEqual(pr['ExecutablePath'], '/usr/bin/zgrep')
             self.assertEqual(pr['InterpreterPath'], '/bin/dash')
 
             # standard sh script when being called explicitly with interpreter
@@ -325,7 +325,7 @@
             pr['ProcStatus'] = 'Name:\tdash'
             pr['ProcCmdline'] = '/bin/sh\0/bin/zgrep\0foo'
             pr._check_interpreted()
-            self.assertEqual(pr['ExecutablePath'], '/bin/zgrep')
+            self.assertEqual(pr['ExecutablePath'], '/usr/bin/zgrep')
             self.assertEqual(pr['InterpreterPath'], '/bin/dash')
 
             # special case mono scheme: beagled-helper (use zgrep to make the test
@@ -335,7 +335,7 @@
             pr['ProcStatus'] = 'Name:\tzgrep'
             pr['ProcCmdline'] = 'zgrep\0--debug\0/bin/zgrep'
             pr._check_interpreted()
-            self.assertEqual(pr['ExecutablePath'], '/bin/zgrep')
+            self.assertEqual(pr['ExecutablePath'], '/usr/bin/zgrep')
             self.assertEqual(pr['InterpreterPath'], '/usr/bin/mono')
 
             # special case mono scheme: banshee (use zgrep to make the test
@@ -345,7 +345,7 @@
             pr['ProcStatus'] = 'Name:\tzgrep'
             pr['ProcCmdline'] = 'zgrep\0/bin/zgrep'
             pr._check_interpreted()
-            self.assertEqual(pr['ExecutablePath'], '/bin/zgrep')
+            self.assertEqual(pr['ExecutablePath'], '/usr/bin/zgrep')
             self.assertEqual(pr['InterpreterPath'], '/usr/bin/mono')
 
             # fail on files we shouldn't have access to when name!=argv[0]
@@ -379,10 +379,10 @@
             pr = apport.report.Report()
             pr['ExecutablePath'] = '/usr/bin/python'
             pr['ProcStatus'] = 'Name:\tpasswd'
-            pr['ProcCmdline'] = '../etc/passwd'
+            pr['ProcCmdline'] = '../../etc/passwd'
             pr._check_interpreted()
             self.assertEqual(pr['InterpreterPath'], '/usr/bin/python')
-            self.assertEqual(pr['ExecutablePath'], '/bin/../etc/passwd')
+            self.assertEqual(pr['ExecutablePath'], '/usr/bin/../../etc/passwd')
 
             # interactive python process
             pr = apport.report.Report()
@@ -400,7 +400,7 @@
             pr['ProcCmdline'] = 'python\0/bin/bash'
             pr._check_interpreted()
             self.assertEqual(pr['InterpreterPath'], '/usr/bin/python')
-            self.assertEqual(pr['ExecutablePath'], '/bin/bash')
+            self.assertEqual(pr['ExecutablePath'], '/usr/bin/bash')
 
             # python script with options (abuse /bin/bash since it must exist)
             pr = apport.report.Report()
@@ -409,7 +409,7 @@
             pr['ProcCmdline'] = 'python\0-OO\0/bin/bash'
             pr._check_interpreted()
             self.assertEqual(pr['InterpreterPath'], '/usr/bin/python')
-            self.assertEqual(pr['ExecutablePath'], '/bin/bash')
+            self.assertEqual(pr['ExecutablePath'], '/usr/bin/bash')
 
             # python script with a versioned interpreter
             pr = apport.report.Report()
@@ -418,7 +418,7 @@
             pr['ProcCmdline'] = '/usr/bin/python\0/bin/bash'
             pr._check_interpreted()
             self.assertEqual(pr['InterpreterPath'], '/usr/bin/python2.7')
-            self.assertEqual(pr['ExecutablePath'], '/bin/bash')
+            self.assertEqual(pr['ExecutablePath'], '/usr/bin/bash')
 
             # python script through -m
             pr = apport.report.Report()
@@ -2266,7 +2266,7 @@
         tmp_true = apport.report._which_extrapath('true', '/tmp')
         os.unlink('/tmp/true')
         self.assertEqual(tmp_true, '/tmp/true')
-        self.assertEqual(bin_true, '/bin/true')
+        self.assertEqual(bin_true, '/usr/bin/true')
 
 
 if __name__ == '__main__':