Rev 5496: (mbp) Remove installation of apport configuration from setup.py (Max Bowsher) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5496 [merge]
revision-id: pqm at pqm.ubuntu.com-20101015033949-lv2x1iwguy3c1fta
parent: pqm at pqm.ubuntu.com-20101014225343-tsb5hohsfod0a97m
parent: maxb at f2s.com-20101014212248-mrp8otiif8lgge7d
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2010-10-15 04:39:49 +0100
message:
  (mbp) Remove installation of apport configuration from setup.py (Max Bowsher)
modified:
  setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
=== modified file 'setup.py'
--- a/setup.py	2010-09-30 08:49:08 +0000
+++ b/setup.py	2010-10-14 21:22:48 +0000
@@ -728,19 +728,6 @@
         # easy_install one
         DATA_FILES = [('man/man1', ['bzr.1'])]
 
-    if sys.platform != 'win32':
-        # see https://wiki.kubuntu.org/Apport/DeveloperHowTo
-        #
-        # checking the paths and hardcoding the check for root is a bit gross,
-        # but I don't see a cleaner way to find out the locations in a way
-        # that's going to align with the hardcoded paths in apport.
-        if os.geteuid() == 0:
-            DATA_FILES += [
-                ('/usr/share/apport/package-hooks',
-                    ['apport/source_bzr.py']),
-                ('/etc/apport/crashdb.conf.d/',
-                    ['apport/bzr-crashdb.conf']),]
-
     # std setup
     ARGS = {'scripts': ['bzr'],
             'data_files': DATA_FILES,