← Back to branch summary

~noskcaj/ubuntu/saucy/debhelper/saucy

« back to all changes in this revision

Viewing changes to Debian/Debhelper/Buildsystem/python_distutils.pm

  • Committer: Package Import Robot
  • Author(s): Colin Watson
  • Date: 2013-06-04 11:46:28 UTC
  • mfrom: (1.4.61 sid)
  • Revision ID: package-import@ubuntu.com-20130604114628-vagwisunbd72ihwg
Tags: 9.20130518ubuntu1
* Resynchronise with Debian.  Remaining changes:
  - Depend on dh-apparmor.
  - dh_installinit, autoscripts/postinst-upstart-replace: Prefer upstart
    jobs where they exist.
  - autoscripts/preinst-upstart-compatibility: Handle upgrades from older
    versions that created the /lib/init/upstart-job symlink.
  - autoscripts/postinst-init*: Only call update-rc.d when there's no
    upstart job.
  - autoscripts/*-init*: Test for /etc/init/*.conf where necessary.
  - dh_installinit: Add no-op --upstart-only option for compatibility.
  - dh_installudev: Change default rules.d symlink priority to 40.
  - dh_installchangelogs: Do not install upstream changelog in compat
    level 7.  This floods packages with huge upstream changelogs which
    take precious CD space.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Debian/Debhelper/Buildsystem/python_distutils.pm
118
118
        # extensions for each.
119
119
 
120
120
        my $python_default = `pyversions -d`;
 
121
        if ($? == -1) {
 
122
                error("failed to run pyversions")
 
123
        }
 
124
        my $ecode = $? >> 8;
 
125
        if ($ecode != 0) {
 
126
                error("pyversions -d failed [$ecode]")
 
127
        }
121
128
        $python_default =~ s/^\s+//;
122
129
        $python_default =~ s/\s+$//;
123
 
        my @python_requested = split ' ', `pyversions -r 2>/dev/null`;
 
130
        my @python_requested = split ' ', `pyversions -r`;
 
131
        if ($? == -1) {
 
132
                error("failed to run pyversions")
 
133
        }
 
134
        $ecode = $? >> 8;
 
135
        if ($ecode != 0) {
 
136
                error("pyversions -r failed [$ecode]")
 
137
        }
124
138
        if (grep /^\Q$python_default\E/, @python_requested) {
125
139
                @python_requested = (
126
140
                        grep(!/^\Q$python_default\E/, @python_requested),