← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to setup.py

Merge 2.1.1, especially the fetch format warning, back to trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
setup.py
470
470
 
471
471
def get_svn_py2exe_info(includes, excludes, packages):
472
472
    packages.append('subvertpy')
473
 
    packages.append('sqlite3')
474
473
 
475
474
 
476
475
if 'bdist_wininst' in sys.argv:
573
572
    if sys.version.startswith('2.4'):
574
573
        # adding elementtree package
575
574
        additional_packages.add('elementtree')
576
 
    elif sys.version.startswith('2.6') or sys.version.startswith('2.5'):
 
575
    elif sys.version.startswith('2.5'):
577
576
        additional_packages.add('xml.etree')
578
577
    else:
579
578
        import warnings
712
711
        # easy_install one
713
712
        DATA_FILES = [('man/man1', ['bzr.1'])]
714
713
 
715
 
    if sys.platform != 'win32':
716
 
        # see https://wiki.kubuntu.org/Apport/DeveloperHowTo
717
 
        #
718
 
        # checking the paths and hardcoding the check for root is a bit gross,
719
 
        # but I don't see a cleaner way to find out the locations in a way
720
 
        # that's going to align with the hardcoded paths in apport.
721
 
        if os.geteuid() == 0:
722
 
            DATA_FILES += [
723
 
                ('/usr/share/apport/package-hooks',
724
 
                    ['apport/source_bzr.py']),
725
 
                ('/etc/apport/crashdb.conf.d/',
726
 
                    ['apport/bzr-crashdb.conf']),]
727
 
 
728
714
    # std setup
729
715
    ARGS = {'scripts': ['bzr'],
730
716
            'data_files': DATA_FILES,