首页 发现 帮助
登录
mirrors
/
borg
镜像自地址 https://github.com/borgbackup/borg
2
0
派生 0
文件 工单管理 0 Wiki
浏览代码

Merge pull request #2149 from borgbackup/release-1.0.10

Release 1.0.10
enkore 8 年之前
父节点
d188886269 e5f7121296
当前提交
3a3dfcbef5
共有 7 个文件被更改，包括 82 次插入 和 28 次删除
合并视图 显示文件统计
  1. 6 3
      borg/paperkey.html
  2. 13 0
      borg/testsuite/archiver.py
  3. 22 20
      docs/api.rst
  4. 31 2
      docs/changes.rst
  5. 3 1
      docs/usage/key_export.rst.inc
  6. 3 1
      scripts/borg.exe.spec
  7. 4 1
      setup.py

+ 6 - 3
borg/paperkey.html
查看文件 

@@ -2171,8 +2171,11 @@ if (typeof define == 'function' && define.amd) define([], function() { return Sh
 
         }
 
         }
 
     }
 
     }
 
 
 
-
 
-
 
+    /* center the QR code on the page */
 
+    #qr {
 
+      width: 100%;
 
+      text-align: center;
 
+    }
 
 </style>
 
 </style>
 
 </head>
 
 </head>
 
 <body>
 
 <body>
 
