Merge pull request #75 from devopshq/develop

Develop => master
devopshq · May 21, 2018 · e7124b9 · e7124b9
2 parents 1100005 + 70b70ca
commit e7124b9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -19,7 +19,7 @@ before_deploy:
 script:
 - coverage run -m py.test tests
 - coverage xml
-- python-codacy-coverage -r coverage.xml
+- if [[ ! $CODACY_PROJECT_TOKEN ]]; then echo "Variable CODACY_PROJECT_TOKEN not set. Step is skipped."; exit 0; else python-codacy-coverage -r coverage.xml; fi
 deploy:
   provider: pypi
   user: devopshq

diff --git a/crosspm/helpers/package.py b/crosspm/helpers/package.py
@@ -162,8 +162,9 @@ def do_print(left):
                     if not res_str:
                         cur_str = self._params.get(k, '')
                     if not res_str:
-                        cur_str = '{}{} '.format(left, cur_str)
-                    cur_format = '{}'
+                        res_str = '{}{}'.format(left, cur_str)
+                        continue
+                    cur_format = ' {}'
                     if v > 0:
                         cur_format = '{:%s}' % (v if len(cur_str) <= v else v + len(left))
                     res_str += cur_format.format(cur_str)