Merge commit 'HEAD@{1}' into develop
This commit is contained in:
commit
03195cf93f
|
@ -147,10 +147,12 @@ def create_ebuilds(version_string, overlay, user, **kwargs):
|
||||||
live_ebuild = None
|
live_ebuild = None
|
||||||
for ebuild in os.listdir(pdir):
|
for ebuild in os.listdir(pdir):
|
||||||
if ebuild.endswith('.ebuild') and '9999' in ebuild:
|
if ebuild.endswith('.ebuild') and '9999' in ebuild:
|
||||||
|
live_ebuild_base = ebuild
|
||||||
live_ebuild = os.path.join(pdir, ebuild)
|
live_ebuild = os.path.join(pdir, ebuild)
|
||||||
break
|
break
|
||||||
assert(live_ebuild)
|
assert(live_ebuild)
|
||||||
vcur = os.path.join(pdir, '{0}-{1}.ebuild'.format(pn, version_string))
|
vcur = os.path.join(pdir, '{0}-{1}.ebuild'.format(pn, version_string))
|
||||||
|
if pn == 'powerline-vim':
|
||||||
with open(live_ebuild) as LEF:
|
with open(live_ebuild) as LEF:
|
||||||
with open(vcur, 'w') as F:
|
with open(vcur, 'w') as F:
|
||||||
dropnext = False
|
dropnext = False
|
||||||
|
@ -179,6 +181,8 @@ def create_ebuilds(version_string, overlay, user, **kwargs):
|
||||||
elif line.startswith('KEYWORDS'):
|
elif line.startswith('KEYWORDS'):
|
||||||
line = 'KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"\n'
|
line = 'KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"\n'
|
||||||
F.write(line)
|
F.write(line)
|
||||||
|
else:
|
||||||
|
os.symlink(live_ebuild_base, vcur)
|
||||||
new_files.append(vcur)
|
new_files.append(vcur)
|
||||||
check_call(['ebuild', vcur, 'manifest'])
|
check_call(['ebuild', vcur, 'manifest'])
|
||||||
new_files.append(os.path.join(pdir, 'Manifest'))
|
new_files.append(os.path.join(pdir, 'Manifest'))
|
||||||
|
|
Loading…
Reference in New Issue