diff options
author | Guido Guenther <agx@sigxcpu.org> | 2006-12-08 16:32:32 +0100 |
---|---|---|
committer | Guido Guenther <agx@bogon.sigxcpu.org> | 2006-12-08 16:32:32 +0100 |
commit | 9e54f169eae8db3984302171d7772795deac9513 (patch) | |
tree | 83b2a252b55f35f57b18ba7c402383aa77e074a1 /git-import-dsc | |
parent | 960385597d124c0881a5779448beb4c0b6d85c9a (diff) |
support signed tagsdebian/0.2.15
Diffstat (limited to 'git-import-dsc')
-rwxr-xr-x | git-import-dsc | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/git-import-dsc b/git-import-dsc index 6c979521..0797fc56 100755 --- a/git-import-dsc +++ b/git-import-dsc @@ -31,7 +31,6 @@ from git_buildpackage.config import GBPOptionParser gitAdd=GitAdd() gitCommitAll=GitCommitAll() -gitTag=GitTag() class DscPackage(object): """Parse the dsc file for verions, package names, etc""" @@ -71,7 +70,7 @@ class DscPackage(object): f.close() -def import_upstream(src, dirs, upstream_branch): +def import_upstream(src, dirs, upstream_branch, tagger): try: unpackTGZ=UnpackTGZ(src.tgz, dirs['tmp']) unpackTGZ() @@ -86,7 +85,7 @@ def import_upstream(src, dirs, upstream_branch): GitInitDB()() gitAdd(['.']) gitCommitAll(msg="Imported %s version %s" % (['upstream','Debian'][src.native],src.upstream_version,)) - gitTag(sanitize_version(src.upstream_version)) + tagger(sanitize_version(src.upstream_version)) if not src.native: GitBranch()(upstream_branch) except CommandExecFailed: @@ -96,12 +95,12 @@ def import_upstream(src, dirs, upstream_branch): return 0 -def apply_debian_patch(src, dirs): +def apply_debian_patch(src, dirs, tagger): try: DpkgSourceExtract()(src.dscfile, dirs['dpkg-src']) os.chdir(dirs['git']) GitLoadDirs()(dirs['dpkg-src'], 'Imported Debian patch') - gitTag(sanitize_version('%s-%s' % (src.upstream_version, src.debian_version))) + tagger(sanitize_version('%s-%s' % (src.upstream_version, src.debian_version))) except CommandExecFailed: print >>sys.stderr,"Failed to import Debian package" return 1 @@ -123,11 +122,17 @@ def main(argv): help="verbose command execution") parser.add_config_file_option(option_name="upstream-branch", dest="upstream_branch", help="upstream branch, default is '%(upstream-branch)s'") + parser.add_config_file_option(option_name="sign-tags", dest="sign_tags", + help="sign git tags", action="store_true") + parser.add_config_file_option(option_name="keyid", dest="keyid", + help="keyid to sign tags with") (options, args) = parser.parse_args(argv[1:]) if options.verbose: Command.verbose = True + gitTag=GitTag(options.sign_tags, options.keyid) + if len(args) != 1: parser.print_help() return 1 @@ -135,14 +140,14 @@ def main(argv): src=DscPackage(args[0]) dirs['tmp']=os.path.abspath(tempfile.mkdtemp(dir='.')) - if import_upstream(src, dirs, options.upstream_branch): + if import_upstream(src, dirs, options.upstream_branch, gitTag): return 1 os.chdir(dirs['top']) if not src.native: dirs['unpack']=dirs['tmp']+'/unpack' os.mkdir(dirs['unpack']) dirs['dpkg-src']="%s/%s-%s-%s" % (dirs['unpack'], src.pkg, src.upstream_version, src.debian_version) - if apply_debian_patch(src, dirs): + if apply_debian_patch(src, dirs, gitTag): return 1 os.chdir(dirs['top']) move_tree(src, dirs) |