Explorar o código

Changes archive format from uuid to uuid4

This allows for future support of other uuid versions
Michael Herold %!s(int64=9) %!d(string=hai) anos
pai
achega
d45a13babf
Modificáronse 3 ficheiros con 3 adicións e 3 borrados
  1. 1 1
      docs/usage/create.rst.inc
  2. 1 1
      src/borg/archiver.py
  3. 1 1
      src/borg/helpers.py

+ 1 - 1
docs/usage/create.rst.inc

@@ -79,7 +79,7 @@ The archive name needs to be unique. It must not end in '.checkpoint' or
 checkpoints and treated in special ways.
 
 In the archive name, you may use the following format tags:
-{now}, {utcnow}, {fqdn}, {hostname}, {user}, {pid}, {uuid}
+{now}, {utcnow}, {fqdn}, {hostname}, {user}, {pid}, {uuid4}
 
 To speed up pulling backups over sshfs and similar network file systems which do
 not provide correct inode information the --ignore-inode flag can be used. This

+ 1 - 1
src/borg/archiver.py

@@ -1362,7 +1362,7 @@ class Archiver:
         checkpoints and treated in special ways.
 
         In the archive name, you may use the following format tags:
-        {now}, {utcnow}, {fqdn}, {hostname}, {user}, {pid}, {uuid}
+        {now}, {utcnow}, {fqdn}, {hostname}, {user}, {pid}, {uuid4}
 
         To speed up pulling backups over sshfs and similar network file systems which do
         not provide correct inode information the --ignore-inode flag can be used. This

+ 1 - 1
src/borg/helpers.py

@@ -742,7 +742,7 @@ class Location:
             'now': current_time.now(),
             'utcnow': current_time.utcnow(),
             'user': uid2user(os.getuid(), os.getuid()),
-            'uuid': str(uuid.uuid4())
+            'uuid4': str(uuid.uuid4())
             }
         return format_line(text, data)