[ros-genpy] 03/05: Remove patch, merged upstream
Jochen Sprickerhof
jspricke at moszumanska.debian.org
Sat Oct 28 08:12:54 UTC 2017
This is an automated email from the git hooks/post-receive script.
jspricke pushed a commit to annotated tag debian/0.6.7-1
in repository ros-genpy.
commit d2eb5a67075caf0e9d1be6615b2005890683d169
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date: Sat Oct 28 10:11:01 2017 +0200
Remove patch, merged upstream
---
.../0002-Fix-exception-handling-on-Hurd.patch | 22 ----------------------
debian/patches/series | 1 -
2 files changed, 23 deletions(-)
diff --git a/debian/patches/0002-Fix-exception-handling-on-Hurd.patch b/debian/patches/0002-Fix-exception-handling-on-Hurd.patch
deleted file mode 100644
index 3251bc3..0000000
--- a/debian/patches/0002-Fix-exception-handling-on-Hurd.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
-Date: Tue, 26 Sep 2017 09:38:37 +0200
-Subject: Fix exception handling on Hurd
-
-Hurd uses a different errno, so testing for the string as well.
----
- src/genpy/generator.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/genpy/generator.py b/src/genpy/generator.py
-index 4a70653..773785c 100644
---- a/src/genpy/generator.py
-+++ b/src/genpy/generator.py
-@@ -957,7 +957,7 @@ class Generator(object):
- # you can't just check first... race condition
- os.makedirs(outdir)
- except OSError as e:
-- if e.errno != 17: # file exists
-+ if e.errno != 17 and e.strerror != 'File exists': # file exists
- raise
- # generate message files for request/response
- spec = self.spec_loader_fn(msg_context, f, full_type)
diff --git a/debian/patches/series b/debian/patches/series
index 6452401..de2d3ac 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
0001-Fix-location-of-genmsg_py.py.patch
-0002-Fix-exception-handling-on-Hurd.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ros/ros-genpy.git
More information about the debian-science-commits
mailing list