Compare commits
No commits in common. "b5c898035ad336a33bdca05146374ee696a5fc84" and "e82fd99a164ba09b7aa08b46d2b08337a838ee6f" have entirely different histories.
b5c898035a
...
e82fd99a16
@ -71,8 +71,8 @@ class Userconfig:
|
||||
return False
|
||||
# assemble file to tmp
|
||||
commentstring = ""
|
||||
if dir_config.check(section="Main", option="commentstring"):
|
||||
commentstring = dir_config.get(section="Main", option="commentstring")
|
||||
if dir_config.check("Main", "commentstring"):
|
||||
commentstring = dir_config.get("Main", "commentstring")
|
||||
self._cfg.debug.stdout(" +++ Found commentstring %s in %s" % (commentstring, df), 3)
|
||||
|
||||
tempfilename = self.build_file(destfiles[df], df, commentstring)
|
||||
|
@ -59,7 +59,7 @@ def read_skip_comment(fp, commentstring):
|
||||
|
||||
def diff(destfile, tempfile, commentstring, cfg):
|
||||
"""diff destfile and tempfile, returns True if files differ, False if they are the same"""
|
||||
cfg.debug.stdout("Diffing %s and %s, comment: %s" % (destfile, tempfile, commentstring), 3)
|
||||
cfg.debug.stdout("Diffing %s and %s" % (destfile, tempfile), 3)
|
||||
if not os.path.isfile(destfile):
|
||||
cfg.debug.stdout("Destfile %s does not exist, returning True." % destfile, 3)
|
||||
# destfile does not exist -> copy tempfile over
|
||||
|
Loading…
Reference in New Issue
Block a user