diff options
author | Guido Guenther <agx@sigxcpu.org> | 2006-09-25 15:36:52 +0200 |
---|---|---|
committer | Guido Guenther <agx@bogon.sigxcpu.org> | 2006-09-25 15:36:52 +0200 |
commit | 95829748633028531a93838eca2cd10ce24eee00 (patch) | |
tree | 10ccc0bd4467083df1a7c71ab41092f68cad8680 | |
parent | 08943fcc685d19d7596f19913bca84be3fe9a641 (diff) |
git-buildpackage: only determine version if tagging requested
-rw-r--r-- | debian/control | 1 | ||||
-rwxr-xr-x | git-buildpackage | 13 |
2 files changed, 8 insertions, 6 deletions
diff --git a/debian/control b/debian/control index 6173620a..0ae2934d 100644 --- a/debian/control +++ b/debian/control @@ -12,5 +12,6 @@ Description: bunch of scripts to ease the development of Debian packages with gi This package contains the following tools: * git-import-dsc: import an existing Debian source package into a git repository + * git-import-orig: import a new upstream version into the git repository * git-debuild: build a package out of a git repository, check for local modifications and tag appropriately diff --git a/git-buildpackage b/git-buildpackage index 9b2e8bd4..ecf58d25 100755 --- a/git-buildpackage +++ b/git-buildpackage @@ -64,12 +64,13 @@ def main(argv): sys.exit(1) cmd=options.build_cmd+' -i.git '+" ".join(dpkg_args) if not exec_command(cmd)[0]: sys.exit(1) - version=get_version() - if version and options.tag: - print "Tagging", version - if not exec_command('git-tag %s' % version)[0]: sys.exit(1) - else: - print >>sys.stderr,"Can't parse version from changes file" + if options.tag: + version=get_version() + if version: + print "Tagging", version + if not exec_command('git-tag %s' % version)[0]: sys.exit(1) + else: + print >>sys.stderr,"Can't parse version from changes file" if __name__ == '__main__': sys.exit(main(sys.argv)) |