lysis/pyuserconfig
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: lysis:e82fd99a164ba09b7aa08b46d2b08337a838ee6f
Branches Tags
lysis:main
...
compare: lysis:b5c898035ad336a33bdca05146374ee696a5fc84
Branches Tags
lysis:main

2 Commits
e82fd99a16 ... b5c898035a

Author SHA1 Message Date
Marcus Stoegbauer
b5c898035a fixed cfg.get syntax 2024-03-30 00:57:14 +01:00
Marcus Stoegbauer
2c06ecca77 output commentstring as well 2024-03-30 00:56:58 +01:00
2 changed files with 3 additions and 3 deletions
Show Stats Expand all files Collapse all files

4
userconfig/__init__.py
View File

@ -71,8 +71,8 @@ class Userconfig:
return False return False
# assemble file to tmp # assemble file to tmp
commentstring = "" commentstring = ""
if dir_config.check("Main", "commentstring"): if dir_config.check(section="Main", option="commentstring"):
commentstring = dir_config.get("Main", "commentstring") commentstring = dir_config.get(section="Main", option="commentstring")
self._cfg.debug.stdout(" +++ Found commentstring %s in %s" % (commentstring, df), 3) self._cfg.debug.stdout(" +++ Found commentstring %s in %s" % (commentstring, df), 3)
tempfilename = self.build_file(destfiles[df], df, commentstring) tempfilename = self.build_file(destfiles[df], df, commentstring)

2
userconfig/tools.py
View File

@ -59,7 +59,7 @@ def read_skip_comment(fp, commentstring):
def diff(destfile, tempfile, commentstring, cfg): def diff(destfile, tempfile, commentstring, cfg):
"""diff destfile and tempfile, returns True if files differ, False if they are the same""" """diff destfile and tempfile, returns True if files differ, False if they are the same"""
cfg.debug.stdout("Diffing %s and %s" % (destfile, tempfile), 3) cfg.debug.stdout("Diffing %s and %s, comment: %s" % (destfile, tempfile, commentstring), 3)
if not os.path.isfile(destfile): if not os.path.isfile(destfile):
cfg.debug.stdout("Destfile %s does not exist, returning True." % destfile, 3) cfg.debug.stdout("Destfile %s does not exist, returning True." % destfile, 3)
# destfile does not exist -> copy tempfile over # destfile does not exist -> copy tempfile over