← Back to branch summary

~aaron-whitehouse/duplicity/08-ufn-to-fsdecode

« back to all changes in this revision

Viewing changes to duplicity/commandline.py

  • Committer: kenneth at loafman
  • Date: 2017-12-14 12:12:20 UTC
  • mfrom: (1286.1.2 08-fix-ascii)
  • Revision ID: kenneth@loafman.com-20171214121220-oh53xb9wi8j303s7
* Merged in lp:~aaron-whitehouse/duplicity/08-ufn-to-uc_name
  - Replace util.ufn(path.name) with path.uc_name throughout.

Show diffs side-by-side

added added

removed removed

Lines of Context:
duplicity/commandline.py
763
763
    set_archive_dir(expand_archive_dir(globals.archive_dir,
764
764
                                       globals.backup_name))
765
765
 
766
 
    log.Info(_("Using archive dir: %s") % (util.ufn(globals.archive_dir_path.name),))
 
766
    log.Info(_("Using archive dir: %s") % (globals.archive_dir_path.uc_name,))
767
767
    log.Info(_("Using backup name: %s") % (globals.backup_name,))
768
768
 
769
769
    return args
990
990
    archive_dir_path = path.Path(dirstring)
991
991
    if not archive_dir_path.isdir():
992
992
        log.FatalError(_("Specified archive directory '%s' does not exist, "
993
 
                         "or is not a directory") % (util.ufn(archive_dir_path.name),),
 
993
                         "or is not a directory") % (archive_dir_path.uc_name,),
994
994
                       log.ErrorCode.bad_archive_dir)
995
995
    globals.archive_dir_path = archive_dir_path
996
996
 
1059
1059
    if action == "restore":
1060
1060
        if (local_path.exists() and not local_path.isemptydir()) and not globals.force:
1061
1061
            log.FatalError(_("Restore destination directory %s already "
1062
 
                             "exists.\nWill not overwrite.") % (util.ufn(local_path.name),),
 
1062
                             "exists.\nWill not overwrite.") % (local_path.uc_name,),
1063
1063
                           log.ErrorCode.restore_dir_exists)
1064
1064
    elif action == "verify":
1065
1065
        if not local_path.exists():
1066
1066
            log.FatalError(_("Verify directory %s does not exist") %
1067
 
                           (util.ufn(local_path.name),),
 
1067
                           (local_path.uc_name,),
1068
1068
                           log.ErrorCode.verify_dir_doesnt_exist)
1069
1069
    else:
1070
1070
        assert action == "full" or action == "inc"
1071
1071
        if not local_path.exists():
1072
1072
            log.FatalError(_("Backup source directory %s does not exist.")
1073
 
                           % (util.ufn(local_path.name),),
 
1073
                           % (local_path.uc_name,),
1074
1074
                           log.ErrorCode.backup_dir_doesnt_exist)
1075
1075
 
1076
1076
    globals.local_path = local_path