[Python-apps-commits] r14359 - in packages/cython/trunk/debian (3 files)
infinity0 at users.alioth.debian.org
infinity0 at users.alioth.debian.org
Sat Aug 26 14:53:50 UTC 2017
Date: Saturday, August 26, 2017 @ 14:53:50
Author: infinity0
Revision: 14359
Remove patch relative-paths, made obsolete by other changes upstream
Modified:
packages/cython/trunk/debian/changelog
packages/cython/trunk/debian/patches/series
Deleted:
packages/cython/trunk/debian/patches/relative-paths
Modified: packages/cython/trunk/debian/changelog
===================================================================
--- packages/cython/trunk/debian/changelog 2017-08-26 14:52:56 UTC (rev 14358)
+++ packages/cython/trunk/debian/changelog 2017-08-26 14:53:50 UTC (rev 14359)
@@ -2,6 +2,7 @@
* Team upload.
* New upstream release. (Closes: #872710)
+ * Remove patch relative-paths, made obsolete by other changes upstream.
-- Ximin Luo <infinity0 at debian.org> Sat, 26 Aug 2017 16:52:26 +0200
Deleted: packages/cython/trunk/debian/patches/relative-paths
===================================================================
--- packages/cython/trunk/debian/patches/relative-paths 2017-08-26 14:52:56 UTC (rev 14358)
+++ packages/cython/trunk/debian/patches/relative-paths 2017-08-26 14:53:50 UTC (rev 14359)
@@ -1,28 +0,0 @@
-Description: Encode relative path to working tree in code paths when possible.
- This makes the build reproducible irregardless of the build path.
-Author: Jelmer Vernooij <jelmer at debian.org>
-Status: cherry-picked from upstream
-Bug: https://github.com/cython/cython/issues/1565
-Bug-Debian: https://bugs.debian.org/849328
-
-diff --git a/Cython/Compiler/ExprNodes.py b/Cython/Compiler/ExprNodes.py
-index 80a08c4bc..739d8037c 100644
---- a/Cython/Compiler/ExprNodes.py
-+++ b/Cython/Compiler/ExprNodes.py
-@@ -9040,7 +9040,15 @@ class CodeObjectNode(ExprNode):
- func_name = code.get_py_string_const(
- func.name, identifier=True, is_str=False, unicode_value=func.name)
- # FIXME: better way to get the module file path at module init time? Encoding to use?
-- file_path = StringEncoding.bytes_literal(func.pos[0].get_filenametable_entry().encode('utf8'), 'utf8')
-+ file_abspath = func.pos[0].get_filenametable_entry()
-+ # Prefer relative paths to current directory (which is most likely the project root)
-+ # over absolute paths.
-+ workdir = os.getcwd() + os.sep
-+ if file_abspath.startswith(workdir):
-+ file_path = file_abspath[len(workdir):]
-+ else:
-+ file_path = file_abspath
-+ file_path = StringEncoding.bytes_literal(file_path.encode('utf8'), 'utf8')
- file_path_const = code.get_py_string_const(file_path, identifier=False, is_str=True)
-
- flags = []
Modified: packages/cython/trunk/debian/patches/series
===================================================================
--- packages/cython/trunk/debian/patches/series 2017-08-26 14:52:56 UTC (rev 14358)
+++ packages/cython/trunk/debian/patches/series 2017-08-26 14:53:50 UTC (rev 14359)
@@ -2,4 +2,3 @@
deb_disable_googleanalytics
honour_SOURCE_DATE_EPOCH_for_copyright_year
debup_workaround_verify_resolution_GH1533
-relative-paths
More information about the Python-apps-commits
mailing list