From 5f6981fcb383fbc88e28e1891a889b6a81cffd26 Mon Sep 17 00:00:00 2001 From: Ondra Machacek Date: Tue, 13 Oct 2015 16:24:44 +0200 Subject: [PATCH] packagin: build fixes --- setup.cfg | 3 ++- setup.py | 5 +++-- winremote/winremote.py | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/setup.cfg b/setup.cfg index f752b9a..3d4b960 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,6 @@ [bdist_rpm] -release = 1.1.1 +release = 1 packager = Ondra Machacek doc_files = README.md description = 'Tool to manage your windows machines remotely' +requires=python-argparse,pywinrm diff --git a/setup.py b/setup.py index 579fc53..7464d07 100644 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ setup( name='winremote', - version='1.1.1', + version='1.1.2', description='Tool to manage your windows machines remotely', long_description=long_description, url='https://github.com/machacekondra/winremote', @@ -18,7 +18,8 @@ author_email='machacek.ondra@gmail.com', license='GPLv3+', keywords='windows winrm', - install_requires=['argparse', 'pywinrm', 'pypandoc'], + install_requires=['argparse', 'pywinrm'], + requires=['pypandoc', 'pywinrm', 'argparse'], packages=find_packages(), entry_points={ 'console_scripts': [ diff --git a/winremote/winremote.py b/winremote/winremote.py index 991891b..715e5e7 100644 --- a/winremote/winremote.py +++ b/winremote/winremote.py @@ -37,10 +37,10 @@ def run_cmd(self, cmd, params=[]): :returns: result of command, status_code, std_out, std_err :rtype: tuple """ - r = self._session.run_cmd(cmd, params) self.logger.debug( 'Running cmd: %s, Out: %s, Err: %s', cmd, r.std_out, r.std_err ) + r = self._session.run_cmd(cmd, params) if r.status_code: self.logger.error('Error running command %s: %s', cmd, r.std_err)