From 51ac7357314ff1a3648420e92f26f2d393be0277 Mon Sep 17 00:00:00 2001 From: Brian Dolbec Date: Wed, 31 Oct 2012 20:59:39 -0700 Subject: fix a bug in layman-updater to use MakeConf class to create a proper make.conf file. Fix a comment path in MakeConf. --- layman/makeconf.py | 2 +- layman/updater.py | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/layman/makeconf.py b/layman/makeconf.py index 5f18b63..9740072 100644 --- a/layman/makeconf.py +++ b/layman/makeconf.py @@ -281,7 +281,7 @@ class MakeConf: def content(self): ''' - Returns the content of the /var/layman/make.conf file. + Returns the content of the /var/lib/layman/make.conf file. ''' try: make_conf = codecs.open(self.path, 'r', 'utf-8') diff --git a/layman/updater.py b/layman/updater.py index 1108ea3..ba9a1b8 100644 --- a/layman/updater.py +++ b/layman/updater.py @@ -145,12 +145,9 @@ class Main(object): self.output.info(" Creating layman's make.conf file") # create layman's %(storage)s/make.conf # so portage won't error - try: - make_conf = fileopen(self.config['make_conf'], mode="w") - make_conf.write("# Layman's make.conf\n\n") - make_conf.close() - except Exception, error: - self.output.error(" layman-updater: Error creating make.conf:") - self.output.error(" %s" % error) + from layman.makeconf import MakeConf + maker = MakeConf(self.config, None) + maker.write() + -- cgit v1.2.3-1-g7c22