Compare commits
No commits in common. "e82fd99a164ba09b7aa08b46d2b08337a838ee6f" and "16020e8fbb20588652371bf07054c05ed3ad7937" have entirely different histories.
e82fd99a16
...
16020e8fbb
1
.gitignore
vendored
1
.gitignore
vendored
@ -4,4 +4,3 @@ build/
|
|||||||
.idea/
|
.idea/
|
||||||
.venv
|
.venv
|
||||||
userconfig.egg-info/
|
userconfig.egg-info/
|
||||||
*.swp
|
|
||||||
|
@ -19,7 +19,6 @@ def main():
|
|||||||
cmdline = parser.parse_args()
|
cmdline = parser.parse_args()
|
||||||
cfg = Conf(cmdline.file)
|
cfg = Conf(cmdline.file)
|
||||||
debug = Debug()
|
debug = Debug()
|
||||||
debug.set_verbose(cmdline.verbose)
|
|
||||||
cfg.set_debug(debug)
|
cfg.set_debug(debug)
|
||||||
uc = Userconfig(cfg)
|
uc = Userconfig(cfg)
|
||||||
|
|
||||||
|
@ -7,13 +7,12 @@ class Conf(object):
|
|||||||
_cfgfiles = []
|
_cfgfiles = []
|
||||||
debug = None
|
debug = None
|
||||||
|
|
||||||
def __init__(self, filename=None, debug=None, force_filename=False):
|
def __init__(self, filename=None, debug=None):
|
||||||
if debug:
|
if debug:
|
||||||
self.set_debug(debug)
|
self.set_debug(debug)
|
||||||
filenames = []
|
filenames = []
|
||||||
if filename:
|
if filename:
|
||||||
filenames.append(filename)
|
filenames.append(filename)
|
||||||
if not force_filename:
|
|
||||||
filenames.append(f'{os.environ.get("HOME")}/etc/userconfig2.conf')
|
filenames.append(f'{os.environ.get("HOME")}/etc/userconfig2.conf')
|
||||||
ret = self.set_filenames(filenames)
|
ret = self.set_filenames(filenames)
|
||||||
if not ret:
|
if not ret:
|
||||||
|
@ -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(section="Main", option="dest"):
|
if not ret.check("Main", "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(section="Main", option="dest").endswith("/"):
|
if not ret.get("Main", "dest").endswith("/"):
|
||||||
ret.set(section="Main", option="dest", value=ret.get(section="Main", option="dest")+"/")
|
ret.set("Main", "dest", ret.get("Main", "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("stamp"):
|
if not cfg.check("Main", "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("stamp")), line):
|
if re.search(re.escape(cfg.get("Main", "stamp")), line):
|
||||||
return True
|
return True
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user