@@ -2217,7 +2220,7 @@ if (typeof define == 'function' && define.amd) define([], function() { return Sh
 
     <div id="printout">
 
     <div id="printout">
 
         <div id="title" contenteditable>BorgBackup Printable Key Backup</div>
 
         <div id="title" contenteditable>BorgBackup Printable Key Backup</div>
 
         <div contenteditable>To restore either scan the QR code below, decode it and import it using
 
         <div contenteditable>To restore either scan the QR code below, decode it and import it using
 
-<pre>borg key-import /path/to/repo scannedfile</pre>
 
+<pre>borg key import /path/to/repo scannedfile</pre>
 
 
 
 Or run
 
 Or run
 
 <pre>borg key import --paper /path/to/repo</pre> and type in the text below.<br><br></div>
 
 <pre>borg key import --paper /path/to/repo</pre> and type in the text below.<br><br></div>

+ 13 - 0
borg/testsuite/archiver.py
查看文件 

@@ -1318,6 +1318,19 @@ class ArchiverTestCase(ArchiverTestCaseBase):
 
 
 
         assert repo_key2.enc_key == repo_key2.enc_key
 
         assert repo_key2.enc_key == repo_key2.enc_key
 
 
 
+    def test_key_export_qr(self):
 
+        export_file = self.output_path + '/exported.html'
 
+        self.cmd('init', self.repository_location, '--encryption', 'repokey')
 
+        repo_id = self._extract_repository_id(self.repository_path)
 
+        self.cmd('key', 'export', '--qr-html', self.repository_location, export_file)
 
+
 
+        with open(export_file, 'r', encoding='utf-8') as fd:
 
+            export_contents = fd.read()
 
+
 
+        assert bin_to_hex(repo_id) in export_contents
 
+        assert export_contents.startswith('<!doctype html>')
 
+        assert export_contents.endswith('</html>')
 
+
 
     def test_key_import_errors(self):
 
     def test_key_import_errors(self):
 
         export_file = self.output_path + '/exported'
 
         export_file = self.output_path + '/exported'
 
         self.cmd('init', self.repository_location, '--encryption', 'keyfile')
 
         self.cmd('init', self.repository_location, '--encryption', 'keyfile')

+ 22 - 20
docs/api.rst
查看文件 

@@ -1,37 +1,39 @@
 
-.. highlight:: python
 
+
 
+.. IMPORTANT: this file is auto-generated by "setup.py build_api", do not edit!
 
+
 
 
 
 API Documentation
 
 API Documentation
 
 =================
 
 =================
 
 
 
-.. automodule:: borg.archiver
 
+.. automodule:: borg.archive
 
     :members:
 
     :members:
 
     :undoc-members:
 
     :undoc-members:
 
 
 
-.. automodule:: borg.archive
 
+.. automodule:: borg.archiver
 
     :members:
 
     :members:
 
     :undoc-members:
 
     :undoc-members:
 
 
 
-.. automodule:: borg.repository
 
+.. automodule:: borg.cache
 
     :members:
 
     :members:
 
     :undoc-members:
 
     :undoc-members:
 
 
 
-.. automodule:: borg.remote
 
+.. automodule:: borg.chunker
 
     :members:
 
     :members:
 
     :undoc-members:
 
     :undoc-members:
 
 
 
-.. automodule:: borg.cache
 
-    :members:
 
+.. automodule:: borg.compress
 
+    :members: get_compressor, Compressor, CompressorBase
 
     :undoc-members:
 
     :undoc-members:
 
 
 
-.. automodule:: borg.key
 
+.. automodule:: borg.crypto
 
     :members:
 
     :members:
 
     :undoc-members:
 
     :undoc-members:
 
 
 
-.. automodule:: borg.keymanager
 
+.. automodule:: borg.fuse
 
     :members:
 
     :members:
 
     :undoc-members:
 
     :undoc-members:
 
 
 
-.. automodule:: borg.logger
 
+.. automodule:: borg.hashindex
 
     :members:
 
     :members:
 
     :undoc-members:
 
     :undoc-members:
 
 
 
@@ -39,23 +41,23 @@ API Documentation
 
     :members:
 
     :members:
 
     :undoc-members:
 
     :undoc-members:
 
 
 
-.. automodule:: borg.locking
 
+.. automodule:: borg.key
 
     :members:
 
     :members:
 
     :undoc-members:
 
     :undoc-members:
 
 
 
-.. automodule:: borg.shellpattern
 
+.. automodule:: borg.keymanager
 
     :members:
 
     :members:
 
     :undoc-members:
 
     :undoc-members:
 
 
 
-.. automodule:: borg.lrucache
 
+.. automodule:: borg.locking
 
     :members:
 
     :members:
 
     :undoc-members:
 
     :undoc-members:
 
 
 
-.. automodule:: borg.fuse
 
+.. automodule:: borg.logger
 
     :members:
 
     :members:
 
     :undoc-members:
 
     :undoc-members:
 
 
 
-.. automodule:: borg.xattr
 
+.. automodule:: borg.lrucache
 
     :members:
 
     :members:
 
     :undoc-members:
 
     :undoc-members:
 
 
 
@@ -67,18 +69,18 @@ API Documentation
 
     :members:
 
     :members:
 
     :undoc-members:
 
     :undoc-members:
 
 
 
-.. automodule:: borg.hashindex
 
+.. automodule:: borg.remote
 
     :members:
 
     :members:
 
     :undoc-members:
 
     :undoc-members:
 
 
 
-.. automodule:: borg.compress
 
-    :members: get_compressor, Compressor, CompressorBase
 
+.. automodule:: borg.repository
 
+    :members:
 
     :undoc-members:
 
     :undoc-members:
 
 
 
-.. automodule:: borg.chunker
 
+.. automodule:: borg.shellpattern
 
     :members:
 
     :members:
 
     :undoc-members:
 
     :undoc-members:
 
 
 
-.. automodule:: borg.crypto
 
+.. automodule:: borg.xattr
 
     :members:
 
     :members:
 
     :undoc-members:
 
     :undoc-members:

+ 31 - 2
docs/changes.rst
查看文件 

@@ -128,13 +128,42 @@ The best check that everything is ok is to run a dry-run extraction::
 
 Changelog
 
 Changelog
 
 =========
 
 =========
 
 
 
+Version 1.0.10 (2017-02-13)
 
+---------------------------
 
+
 
+Bug fixes:
 
+
 
+- Manifest timestamps are now monotonically increasing,
 
+  this fixes issues when the system clock jumps backwards
 
+  or is set inconsistently across computers accessing the same repository, #2115
 
+- Fixed testing regression in 1.0.10rc1 that lead to a hard dependency on
 
+  py.test >= 3.0, #2112
 
+
 
+New features:
 
+
 
+- "key export" can now generate a printable HTML page with both a QR code and
 
+  a human-readable "paperkey" representation (and custom text) through the
 
+  ``--qr-html`` option.
 
+
 
+  The same functionality is also available through `paperkey.html <paperkey.html>`_,
 
+  which is the same HTML page generated by ``--qr-html``. It works with existing
 
+  "key export" files and key files.
 
+
 
+Other changes:
 
+
 
+- docs:
 
+
 
+  - language clarification - "borg create --one-file-system" option does not respect
 
+    mount points, but considers different file systems instead, #2141
 
+- setup.py: build_api: sort file list for determinism
 
+
 
 Version 1.0.10rc1 (2017-01-29)
 
 Version 1.0.10rc1 (2017-01-29)
 
 ------------------------------
 
 ------------------------------
 
 
 
 Bug fixes:
 
 Bug fixes:
 
 
 
 - borg serve: fix transmission data loss of pipe writes, #1268
 
 - borg serve: fix transmission data loss of pipe writes, #1268
 
-  This affects only the cygwin platform (not Linux, *BSD, OS X).
 
+  This affects only the cygwin platform (not Linux, BSD, OS X).
 
 - Avoid triggering an ObjectiveFS bug in xattr retrieval, #1992
 
 - Avoid triggering an ObjectiveFS bug in xattr retrieval, #1992
 
 - When running out of buffer memory when reading xattrs, only skip the
 
 - When running out of buffer memory when reading xattrs, only skip the
 
   current file, #1993
 
   current file, #1993
 
@@ -187,7 +216,7 @@ Other changes:
 
 - remove .github from pypi package, #2051
 
 - remove .github from pypi package, #2051
 
 - add pip and setuptools to requirements file, #2030
 
 - add pip and setuptools to requirements file, #2030
 
 - SyncFile: fix use of fd object after close (cosmetic)
 
 - SyncFile: fix use of fd object after close (cosmetic)
 
-- Manifest.in: simplify, exclude *.{so,dll,orig}, #2066
 
+- Manifest.in: simplify, exclude \*.{so,dll,orig}, #2066
 
 - ignore posix_fadvise errors in repository.py, #2095
 
 - ignore posix_fadvise errors in repository.py, #2095
 
   (works around issues with docker on ARM)
 
   (works around issues with docker on ARM)
 
 - make LoggedIO.close_segment reentrant, avoid reentrance
 
 - make LoggedIO.close_segment reentrant, avoid reentrance

+ 3 - 1
docs/usage/key_export.rst.inc
查看文件 

@@ -9,7 +9,7 @@ borg key export
 
     usage: borg key export [-h] [--critical] [--error] [--warning] [--info]
 
     usage: borg key export [-h] [--critical] [--error] [--warning] [--info]
 
                            [--debug] [--lock-wait N] [--show-rc]
 
                            [--debug] [--lock-wait N] [--show-rc]
 
                            [--no-files-cache] [--umask M] [--remote-path PATH]
 
                            [--no-files-cache] [--umask M] [--remote-path PATH]
 
-                           [--paper]
 
+                           [--paper] [--qr-html]
 
                            [REPOSITORY] [PATH]
 
                            [REPOSITORY] [PATH]
 
     
     
     Export the repository key for backup
 
     Export the repository key for backup
 
@@ -34,6 +34,8 @@ borg key export
 
       --remote-path PATH    set remote path to executable (default: "borg")
 
       --remote-path PATH    set remote path to executable (default: "borg")
 
       --paper               Create an export suitable for printing and later type-
 
       --paper               Create an export suitable for printing and later type-
 
                             in
 
                             in
 
+      --qr-html             Create an html file suitable for printing and later
 
+                            type-in or qr scan
 
     
     
 Description
 
 Description
 
 ~~~~~~~~~~~
 
 ~~~~~~~~~~~

+ 3 - 1
scripts/borg.exe.spec
查看文件 

@@ -10,7 +10,9 @@ block_cipher = None
 
 a = Analysis([os.path.join(basepath, 'borg/__main__.py'), ],
 
 a = Analysis([os.path.join(basepath, 'borg/__main__.py'), ],
 
              pathex=[basepath, ],
 
              pathex=[basepath, ],
 
              binaries=[],
 
              binaries=[],
 
-             datas=[],
 
+             datas=[
 
+                 ('../borg/paperkey.html', 'borg'),
 
+             ],
 
              hiddenimports=['borg.platform.posix'],
 
              hiddenimports=['borg.platform.posix'],
 
              hookspath=[],
 
              hookspath=[],
 
              runtime_hooks=[],
 
              runtime_hooks=[],

+ 4 - 1
setup.py
查看文件 

@@ -230,10 +230,13 @@ class build_api(Command):
 
         print("auto-generating API documentation")
 
         print("auto-generating API documentation")
 
         with open("docs/api.rst", "w") as doc:
 
         with open("docs/api.rst", "w") as doc:
 
             doc.write("""
 
             doc.write("""
 
+.. IMPORTANT: this file is auto-generated by "setup.py build_api", do not edit!
 
+
 
+
 
 API Documentation
 
 API Documentation
 
 =================
 
 =================
 
 """)
 
 """)
 
-            for mod in glob('borg/*.py') + glob('borg/*.pyx'):
 
+            for mod in sorted(glob('borg/*.py') + glob('borg/*.pyx')):
 
                 print("examining module %s" % mod)
 
                 print("examining module %s" % mod)
 
                 mod = mod.replace('.pyx', '').replace('.py', '').replace('/', '.')
 
                 mod = mod.replace('.pyx', '').replace('.py', '').replace('/', '.')
 
                 if "._" not in mod:
 
                 if "._" not in mod: