diff options
author | coadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu> | 2014-12-23 04:29:59 -0200 |
---|---|---|
committer | coadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu> | 2014-12-23 04:29:59 -0200 |
commit | eca20366df90a363ca44d436ebd8c4c881774063 (patch) | |
tree | 45a1b8df0c85c7783dc2cc349d0cf5268718b94b /pcr/tahoe-lafs/0001-auto_deps-Workaround-dep-resolution-issue.patch | |
parent | 8cf8a53fe020f06efcef814bb6e2960a03e3a849 (diff) | |
parent | 7b6e08004392409f37fb28e2cd0f67e55a73e3b9 (diff) | |
download | abslibre-eca20366df90a363ca44d436ebd8c4c881774063.tar.gz abslibre-eca20366df90a363ca44d436ebd8c4c881774063.tar.bz2 abslibre-eca20366df90a363ca44d436ebd8c4c881774063.zip |
Merge branch 'master' of ssh://projects.parabola.nu:1863/~git/abslibre/abslibre
Diffstat (limited to 'pcr/tahoe-lafs/0001-auto_deps-Workaround-dep-resolution-issue.patch')
-rw-r--r-- | pcr/tahoe-lafs/0001-auto_deps-Workaround-dep-resolution-issue.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/pcr/tahoe-lafs/0001-auto_deps-Workaround-dep-resolution-issue.patch b/pcr/tahoe-lafs/0001-auto_deps-Workaround-dep-resolution-issue.patch new file mode 100644 index 000000000..e50ec14c2 --- /dev/null +++ b/pcr/tahoe-lafs/0001-auto_deps-Workaround-dep-resolution-issue.patch @@ -0,0 +1,48 @@ +From 8899e10098990adb688433f3209e277391aad5f3 Mon Sep 17 00:00:00 2001 +From: Kyle Manna <kyle@kylemanna.com> +Date: Sun, 21 Dec 2014 23:32:59 -0800 +Subject: [PATCH] auto_deps: Workaround dep resolution issue + +Errors: + + tahoe[5580]: Traceback (most recent call last): + tahoe[5580]: File "/usr/bin/tahoe", line 6, in <module> + tahoe[5580]: from pkg_resources import load_entry_point + tahoe[5580]: File "/usr/lib/python2.7/site-packages/pkg_resources.py", line 2951, in <module> + tahoe[5580]: working_set = WorkingSet._build_master() + tahoe[5580]: File "/usr/lib/python2.7/site-packages/pkg_resources.py", line 563, in _build_master + tahoe[5580]: return cls._build_from_requirements(__requires__) + tahoe[5580]: File "/usr/lib/python2.7/site-packages/pkg_resources.py", line 576, in _build_from_requirements + tahoe[5580]: dists = ws.resolve(reqs, Environment()) + tahoe[5580]: File "/usr/lib/python2.7/site-packages/pkg_resources.py", line 755, in resolve + tahoe[5580]: raise DistributionNotFound(req) + tahoe[5580]: pkg_resources.DistributionNotFound: pycrypto==2.1.0,==2.3,>=2.4.1 +--- + src/allmydata/_auto_deps.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/allmydata/_auto_deps.py b/src/allmydata/_auto_deps.py +index b7be321..3e93134 100644 +--- a/src/allmydata/_auto_deps.py ++++ b/src/allmydata/_auto_deps.py +@@ -16,7 +16,7 @@ install_requires = [ + + # zope.interface >= 3.6.0 is required for Twisted >= 12.1.0. + # zope.interface 3.6.3 and 3.6.4 are incompatible with Nevow (#1435). +- "zope.interface == 3.6.0, == 3.6.1, == 3.6.2, >= 3.6.5", ++ "zope.interface >= 3.6.5", + + # * On Windows we need at least Twisted 9.0 to avoid an indirect + # dependency on pywin32. +@@ -55,7 +55,7 @@ install_requires = [ + # Needed for SFTP. pyasn1 is needed by twisted.conch in Twisted >= 9.0. + # pycrypto 2.2 doesn't work due to https://bugs.launchpad.net/pycrypto/+bug/620253 + # pycrypto 2.4 doesn't work due to https://bugs.launchpad.net/pycrypto/+bug/881130 +- "pycrypto == 2.1.0, == 2.3, >= 2.4.1", ++ "pycrypto >= 2.4.1", + "pyasn1 >= 0.0.8a", + + # http://www.voidspace.org.uk/python/mock/ , 0.8.0 provides "call" +-- +2.2.1 + |