diff options
| author | Apollon Oikonomopoulos <apoikos@debian.org> | 2016-01-14 00:10:06 +0200 |
|---|---|---|
| committer | Apollon Oikonomopoulos <apollon@skroutz.gr> | 2016-01-14 00:10:06 +0200 |
| commit | 374e1947abcd3e127a2a613aff73ecffdb9199ea (patch) | |
| tree | d83973c3c9802450acd5b5e86fe0d4e8e60a3a1b /buildscripts/utils.py | |
| parent | 65585c90b12d6523bea75a2aebaae2a2fdf9e641 (diff) | |
Imported Upstream version 2.6.11upstream/2.6.11
Diffstat (limited to 'buildscripts/utils.py')
| -rw-r--r-- | buildscripts/utils.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/buildscripts/utils.py b/buildscripts/utils.py index fe35f69eec3..68273ee69c8 100644 --- a/buildscripts/utils.py +++ b/buildscripts/utils.py @@ -36,7 +36,7 @@ def getAllSourceFiles( arr=None , prefix="." ): def getGitBranch(): - if not os.path.exists( ".git" ): + if not os.path.exists( ".git" ) or not os.path.isdir(".git"): return None version = open( ".git/HEAD" ,'r' ).read().strip() @@ -63,7 +63,7 @@ def getGitBranchString( prefix="" , postfix="" ): return prefix + b + postfix def getGitVersion(): - if not os.path.exists( ".git" ): + if not os.path.exists( ".git" ) or not os.path.isdir(".git"): return "nogitversion" version = open( ".git/HEAD" ,'r' ).read().strip() @@ -87,7 +87,7 @@ def execsys( args ): def getprocesslist(): raw = "" try: - raw = execsys( "/bin/ps -ax" )[0] + raw = execsys( "/bin/ps axww" )[0] except Exception,e: print( "can't get processlist: " + str( e ) ) |