[ros-wstool] 01/02: Add patch for VCSs identity

[Jochen Sprickerhof]

This is an automated email from the git hooks/post-receive script.

jspricke pushed a commit to branch master
in repository ros-wstool.

commit 9be47afa83049ee982c0e11d5017e55b15ea81cc
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Tue Jul 18 08:01:39 2017 +0200

    Add patch for VCSs identity
    
    Closes: #868702
---
 debian/patches/0002-Add-fake-identity-for-VCSs.patch | 20 ++++++++++++++++++++
 debian/patches/0002-Add-fake-identity-for-bzr.patch  | 20 --------------------
 debian/patches/series                                |  2 +-
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/debian/patches/0002-Add-fake-identity-for-VCSs.patch b/debian/patches/0002-Add-fake-identity-for-VCSs.patch
new file mode 100644
index 0000000..eed5d9b
--- /dev/null
+++ b/debian/patches/0002-Add-fake-identity-for-VCSs.patch
@@ -0,0 +1,20 @@
+From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
+Date: Tue, 18 Jul 2017 09:38:43 +0200
+Subject: Add fake identity for VCSs
+
+---
+ test/scm_test_base.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/scm_test_base.py b/test/scm_test_base.py
+index 6125f7d..7267221 100644
+--- a/test/scm_test_base.py
++++ b/test/scm_test_base.py
+@@ -126,6 +126,7 @@ class AbstractRosinstallCLITest(unittest.TestCase):
+     """Base class for cli tests"""
+     @classmethod
+     def setUpClass(self):
++        os.environ['EMAIL'] = 'Your Name <name at example.com>'
+         self.new_environ = copy.copy(os.environ)
+         self.new_environ["PYTHONPATH"] = os.path.join(os.getcwd(), "src")
+         if "ROS_WORKSPACE" in self.new_environ:
diff --git a/debian/patches/0002-Add-fake-identity-for-bzr.patch b/debian/patches/0002-Add-fake-identity-for-bzr.patch
deleted file mode 100644
index 7709d27..0000000
--- a/debian/patches/0002-Add-fake-identity-for-bzr.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
-Date: Fri, 14 Jul 2017 22:19:27 +0200
-Subject: Add fake identity for bzr
-
----
- test/local/test_diff_functions_bzr.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/test/local/test_diff_functions_bzr.py b/test/local/test_diff_functions_bzr.py
-index d538f93..93393fe 100644
---- a/test/local/test_diff_functions_bzr.py
-+++ b/test/local/test_diff_functions_bzr.py
-@@ -49,6 +49,7 @@ from test.scm_test_base import AbstractSCMTest, _add_to_file, _nth_line_split
- 
- def create_bzr_repo(remote_path):
-     # create a "remote" repo
-+    subprocess.check_call(["bzr", "whoami", "Your Name <name at example.com>"], cwd=remote_path)
-     subprocess.check_call(["bzr", "init"], cwd=remote_path)
-     subprocess.check_call(["touch", "fixed.txt"], cwd=remote_path)
-     subprocess.check_call(["touch", "modified.txt"], cwd=remote_path)
diff --git a/debian/patches/series b/debian/patches/series
index c119821..63a9782 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
 0001-Fix-location-of-completion-scripts.patch
-0002-Add-fake-identity-for-bzr.patch
+0002-Add-fake-identity-for-VCSs.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ros/ros-wstool.git