Merge commit 'HEAD@{1}' into develop

This commit is contained in:
Foo 2015-06-27 02:05:58 +03:00
commit 03195cf93f
1 changed files with 32 additions and 28 deletions

View File

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