Skip to content

Commit

Permalink
chore(style): fix style
Browse files Browse the repository at this point in the history
  • Loading branch information
definite committed Apr 14, 2016
1 parent e8fe8eb commit 7c0bb6d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG
@@ -1,9 +1,10 @@
* Web Apr 13 2016 Sundeep Anand <suanand@redhat.com> - 1.5.0
* Thu Apr 14 2016 Sundeep Anand <suanand@redhat.com> - 1.5.0
- ZNTA-946 - zanata push StringIO fix
- ZNTA-303 - podir projects handling
- ZNTA-936 - redirection 301, 302 handling
- ZNTA-934 - java-client compatible zanata.xml
- ZNTA-927 - Project Status and Versions
- ZNTA-929 - zanata-python-client failed to retrieve version in non-git environment
- Bug 1139950 - Flexible Translation file naming

* Wed Jan 20 2016 Sundeep Anand <suanand@redhat.com> - 1.4.2
Expand Down
9 changes: 5 additions & 4 deletions zanataclient/command.py
Expand Up @@ -31,6 +31,7 @@
import os.path
import subprocess


class OptionConfigurationError(Exception):
pass

Expand Down Expand Up @@ -311,12 +312,12 @@ def handle_program(
# If running from git repo, then use "git describe"
# otherwise, use VERSION-FILE
version_number = ""
git_config=os.path.join(os.path.dirname(sys.argv[0]),'.git', 'config')
git_config = os.path.join(os.path.dirname(sys.argv[0]), '.git', 'config')
git_executable = spawn.find_executable("git")
if os.path.isfile(git_config) and not (git_executable is None):
proc= subprocess.Popen(["git", "describe"], stdout=subprocess.PIPE)
(out,err) = proc.communicate()
version_number=out[1:-1]
proc= subprocess.Popen(["git", "describe"], stdout = subprocess.PIPE)
(out, err) = proc.communicate()
version_number = out[1:-1]
else:
# Not from git, use VERSION-FILE
path = os.path.dirname(os.path.realpath(__file__))
Expand Down

0 comments on commit 7c0bb6d

Please sign in to comment.