fixes for configparser.get for files in configdir
This commit is contained in:
parent
4790429f24
commit
e82fd99a16
@ -38,12 +38,12 @@ def get_config(filename, cfg):
|
|||||||
cfg.debug.stderr("Error reading config file %s" % filename)
|
cfg.debug.stderr("Error reading config file %s" % filename)
|
||||||
return False
|
return False
|
||||||
# check for DEST parameter
|
# check for DEST parameter
|
||||||
if not ret.check("Main", "dest"):
|
if not ret.check(section="Main", option="dest"):
|
||||||
cfg.debug.stderr("No dest in config file %s" % filename)
|
cfg.debug.stderr("No dest in config file %s" % filename)
|
||||||
return False
|
return False
|
||||||
# make sure DEST ends with /
|
# make sure DEST ends with /
|
||||||
if not ret.get("Main", "dest").endswith("/"):
|
if not ret.get(section="Main", option="dest").endswith("/"):
|
||||||
ret.set("Main", "dest", ret.get("Main", "dest")+"/")
|
ret.set(section="Main", option="dest", value=ret.get(section="Main", option="dest")+"/")
|
||||||
return ret
|
return ret
|
||||||
|
|
||||||
|
|
||||||
@ -95,14 +95,14 @@ def user_config_generated(filename, cfg):
|
|||||||
# filename does not exist, so it was not generated by userconfig
|
# filename does not exist, so it was not generated by userconfig
|
||||||
return False
|
return False
|
||||||
|
|
||||||
if not cfg.check("Main", "stamp"):
|
if not cfg.check("stamp"):
|
||||||
# no STAMP in userconfig.cfg, so no way to check if file was generated by userconfig
|
# no STAMP in userconfig.cfg, so no way to check if file was generated by userconfig
|
||||||
return False
|
return False
|
||||||
|
|
||||||
fp = open(filename, "r")
|
fp = open(filename, "r")
|
||||||
|
|
||||||
for line in fp:
|
for line in fp:
|
||||||
if re.search(re.escape(cfg.get("Main", "stamp")), line):
|
if re.search(re.escape(cfg.get("stamp")), line):
|
||||||
return True
|
return True
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user