[pyfai] 07/10: fix patch
Frédéric-Emmanuel Picca
picca at moszumanska.debian.org
Fri Jul 24 12:10:03 UTC 2015
This is an automated email from the git hooks/post-receive script.
picca pushed a commit to branch master
in repository pyfai.
commit 800ca350be801007cd112ba8aea0e946dfa2785f
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date: Fri Jul 24 11:16:00 2015 +0200
fix patch
---
debian/patches/0001-fix-pyFAI-when-third_party-is-missing.patch | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/debian/patches/0001-fix-pyFAI-when-third_party-is-missing.patch b/debian/patches/0001-fix-pyFAI-when-third_party-is-missing.patch
index aae6c43..6cca40e 100644
--- a/debian/patches/0001-fix-pyFAI-when-third_party-is-missing.patch
+++ b/debian/patches/0001-fix-pyFAI-when-third_party-is-missing.patch
@@ -1,6 +1,6 @@
From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?=
<picca at synchrotron-soleil.fr>
-Date: Fri, 24 Jul 2015 10:54:52 +0200
+Date: Fri, 24 Jul 2015 11:15:42 +0200
Subject: fix pyFAI when third_party is missing
---
@@ -196,7 +196,7 @@ index 7c9531f..7a457ae 100644
cmdclass=cmdclass,
data_files=data_files,
diff --git a/src/_distortion.pyx b/src/_distortion.pyx
-index bb58b84..e26def3 100644
+index bb58b84..1e74838 100644
--- a/src/_distortion.pyx
+++ b/src/_distortion.pyx
@@ -45,7 +45,11 @@ import time
@@ -205,9 +205,9 @@ index bb58b84..e26def3 100644
from .utils import timeit, expand2d
-from .third_party import six
+
-+try
++try:
+ import six
-+except ImportError
++except ImportError:
+ from .third_party import six
import fabio
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pyfai.git
More information about the debian-science-commits
mailing list