diff options
| author | Thomas Danckaert <post@thomasdanckaert.be> | 2017-01-23 19:21:52 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-01-23 19:35:31 +0100 |
| commit | 2903ee1ea51fffa4e62d18d9f6807c8956fc4c8d (patch) | |
| tree | adaa35e3b470a9f176a111ef84fb58f5938c4549 /gnu/packages/patches | |
| parent | 82110ef658375fd1e8d470ddb7b5e1c5aa116fad (diff) | |
| download | guix-2903ee1ea51fffa4e62d18d9f6807c8956fc4c8d.tar guix-2903ee1ea51fffa4e62d18d9f6807c8956fc4c8d.tar.gz | |
gnu: duplicity: Update to 0.7.11.
* gnu/packages/backup.scm (duplicity): Update to 0.7.11.
[source]: Remove patches.
[inputs]: Add lftp, update gnupg, remove python-2, make python2-lockfile a
propagated input, make python2-mock a native-input.
[propagated-inputs]: Add python2-lockfile, python2-urllib3.
[native-inputs]: Add python2-pexpect, python2-mock.
[arguments]: Add build phase to embed gnupg store name.
* gnu/packages/patches/duplicity-piped-password.patch: Delete it.
* gnu/packages/patches/duplicity-test_selection-tmp.patch: Delete it.
* gnu/local.mk (dist_patch_DATA): Remove patches.
Signed-off-by: Marius Bakke <mbakke@fastmail.com>
Diffstat (limited to 'gnu/packages/patches')
| -rw-r--r-- | gnu/packages/patches/duplicity-piped-password.patch | 20 | ||||
| -rw-r--r-- | gnu/packages/patches/duplicity-test_selection-tmp.patch | 18 |
2 files changed, 0 insertions, 38 deletions
diff --git a/gnu/packages/patches/duplicity-piped-password.patch b/gnu/packages/patches/duplicity-piped-password.patch deleted file mode 100644 index db50f5df32..0000000000 --- a/gnu/packages/patches/duplicity-piped-password.patch +++ /dev/null @@ -1,20 +0,0 @@ -This test, on three occasions, is failing with the error: - - EOF: End Of File (EOF) in read_nonblocking(). Braindead platform. - ---- duplicity-0.6.24/testing/functional/test_final.py 2014-09-28 13:14:52.146001614 -0500 -+++ duplicity-0.6.24/testing/functional/test_final.py 2014-09-28 13:13:20.333546342 -0500 -@@ -156,13 +156,6 @@ - self.run_duplicity(options=["remove-older-than", "50000", "--force", self.backend_url]) - self.assertEqual(self.get_backend_files(), second_chain) - -- def test_piped_password(self): -- """Make sure that prompting for a password works""" -- self.set_environ("PASSPHRASE", None) -- self.backup("full", "testfiles/empty_dir", -- passphrase_input=[self.sign_passphrase, self.sign_passphrase]) -- self.restore(passphrase_input=[self.sign_passphrase]) -- - - class OldFilenamesFinalTest(FinalTest): - diff --git a/gnu/packages/patches/duplicity-test_selection-tmp.patch b/gnu/packages/patches/duplicity-test_selection-tmp.patch deleted file mode 100644 index 8f66be4dcc..0000000000 --- a/gnu/packages/patches/duplicity-test_selection-tmp.patch +++ /dev/null @@ -1,18 +0,0 @@ -Reported upstream at https://bugs.launchpad.net/duplicity/+bug/1375019 - ---- duplicity-0.6.24/testing/unit/test_selection.py 2014-05-09 08:27:40.000000000 -0500 -+++ duplicity-0.6.24/testing/unit/test_selection.py 2014-09-28 12:28:53.932324380 -0500 -@@ -431,10 +431,10 @@ - [(), ('1',), ('1', '1'), ('1', '2'), ('1', '3')]) - - self.root = Path("/") -- self.ParseTest([("--exclude", "/home/*"), -- ("--include", "/home"), -+ self.ParseTest([("--exclude", "/tmp/*"), -+ ("--include", "/tmp"), - ("--exclude", "/")], -- [(), ("home",)]) -+ [(), ("tmp",)]) - - if __name__ == "__main__": - unittest.main() |