particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

exception in case origin/ is part of ref

Browse source
This commit is contained in:
Tomas Kopecek 2022-09-23 11:15:46 +02:00
parent ab9d15b33d
commit 4cf59602f1
1 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
koji/daemon.py
View file

@ -575,11 +575,16 @@ class SCM(object):
checkout_path = os.path.basename(self.repository[:-4])
commonrepo = os.path.dirname(gitrepo[:-4]) + '/common.git'
# git-reset happily accepted origin/x spec, fetch has it split
if self.revision.startswith('origin/'):
rev = self.revision[7:]
else:
rev = self.revision
sourcedir = '%s/%s' % (scmdir, checkout_path)
module_checkout_cmd = ['git', 'clone', '-n', gitrepo, sourcedir]
common_checkout_cmd = ['git', 'clone', commonrepo, 'common']
update_checkout_cmds = [
['git', 'fetch', 'origin', self.revision, 'KOJI_FETCH_HEAD'],
['git', 'fetch', 'origin', '%s:KOJI_FETCH_HEAD' % rev],
['git', 'reset', '--hard', 'KOJI_FETCH_HEAD']
]
update_checkout_dir = sourcedir
@ -608,11 +613,16 @@ class SCM(object):
checkout_path = os.path.basename(self.repository[:-4])
commonrepo = os.path.dirname(gitrepo[:-4]) + '/common.git'
# git-reset happily accepted origin/x spec, fetch has it split
if self.revision.startswith('origin/'):
rev = self.revision[7:]
else:
rev = self.revision
sourcedir = '%s/%s' % (scmdir, checkout_path)
module_checkout_cmd = ['git', 'clone', '-n', gitrepo, sourcedir]
common_checkout_cmd = ['git', 'clone', commonrepo, 'common']
update_checkout_cmds = [
['git', 'fetch', 'origin', self.revision, 'KOJI_FETCH_HEAD'],
['git', 'fetch', 'origin', '%s:KOJI_FETCH_HEAD' % rev],
['git', 'reset', '--hard', 'KOJI_FETCH_HEAD']
]
update_checkout_dir = sourcedir