openstack/deb-python-hacking
Code Issues Proposed changes

Hack to fixup absolute pybasedir in nova.conf.sample

Browse Source 
We want to avoid e.g. /home/markmc or /Users/vishvananda in this
file.

/usr/lib/python/site-packages is pretty dumb too, but it's suffices
as an example.

Change-Id: I851841a30ca01790c7b5a9b6bdbd160f4a84467c
This commit is contained in:
Mark McLoughlin
2012-03-09 11:05:13 +00:00
parent 9599ccd9dc
commit 68fe71cab7
1 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
conf/create_conf.py
View File

@@ -38,6 +38,8 @@ _OPTION_REGEX = re.compile(r"(%s)" % "|".join([_STROPT, _BOOLOPT, _INTOPT,
_FLOATOPT, _LISTOPT,
_MULTISTROPT]))
_BASEDIR = os.path.abspath(os.path.dirname(__file__) + "../../")
def main(srcfiles):
@@ -111,6 +113,13 @@ def print_module(mod_str):
print
def convert_abspath(s):
"""Set up a reasonably sensible default for pybasedir."""
if not s.startswith(_BASEDIR):
return s
return s.replace(_BASEDIR, '/usr/lib/python/site-packages')
def print_opt(opt):
opt_type = None
try:
@@ -120,20 +129,26 @@ def print_opt(opt):
sys.exit(1)
# print out option info
print "######", "".join(["(", opt_type, ")"]), opt.help
if opt.default is None:
print '# %s=<None>' % opt.name
name, default = opt.name, opt.default
if isinstance(default, basestring):
default = convert_abspath(default)
if default is None:
print '# %s=<None>' % name
else:
if opt_type == 'StrOpt':
print '# %s="%s"' % (opt.name, opt.default)
print '# %s="%s"' % (name, default)
elif opt_type == 'ListOpt':
print '# %s="%s"' % (opt.name, ','.join(opt.default))
print '# %s="%s"' % (name, ','.join(default))
elif opt_type == 'MultiStrOpt':
for default in opt.default:
print '# %s="%s"' % (opt.name, default)
for default in default:
print '# %s="%s"' % (name, default)
elif opt_type == 'BoolOpt':
print '# %s=%s' % (opt.name, str(opt.default).lower())
print '# %s=%s' % (name, str(default).lower())
else:
print '# %s=%s' % (opt.name, opt.default)
print '# %s=%s' % (name, default)
if __name__ == '__main__':