aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael G. Martins <rafael@rafaelmartins.eng.br>2010-07-26 05:26:04 -0300
committerRafael G. Martins <rafael@rafaelmartins.eng.br>2010-07-26 05:26:04 -0300
commitf2c9a3fb7e12190861a8df3096ba21e7c0423c39 (patch)
tree87584473ba79da5f901acc80cf2544fea1ea7d67
parentworking on the new handling of the live ebuilds. the command line options '--... (diff)
downloadg-octave-f2c9a3fb7e12190861a8df3096ba21e7c0423c39.tar.gz
g-octave-f2c9a3fb7e12190861a8df3096ba21e7c0423c39.tar.bz2
g-octave-f2c9a3fb7e12190861a8df3096ba21e7c0423c39.zip
fixed the keyword handling and a file open that was not using a 'with statement' yet
-rw-r--r--g_octave/ebuild.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/g_octave/ebuild.py b/g_octave/ebuild.py
index 8965dfa..bf6c5ca 100644
--- a/g_octave/ebuild.py
+++ b/g_octave/ebuild.py
@@ -166,7 +166,7 @@ RDEPEND="${DEPEND}
'eutils': '',
'description': description,
'url': self.__desc.url,
- 'keywords': self.__scm and '' or self.__keywords(accept_keywords),
+ 'keywords': self.__keywords(accept_keywords),
'category': category,
'depend': '',
'rdepend': '',
@@ -199,9 +199,8 @@ RDEPEND="${DEPEND}
ebuild += "\nsrc_prepare() {%s\n}\n" % patch_string
vars['eutils'] = ' eutils'
- fp = open(ebuild_file, 'w')
- fp.write(ebuild % vars)
- fp.close()
+ with open(ebuild_file, 'w') as fp:
+ fp.write(ebuild % vars)
if manifest:
proc = self.__pkg_manager.create_manifest(ebuild_file)
@@ -217,6 +216,9 @@ RDEPEND="${DEPEND}
def __keywords(self, accept_keywords):
+ if self.__scm:
+ return ''
+
keywords = [i.strip() for i in accept_keywords.split(' ')]
stable = []