lavatech/rana-cli
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

prevent using svn when Mac does not have xcode-tools installed

Browse source
This commit is contained in:
Alan Hamlett 2016-05-16 16:02:38 +02:00
parent 8ecba162aa
commit bb71ff3106
2 changed files with 31 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
setup.py
View file

@ -38,7 +38,6 @@ setup(
'Intended Audience :: Developers',
'License :: OSI Approved :: BSD License',
'Natural Language :: English',
'Programming Language :: Python',
'Topic :: Text Editors',
'Programming Language :: Python',
'Programming Language :: Python :: 2',

46
wakatime/projects/subversion.py
View file

@ -62,21 +62,22 @@ class Subversion(BaseProject):
def _get_info(self, path):
info = OrderedDict()
stdout = None
try:
os.environ['LANG'] = 'en_US'
stdout, stderr = Popen([
self._find_binary(), 'info', os.path.realpath(path)
], stdout=PIPE, stderr=PIPE).communicate()
except OSError:
pass
else:
if stdout:
for line in stdout.splitlines():
line = u(line)
line = line.split(': ', 1)
if len(line) == 2:
info[line[0]] = line[1]
if not self._is_mac() or self._has_xcode_tools():
stdout = None
try:
os.environ['LANG'] = 'en_US'
stdout, stderr = Popen([
self._find_binary(), 'info', os.path.realpath(path)
], stdout=PIPE, stderr=PIPE).communicate()
except OSError:
pass
else:
if stdout:
for line in stdout.splitlines():
line = u(line)
line = line.split(': ', 1)
if len(line) == 2:
info[line[0]] = line[1]
return info
def _find_project_base(self, path, found=False):
@ -97,3 +98,18 @@ class Subversion(BaseProject):
return found
return self._find_project_base(split_path[0], found)
def _is_mac(self):
return platform.system() == 'Darwin'
def _has_xcode_tools(self):
try:
with open(os.devnull, 'wb') as DEVNULL:
proc = Popen(['/usr/bin/xcode-select', '-p'], stdout=DEVNULL, stderr=DEVNULL)
proc.communicate()
retval = proc.wait()
if retval == 0:
return True
except:
pass
return False