>From 9a760b33cdca70fc6c7a516731e2d71309644f73 Mon Sep 17 00:00:00 2001
From: Marko Saukko <[email protected]>
Date: Tue, 12 Apr 2011 09:27:09 +0300
Subject: [PATCH] - Be less verbose and don't print site config content every
time
- Read only one siteconfig in preferred order
- Added variable for DEFAULT_PREFIX
---
mic/utils/misc.py | 22 +++++++++-------------
tools/mic-image-creator | 7 ++++---
2 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/mic/utils/misc.py b/mic/utils/misc.py
index 78743bd..0f589c4 100644
--- a/mic/utils/misc.py
+++ b/mic/utils/misc.py
@@ -447,22 +447,19 @@ def get_repostr(repo, siteconf = None):
return repostr
DEFAULT_SITECONF_GLOBAL="/etc/mic2/mic2.conf"
-DEFAULT_SITECONF_USER="~/.mic2.conf"
+DEFAULT_SITECONF_USER=os.path.expanduser("~/.mic2.conf")
def read_siteconf(siteconf = None):
from ConfigParser import SafeConfigParser
my_siteconf_parser = SafeConfigParser()
- if not siteconf:
- global_siteconf = DEFAULT_SITECONF_GLOBAL
- if os.path.isfile(global_siteconf):
- my_siteconf_parser.read(global_siteconf)
+ siteconfigs = [ siteconf, DEFAULT_SITECONF_USER, DEFAULT_SITECONF_GLOBAL ]
- local_siteconf = os.path.expanduser(DEFAULT_SITECONF_USER)
- if os.path.isfile(local_siteconf):
- my_siteconf_parser.read(local_siteconf)
- else:
- my_siteconf_parser.read(siteconf)
+ for siteconf in siteconfigs:
+ if siteconf and os.path.isfile(siteconf):
+ print "Using '%s' as site config file." % (siteconf)
+ my_siteconf_parser.read(siteconf)
+ break
if not my_siteconf_parser.sections():
return None
@@ -470,17 +467,16 @@ def read_siteconf(siteconf = None):
return my_siteconf_parser
def output_siteconf(siteconf):
- output = ""
if not siteconf:
- return output
+ return None
+ output = ""
for section in siteconf.sections():
output += "[%s]\n" % section
for option in siteconf.options(section):
output += "%s=%s\n" % (option, siteconf.get(section, option))
output += "\n\n"
- print output
return output
def get_repostrs_from_ks(ks):
diff --git a/tools/mic-image-creator b/tools/mic-image-creator
index 0f316f4..8734d70 100755
--- a/tools/mic-image-creator
+++ b/tools/mic-image-creator
@@ -84,6 +84,7 @@ parser = None
DEFAULT_TMPDIR="/var/tmp"
DEFAULT_CACHEDIR="~/.mic2_cachedir"
+DEFAULT_PREFIX="meego"
def parse_options(args):
global parser
@@ -120,7 +121,7 @@ def parse_options(args):
help="Generate checksum for image file if this option is
provided")
sysopt.add_option("-P", "--prefix", type="string",
dest="prefix", default=None,
- help="Image name prefix (default: meego)")
+ help="Image name prefix (default: "+DEFAULT_PREFIX+")")
sysopt.add_option("-S", "--suffix", type="string",
dest="suffix", default=None,
help="Image name suffix (default: date stamp)")
@@ -465,7 +466,7 @@ def main():
if not options.ignore_siteconf:
siteconf = utils.misc.read_siteconf(options.siteconf)
- utils.misc.output_siteconf(siteconf)
+ logging.info(utils.misc.output_siteconf(siteconf))
else:
siteconf = None
@@ -615,7 +616,7 @@ def main():
if options.release and options.run_mode == 0:
options.record_pkgs = "name"
if not options.prefix:
- options.prefix = "meego"
+ options.prefix = DEFAULT_PREFIX
if not options.suffix:
options.suffix = options.release
meegovert = ["handset", "netbook", "tablet", "ivi", "cetv", "core",
"tv"]
--
1.6.0.6
_______________________________________________
MeeGo-distribution-tools mailing list
[email protected]
http://lists.meego.com/listinfo/meego-distribution-tools
