~stefanor/ubuntu-dev-tools/sponsor-list

« back to all changes in this revision

Viewing changes to sponsor-patch

  • Committer: Benjamin Drung
  • Date: 2010-08-17 11:07:37 UTC
  • Revision ID: bdrung@ubuntu.com-20100817110737-a4p5r3l58wffp1f8
sponsor-patch: Make sure that the source tarball is uploaded if it's not in the archive.

Show diffs side-by-side

added added

removed removed

Lines of Context:
71
71
                        result += " (" + self.series + ")"
72
72
                return result
73
73
 
 
74
        def get_previous_version(self):
 
75
                if self.is_merge():
 
76
                        previous_version = self.get_latest_released_version()
 
77
                else:
 
78
                        previous_version = self.get_version()
 
79
                return previous_version
 
80
 
74
81
        def get_series(self, latest_release=False):
75
82
                if self.series is None or latest_release:
76
83
                        return self.launchpad.distributions[self.project].current_series.name
445
452
 
446
453
                # Build source package
447
454
                cmd = ["debuild", "--no-lintian", "-S"]
448
 
                if task.is_merge():
449
 
                        ubuntu_version = task.get_latest_released_version()
450
 
                        cmd.append("-v" + ubuntu_version.full_version)
451
 
                        if ubuntu_version.upstream_version == changelog.upstream_version \
452
 
                                        and upload == "ubuntu":
453
 
                                cmd.append("-sd")
454
 
                        else:
455
 
                                cmd.append("-sa")
 
455
                previous_version = task.get_previous_version()
 
456
                cmd.append("-v" + previous_version.full_version)
 
457
                if previous_version.upstream_version == changelog.upstream_version \
 
458
                                and upload == "ubuntu":
 
459
                        cmd.append("-sd")
456
460
                else:
457
 
                        cmd.append("-v" + task.get_version().full_version)
 
461
                        cmd.append("-sa")
458
462
                if not keyid is None:
459
463
                        cmd += ["-k" + keyid]
460
464
                Print.command(cmd)