[python-djblets] Include patch

Stephen Gallagher sgallagh at fedoraproject.org
Tue Jul 29 20:00:50 UTC 2014


commit 93fac38f026cf25b8012723c853dd8d2a5823cff
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Tue Jul 29 16:00:31 2014 -0400

    Include patch

 ...-Re-fix-building-i18n-on-pristine-systems.patch |   33 ++++++++++++++++++++
 1 files changed, 33 insertions(+), 0 deletions(-)
---
diff --git a/0001-Re-fix-building-i18n-on-pristine-systems.patch b/0001-Re-fix-building-i18n-on-pristine-systems.patch
new file mode 100644
index 0000000..51f29e5
--- /dev/null
+++ b/0001-Re-fix-building-i18n-on-pristine-systems.patch
@@ -0,0 +1,33 @@
+From e2698ec75386b147b35e1e7287757a05d1663bea Mon Sep 17 00:00:00 2001
+From: Stephen Gallagher <sgallagh at redhat.com>
+Date: Tue, 29 Jul 2014 14:13:57 -0400
+Subject: [PATCH] Re-fix building i18n on pristine systems
+
+A patch to 0.8.8 reverted the behavior here, causing distribution
+builds to fail. This patch should provide the intended behavior for
+both cases.
+---
+ setup.py | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index ee61a585905ccf7db7ff1d9697eb3744f0c4bc8d..dc4a2d01aa51aa0bf00016fabe5acbdd53362a5d 100755
+--- a/setup.py
++++ b/setup.py
+@@ -95,7 +95,12 @@ class BuildI18n(Command):
+         # location (such as distribution packaging), we need to
+         # ensure that the source directory is in the PYTHONPATH
+         # or the import of djblets.util.filesystem will fail.
+-        sys.path.append("%s" % os.getcwd())
++        current_path = os.getenv("PYTHONPATH")
++        if current_path:
++            os.putenv("PYTHONPATH", "%s:%s" % (current_path, os.getcwd()))
++        else:
++            os.putenv("PYTHONPATH", os.getcwd())
++
+         retcode = subprocess.call([
+             sys.executable, 'contrib/internal/build-i18n.py'])
+ 
+-- 
+2.0.1
+


More information about the scm-commits mailing list