Skip to content

Commit

Permalink
Several Landscape fixes
Browse files Browse the repository at this point in the history
Signed-off-by: Petr Hracek <phracek@redhat.com>
  • Loading branch information
phracek committed Apr 8, 2015
1 parent f07df17 commit 5073593
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
3 changes: 2 additions & 1 deletion rebasehelper/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
from rebasehelper.application import Application
from rebasehelper.logger import logger
from rebasehelper.exceptions import RebaseHelperError
from rebasehelper.utils import exc_as_decode_string


class CLI(object):
Expand Down Expand Up @@ -137,7 +138,7 @@ def run():
except KeyboardInterrupt:
logger.info('\nInterrupted by user')
except RebaseHelperError as e:
logger.error('\n{0}'.format(e))
logger.error('\n%s', exc_as_decode_string(e))
sys.exit(1)

sys.exit(0)
Expand Down
5 changes: 2 additions & 3 deletions rebasehelper/upstream_monitoring.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ def __init__(self, name, endpoint, topic, msg):
self.msg = msg

def parse_fedpkg_conf(self):

"""
Function parse /etc/rpkg/fedpkg.conf file
and return anonymous URL address for clonning package
Expand Down Expand Up @@ -100,7 +101,6 @@ def _print_patches(self):
def _call_rebase_helper(self):

""" Clonning repository and call rebase-helper """

logger.info('Clonning repository %s', self.url)
git.Git().clone(self.url)
os.chdir(self.package)
Expand All @@ -117,12 +117,11 @@ def _call_rebase_helper(self):
def process_messsage(self):

""" Process message from fedmsg """

#print ('NEW REQUEST')
#print('TOPIC:', self.topic)
#print('MSG:', self.msg)
if self.topic == 'org.fedoraproject.dev.logger.log':
self._get_package_version(self.msg)
self._get_package_version()
self.parse_fedpkg_conf()
tempdir = tempfile.mkdtemp(suffix='-rebase-helper')
cwd = os.getcwd()
Expand Down

0 comments on commit 5073593

Please sign in to comment.