[Python-modules-commits] [txwinrm] 03/05: merge patched into master

[Christopher Hoskin]

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

grinorcole-guest pushed a commit to branch master
in repository txwinrm.

commit feb7d79caf5ccbacae9fb689fbf8da048ca4057f
Merge: 3fc5f7e cca09c3
Author: Christopher Hoskin <christopher.hoskin at gmail.com>
Date:   Sat Jul 30 09:47:43 2016 +0100

    merge patched into master

 debian/.git-dpm                                |  4 ++--
 debian/patches/0003-Wecutil-Argument-Bug.patch | 22 ++++++++++++++++++++++
 debian/patches/series                          |  1 +
 txwinrm/wecutil.py                             |  2 +-
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 3e1e6d7,0000000..8b7ec65
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 6419f538842b28a34ed0b96107a5ab601709f22e
- 6419f538842b28a34ed0b96107a5ab601709f22e
++cca09c333cf95bc826888190105f43965a2e4037
++cca09c333cf95bc826888190105f43965a2e4037
 +4908988cb543fc75fa0c3a248f2c4ad9fa2aae3b
 +4908988cb543fc75fa0c3a248f2c4ad9fa2aae3b
 +txwinrm_1.1.26.orig.tar.gz
 +3c755018761f69b94dde4acfa5bf91e84a835052
 +281982
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0003-Wecutil-Argument-Bug.patch
index 0000000,0000000..3dfa39f
new file mode 100644
--- /dev/null
+++ b/debian/patches/0003-Wecutil-Argument-Bug.patch
@@@ -1,0 -1,0 +1,22 @@@
++From cca09c333cf95bc826888190105f43965a2e4037 Mon Sep 17 00:00:00 2001
++From: Christopher Hoskin <christopher.hoskin at gmail.com>
++Date: Sat, 30 Jul 2016 09:47:09 +0100
++Subject: Wecutil Argument Bug
++
++---
++ txwinrm/wecutil.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/txwinrm/wecutil.py b/txwinrm/wecutil.py
++index e456e14..39db0ef 100644
++--- a/txwinrm/wecutil.py
+++++ b/txwinrm/wecutil.py
++@@ -90,7 +90,7 @@ class WecutilStrategy(object):
++ class WecUtility(app.ConfigDrivenUtility):
++ 
++     def add_args(self, parser):
++-        parser.add_argument("--path", "-p", default='Application')
+++        parser.add_argument("--path", "-t", default='Application')
++         parser.add_argument("--select", "-s", default='*')
++         parser.add_argument("--num-pulls", "-n", type=int, default=2)
++ 
diff --cc debian/patches/series
index 210a7f5,0000000..4699d23
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,3 @@@
 +0001-Upstream-calls-pykerberos-kerberos-we-want-the-defau.patch
 +0002-Fix-tests.patch
++0003-Wecutil-Argument-Bug.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/txwinrm.git