aboutsummaryrefslogtreecommitdiff
path: root/git-buildpackage
diff options
context:
space:
mode:
authorGuido Guenther <agx@sigxcpu.org>2007-06-27 12:22:33 -0400
committerGuido Guenther <agx@sigxcpu.org>2007-06-27 12:22:33 -0400
commit6af72fd593372f27cfc7ef3e0dac262a142a1156 (patch)
tree5d56e603d25606c4778cfc4fc677eebf88c52a16 /git-buildpackage
parent70c70759f05bf20dbab526f6a3ecfb4f27419502 (diff)
parentb014ad23d94771e736a6df194138b2c89219d472 (diff)
Merge branch 'master' into bpo-etchdebian/0.3.2.bpo.1
Conflicts: debian/changelog
Diffstat (limited to 'git-buildpackage')
-rwxr-xr-xgit-buildpackage5
1 files changed, 4 insertions, 1 deletions
diff --git a/git-buildpackage b/git-buildpackage
index 550d36b..6817a82 100755
--- a/git-buildpackage
+++ b/git-buildpackage
@@ -50,6 +50,7 @@ def create_orig(cp, output_dir, branch):
def main(argv):
output_dir = '..'
+ changelog = 'debian/changelog'
args = [ arg for arg in argv[1:] if arg.find('--git-') == 0 ]
dpkg_args = [ arg for arg in argv[1:] if arg.find('--git-') == -1 ]
@@ -105,7 +106,9 @@ def main(argv):
print >>sys.stderr, "You are not on branch '%s' but on '%s'" % (options.debian_branch, branch)
raise GbpError, "Use --git-ignore-new to ignore or --git-debian-branch to set the branch name."
- cp = parse_changelog('debian/changelog')
+ cp = parse_changelog(changelog)
+ if not cp:
+ raise GbpError,"'%s' does not exist, not a debian package" % changelog
if not is_native(cp) and not has_orig(cp, output_dir):
print "%s does not exist, creating from branch '%s'" % (orig_file(cp), options.upstream_branch)
if not repo.has_branch(options.upstream_branch):