浏览代码

Fix borg-list empty format

Should produce empty output, not default output.
Marian Beermann 8 年之前
父节点
当前提交
f3defb02de
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      src/borg/archiver.py

+ 2 - 2
src/borg/archiver.py

@@ -793,7 +793,7 @@ class Archiver:
                 archive = Archive(repository, key, manifest, args.location.archive, cache=cache,
                 archive = Archive(repository, key, manifest, args.location.archive, cache=cache,
                                   consider_part_files=args.consider_part_files)
                                   consider_part_files=args.consider_part_files)
 
 
-                if args.format:
+                if args.format is not None:
                     format = args.format
                     format = args.format
                 elif args.short:
                 elif args.short:
                     format = "{path}{NL}"
                     format = "{path}{NL}"
@@ -804,7 +804,7 @@ class Archiver:
                 for item in archive.iter_items(lambda item: matcher.match(item.path)):
                 for item in archive.iter_items(lambda item: matcher.match(item.path)):
                     write(safe_encode(formatter.format_item(item)))
                     write(safe_encode(formatter.format_item(item)))
         else:
         else:
-            if args.format:
+            if args.format is not None:
                 format = args.format
                 format = args.format
             elif args.short:
             elif args.short:
                 format = "{archive}{NL}"
                 format = "{archive}{NL}"