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

[Christopher Stuart Hoskin]

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

mans0954 pushed a commit to branch master
in repository txwinrm.

commit 016c8d7f5e324b1a662d8406a496ad80764787bb
Merge: 8ac9215 47d558c
Author: Christopher Hoskin <mans0954 at debian.org>
Date:   Sat Feb 25 18:06:39 2017 +0000

    merge patched into master

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

diff --cc debian/.git-dpm
index 780a896,0000000..8f92065
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
- 5387a17e0d17a170ce480bff33a0fa2e34bbef2c
- 5387a17e0d17a170ce480bff33a0fa2e34bbef2c
++47d558c472623c5bfa8ed30906a9811810ef7c2f
++47d558c472623c5bfa8ed30906a9811810ef7c2f
 +82c0f6be59bfc0d73db331c87a09eb2b6e14f6d0
 +82c0f6be59bfc0d73db331c87a09eb2b6e14f6d0
 +txwinrm_1.2.7.orig.tar.gz
 +dcb24afb99a6c3486fa284ce87901b2158a6afda
 +292596
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0003-Wecutil-Argument-Bug.patch
index 2dde4c6,0000000..4ec3a48
mode 100644,000000..100644
--- a/debian/patches/0003-Wecutil-Argument-Bug.patch
+++ b/debian/patches/0003-Wecutil-Argument-Bug.patch
@@@ -1,24 -1,0 +1,27 @@@
- From 5387a17e0d17a170ce480bff33a0fa2e34bbef2c Mon Sep 17 00:00:00 2001
++From 47d558c472623c5bfa8ed30906a9811810ef7c2f 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
 +
++Bug: https://github.com/zenoss/txwinrm/issues/82
++Forwarded: https://github.com/zenoss/txwinrm/pull/109
++Last-Update: 2017-02-25
 +---
 + txwinrm/wecutil.py | 4 ++--
 + 1 file changed, 2 insertions(+), 2 deletions(-)
 +
 +diff --git a/txwinrm/wecutil.py b/txwinrm/wecutil.py
- index e456e14..d6a0e34 100644
++index e456e14..557bd53 100644
 +--- a/txwinrm/wecutil.py
 ++++ b/txwinrm/wecutil.py
 +@@ -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", "-e", default='*')
+++        parser.add_argument("--select", "-l", 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