allow building native packages with flag -n

This commit is contained in:
Christophe Siraut 2018-01-05 16:57:45 +01:00
parent addf05933c
commit 6da7c8bb05
2 changed files with 13 additions and 3 deletions

View File

@ -216,13 +216,20 @@ def prepare_build(dist, project, cmd_options, new):
last_version = last_debian_package_version.split('-')[0]
package['version'] = last_debian_package_version
if cmd_options.native:
debian_revision_number = ''
else:
debian_revision_number = '-1'
if last_version == project['version'] and new \
and "~eob" in last_debian_package_version:
new_inc = int(last_debian_package_version.split('+')[1]) + 1
version_suffix = "-1~eob%s+%s" % (settings.DEBIAN_VERSIONS[dist],
new_inc)
version_suffix = "%s~eob%s+%s" % (debian_revision_number,
settings.DEBIAN_VERSIONS[dist],
new_inc)
else:
version_suffix = "-1~eob%s+1" % settings.DEBIAN_VERSIONS[dist]
version_suffix = "%s~eob%s+1" % (debian_revision_number,
settings.DEBIAN_VERSIONS[dist])
call("git checkout --quiet %s" % build_branch)
changelog = '\n'.join(changelog_from_git(package['source_name'],
version_suffix, project['git_path'], package['repository']))

View File

@ -38,6 +38,9 @@ def parse_cmdline():
parser.add_option("-f", "--force", action="store_true",
dest="force", default=False,
help="force a new build")
parser.add_option("-n", "--native", action="store_true",
dest="native", default=False,
help="build native package")
parser.add_option("-b", "--branch",
action="store", type="string",
dest="branch", metavar='NAME',