diff options
| -rw-r--r-- | gbp/deb/__init__.py | 19 | ||||
| -rwxr-xr-x | gbp/scripts/buildpackage.py | 23 |
2 files changed, 30 insertions, 12 deletions
diff --git a/gbp/deb/__init__.py b/gbp/deb/__init__.py index 533b71bd..c2757340 100644 --- a/gbp/deb/__init__.py +++ b/gbp/deb/__init__.py @@ -28,6 +28,25 @@ from gbp.deb.changelog import ChangeLog, NoChangeLogError from gbp.deb.policy import DebianPkgPolicy # noqa: F401 +Releases = ("buzz", + "rez", + "bo", + "hamm", + "slink", + "potato", + "woody", + "sarge", + "etch", + "lenny", + "squeeze", + "wheezy", + "jessie", + "stretch", + "buster", + "bullseye", + "sid") + + class DpkgCompareVersions(gbpc.Command): dpkg = '/usr/bin/dpkg' diff --git a/gbp/scripts/buildpackage.py b/gbp/scripts/buildpackage.py index 7ffb5e95..1517b4b3 100755 --- a/gbp/scripts/buildpackage.py +++ b/gbp/scripts/buildpackage.py @@ -200,23 +200,22 @@ def get_pbuilder_dist(options, repo, native=False): Determin the dist to build for with pbuilder/cowbuilder """ if options.pbuilder_dist == 'DEP14': + vendor = du.get_vendor().lower() branch = repo.branch if not branch: raise GbpError("Failed to setup DIST for %s. " "Can't determine current branch." % options.builder) - else: - parts = branch.rsplit('/') - if len(parts) == 2: - vendor = du.get_vendor().lower() - suite = parts[1] - if vendor == parts[0]: - dist = '' if suite in ['sid', 'master'] else suite - else: - dist = '%s_%s' % (parts[0], suite) - elif len(parts) == 1 and native and branch in ['master', 'sid']: - dist = '' + parts = branch.rsplit('/') + if len(parts) == 2: + suite = parts[1] + if vendor == parts[0]: + dist = '' if suite in ['sid', 'master'] else suite else: - raise GbpError("DEP14 DIST: Current branch '%s' does not match vendor/suite" % branch) + dist = '%s_%s' % (parts[0], suite) + elif len(parts) == 1 and native and branch in ['master', 'sid']: + dist = '' + else: + raise GbpError("DEP14 DIST: Current branch '%s' does not match vendor/suite" % branch) else: dist = options.pbuilder_dist return dist |