pkgname = utils.parse_spec(specfile, 'name')
pkgversion = utils.parse_spec(specfile, 'version')
-#import pdb;pdb.set_trace()
try:
repo = git.Git('.')
except errors.GitInvalid:
os.chdir(repo.path)
- if not repo.find_tag(tag):
- commit = repo.commit_dir(upstream.unpacked, msg,
- author = {'name':COMM_NAME,
- 'email':COMM_EMAIL
- }
- )
- if commit:
- msger.info('submitted the upstream data as first commit')
+ commit = repo.commit_dir(upstream.unpacked, msg,
+ author = {'name':COMM_NAME,
+ 'email':COMM_EMAIL
+ }
+ )
+ if commit:
+ msger.info('submitted the upstream data as first commit')
+ if opts.tag:
msger.info('create tag named: %s' % tag)
repo.create_tag(tag, msg, commit)
- msger.info('create upstream branch')
- repo.create_branch('upstream', commit)
- else:
- msger.info('No changes between currentlly git repo and tar ball')
+ msger.info('create upstream branch')
+ repo.create_branch('upstream', commit)
else:
- msger.info('tag %s already exsit, so dont need update' % tag)
+ msger.info('No changes between currentlly git repo and tar ball')
packagingdir = '%s/packaging' % upstream.unpacked
if not os.path.exists(packagingdir):
workdir = os.getcwd()
tmpdir = '%s/%s' % (TMPDIR, USER)
- import pdb;pdb.set_trace()
if len(args) != 1:
msger.error('missning argument, please reference gbs import-orig --help.')
else:
'email':COMM_EMAIL
}
)
- if commit:
+ if commit and opts.tag:
msger.info('create tag named: %s' % tag)
repo.create_tag(tag, msg, commit)
repo.checkout_branch('master')
- if not opts.no_merge:
+ if commit and not opts.no_merge:
try:
msger.info('merge imported upstream branch to master branch')
- repo.merge(tag)
+ repo.merge(commit)
except:
msger.error('Merge failed, please resolve')
default=None,
dest='author_email',
help='author email of git commit')
+ @cmdln.option('--tag',
+ action="store_true",
+ default=False,
+ dest='tag',
+ help='Create tag while import new version of upstream tar ball')
def do_import(self, subcmd, opts, *args):
"""${cmd_name}: Import spec file/source rpm/tar ball to git repository
default=False,
dest='no_merge',
help='Dont merge new upstream branch to master branch, please user merge it manually')
+ @cmdln.option('--tag',
+ action="store_true",
+ default=False,
+ dest='tag',
+ help='Create tag while import new version of upstream tar ball')
def do_import_orig(self, subcmd, opts, *args):
"""${cmd_name}: Import tar ball to upstream branch