diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-09-21 12:49:53 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-09-21 12:49:53 -0300 |
commit | c02976460621a16b172e3e33432d5790f3ed6117 (patch) | |
tree | c438b11c18e36170fd5ee7c767adda3f948e45bb /community/flumotion | |
parent | 79f56eaaa1e752a2f67072051b612acf5c648f69 (diff) | |
parent | ae08410274473c5ab78d300ea2365c4b1070cc61 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/bdf-unifont/PKGBUILD
extra/convmv/PKGBUILD
extra/cowsay/PKGBUILD
extra/curl/PKGBUILD
extra/dbus-qt3/PKGBUILD
extra/emovix/PKGBUILD
extra/foobillard/PKGBUILD
extra/gnome-spell/PKGBUILD
extra/libssh2/PKGBUILD
extra/mkbootcd/PKGBUILD
extra/mozilla-common/PKGBUILD
extra/ndesk-dbus-glib/PKGBUILD
extra/xfwm4-themes/PKGBUILD
Diffstat (limited to 'community/flumotion')
-rw-r--r-- | community/flumotion/python27.patch | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/community/flumotion/python27.patch b/community/flumotion/python27.patch deleted file mode 100644 index 70b00bbeb..000000000 --- a/community/flumotion/python27.patch +++ /dev/null @@ -1,27 +0,0 @@ -Index: flumotion/twisted/reflect.py -=================================================================== ---- flumotion/twisted/reflect.py (revision 8894) -+++ flumotion/twisted/reflect.py (working copy) -@@ -57,7 +57,10 @@ - # if the ImportError happened in the module being imported, - # this is a failure that should be handed to our caller. - shortname = trialname.split('.')[-1] -- r = str(sys.exc_info()[1]) -+ # if we're on python2.7 the module is wrapped in single quotation -+ # marks thus broking this method that relies on the message ending -+ # with the name that failed. -+ r = str(sys.exc_info()[1]).strip("'") - if not (r.startswith('No module named') and - r.endswith(shortname)): - raise -@@ -71,3 +74,10 @@ - obj = getattr(obj, n) - - return obj -+ -+# Use the method that comes with twisted if we're running on 8.0 or higher. -+# FIXME: Remove this module when we can depend on Twisted 8.0 -+from twisted.copyright import version -+twistedVersion = tuple([int(n) for n in version.split('.')[0:3]]) -+if twistedVersion >= (8, 0, 0): -+ from twisted.python.reflect import namedAny |