[Python-modules-commits] [txwinrm] 05/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 a3a6d5b90d910754f1d618efc56f2e48fb8c4752
Merge: feb7d79 8e64e39
Author: Christopher Hoskin <christopher.hoskin at gmail.com>
Date:   Sat Jul 30 09:51:55 2016 +0100

    merge patched into master

 debian/.git-dpm                                |  4 ++--
 debian/patches/0003-Wecutil-Argument-Bug.patch | 14 ++++++++------
 txwinrm/wecutil.py                             |  2 +-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --cc debian/.git-dpm
index 8b7ec65,0000000..4dc1447
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
- cca09c333cf95bc826888190105f43965a2e4037
- cca09c333cf95bc826888190105f43965a2e4037
++8e64e39a304f431d8816c962b18b37ba0336164e
++8e64e39a304f431d8816c962b18b37ba0336164e
 +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 3dfa39f,0000000..a63603c
mode 100644,000000..100644
--- a/debian/patches/0003-Wecutil-Argument-Bug.patch
+++ b/debian/patches/0003-Wecutil-Argument-Bug.patch
@@@ -1,22 -1,0 +1,24 @@@
- From cca09c333cf95bc826888190105f43965a2e4037 Mon Sep 17 00:00:00 2001
++From 8e64e39a304f431d8816c962b18b37ba0336164e 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(-)
++ txwinrm/wecutil.py | 4 ++--
++ 1 file changed, 2 insertions(+), 2 deletions(-)
 +
 +diff --git a/txwinrm/wecutil.py b/txwinrm/wecutil.py
- index e456e14..39db0ef 100644
++index e456e14..d6a0e34 100644
 +--- a/txwinrm/wecutil.py
 ++++ b/txwinrm/wecutil.py
- @@ -90,7 +90,7 @@ class WecutilStrategy(object):
++@@ -90,8 +90,8 @@ class WecutilStrategy(object):
 + class WecUtility(app.ConfigDrivenUtility):
 + 
 +     def add_args(self, parser):
 +-        parser.add_argument("--path", "-p", default='Application')
++-        parser.add_argument("--select", "-s", default='*')
 ++        parser.add_argument("--path", "-t", default='Application')
-          parser.add_argument("--select", "-s", default='*')
+++        parser.add_argument("--select", "-e", default='*')
 +         parser.add_argument("--num-pulls", "-n", type=int, default=2)
 + 
++     def check_args(self, args):

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