Merge lp:~dobey/ubuntuone-client/fix-due-nonsense into lp:ubuntuone-client

[dobey]

Simplify the removal of packages which shouldn't be installed.
Also remove data files which shouldn't be installed.

[lp:~dobey/ubuntuone-client/fix-due-nonsense]

1402. By dobey on 2013-06-11

Fix pep8 issue.

[Mike McCracken (mikemc)]

review: Approve

=== modified file 'setup.py'
--- setup.py	2013-06-10 22:06:01 +0000
+++ setup.py	2013-06-11 15:28:41 +0000
@@ -96,17 +96,15 @@
 
         # Remove the contrib and tests packages from the packages list
         # as they are not meant to be installed to the system.
-        i = 0
-        for pkg in self.distribution.packages:
-            print("Checking %s" % pkg)
-            if pkg.startswith('contrib'):
-                print('Removing %s' % pkg)
-                self.distribution.packages.pop(i)
-            if pkg.startswith('tests'):
-                print("Removing %s" % pkg)
-                self.distribution.packages.pop(i)
+        pkgs = [x for x in self.distribution.packages if not (
+            x.startswith('contrib') or x.startswith('tests'))]
+        self.distribution.packages = pkgs
 
-            i += 1
+        # Remove the input and dev files from the data files list,
+        # as they are not meant to be installed.
+        data_files = [x for x in self.distribution.data_files if not (
+            x[1][0].endswith('.in') or x[1][0].endswith('-dev.conf'))]
+        self.distribution.data_files = data_files
 
         # Get just the prefix value, without the root
         prefix = self.install_data.replace(