shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2025-01-11 09:18:20 +03:00
Code Issues Projects Releases Wiki Activity

ostbuild: Allow using dirty-git: for patches too

Browse Source
This commit is contained in:
Colin Walters 2012-05-09 19:40:24 -04:00
parent 92891e60ca
commit 7149530976
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/ostbuild/pyostbuild/builtin_checkout.py
View File

@ -91,14 +91,18 @@ class OstbuildCheckout(builtins.Builtin):
patches = component.get('patches')
if patches is not None:
(patches_keytype, patches_uri) = buildutil.parse_src_key(patches['src'])
patches_mirror = buildutil.get_mirrordir(self.mirrordir, patches_keytype, patches_uri)
vcs.get_vcs_checkout(self.mirrordir, patches_keytype, patches_uri,
self.patchdir, patches['branch'],
overwrite=True)
if patches_keytype == 'git':
patches_mirror = buildutil.get_mirrordir(self.mirrordir, patches_keytype, patches_uri)
vcs.get_vcs_checkout(self.mirrordir, patches_keytype, patches_uri,
self.patchdir, patches['branch'],
overwrite=True)
patchdir = self.patchdir
else:
patchdir = patches_uri
patch_subdir = patches.get('subdir', None)
if patch_subdir is not None:
patchdir = os.path.join(self.patchdir, patch_subdir)
patchdir = os.path.join(patchdir, patch_subdir)
else:
patchdir = self.patchdir
for patch in patches['files']: