lertsenem
/
persoconf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug on 'check' command for directories 

The command always showed a directory mismatch, because of filecmp.cmp
function being applied to dirs (and not files only, duh).
master
Lertsenem 2016-02-25 02:33:54 +01:00
parent d963b185c8
commit 73c3629ab6
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
persoconf/commands/check.py
View File

@ -136,18 +136,22 @@ def _compare_and_log(original_file_path, persoconf_backup_path, logger):
is_dir = os.path.isdir( resolved_ofp ) is_dir = os.path.isdir( resolved_ofp )
if filecmp.cmp(resolved_ofp, resolved_pbp) : if is_dir:
if is_dir: dcmp = filecmp.dircmp(resolved_ofp, resolved_pbp)
logger.info( "No modification on %s/" if ( len(dcmp.diff_files) > 0
% original_file_path ) or len(dcmp.left_only) > 0
or len(dcmp.right_only) > 0 ):
logger.warning( "Dir %s/ was modified"
% original_file_path )
else: else:
logger.info( "No modification on %s" logger.info( "No modification on %s/"
% original_file_path ) % original_file_path )
else: else:
if is_dir: if filecmp.cmp(resolved_ofp, resolved_pbp) :
logger.warning( "Dir %s/ was modified" logger.info( "No modification on %s"
% original_file_path ) % original_file_path )
else: else:
logger.warning( "File %s was modified" logger.warning( "File %s was modified"
% original_file_path ) % original_file_path )