1
=== modified file 'setup.py'
2
--- setup.py	2013-06-10 22:06:01 +0000
3
+++ setup.py	2013-06-11 15:28:41 +0000
4
@@ -96,17 +96,15 @@
5
96
96
6
97
        # Remove the contrib and tests packages from the packages list
97
        # Remove the contrib and tests packages from the packages list
7
98
        # as they are not meant to be installed to the system.
98
        # as they are not meant to be installed to the system.
17
99
        i = 0
99
        pkgs = [x for x in self.distribution.packages if not (
18
100
        for pkg in self.distribution.packages:
100
            x.startswith('contrib') or x.startswith('tests'))]
19
101
            print("Checking %s" % pkg)
101
        self.distribution.packages = pkgs
11
102
            if pkg.startswith('contrib'):
12
103
                print('Removing %s' % pkg)
13
104
                self.distribution.packages.pop(i)
14
105
            if pkg.startswith('tests'):
15
106
                print("Removing %s" % pkg)
16
107
                self.distribution.packages.pop(i)
20
108
102
22
109
            i += 1
103
        # Remove the input and dev files from the data files list,
23
104
        # as they are not meant to be installed.
24
105
        data_files = [x for x in self.distribution.data_files if not (
25
106
            x[1][0].endswith('.in') or x[1][0].endswith('-dev.conf'))]
26
107
        self.distribution.data_files = data_files
27
110
108
28
111
        # Get just the prefix value, without the root
109
        # Get just the prefix value, without the root
29
112
        prefix = self.install_data.replace(
110
        prefix = self.install_data.replace(
Status:	Merged
Approved by:	dobey on 2013-06-11
Approved revision:	1402
Merged at revision:	1401
Proposed branch:	lp:~dobey/ubuntuone-client/fix-due-nonsense
Merge into:	lp:ubuntuone-client
Diff against target:	29 lines (+8/-10) 1 file modified setup.py (+8/-10)
To merge this branch:	bzr merge lp:~dobey/ubuntuone-client/fix-due-nonsense
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Mike McCracken (community)		2013-06-11	Approve on 2013-06-11
Review via email: mp+168702@code.launchpad.net