Philipp Hörist pushed to branch master at gajim / gajim
Commits:
-
dbbf0782
by Philipp Hörist at 2018-05-27T13:45:07+02:00
2 changed files:
Changes:
| 1 |
+import os
|
|
| 1 | 2 |
import subprocess
|
| 2 | 3 |
|
| 3 | 4 |
__version__ = "1.0.3"
|
| 4 | 5 |
|
| 6 |
+IS_FLATPAK = False
|
|
| 7 |
+if os.path.exists('/app/share/run-as-flatpak'):
|
|
| 8 |
+ IS_FLATPAK = True
|
|
| 9 |
+ |
|
| 5 | 10 |
try:
|
| 6 | 11 |
p = subprocess.Popen('git rev-parse --short=12 HEAD', shell=True,
|
| 7 |
- stdout=subprocess.PIPE, stderr=subprocess.DEVNULL)
|
|
| 12 |
+ stdout=subprocess.PIPE, stderr=subprocess.DEVNULL)
|
|
| 8 | 13 |
node = p.communicate()[0]
|
| 9 | 14 |
if node:
|
| 10 | 15 |
__version__ += '+' + node.decode('utf-8').strip()
|
| ... | ... | @@ -156,7 +156,6 @@ _dependencies = { |
| 156 | 156 |
'PYCURL': False,
|
| 157 | 157 |
'GSPELL': False,
|
| 158 | 158 |
'IDLE': False,
|
| 159 |
- 'RUN_AS_FLATPAK': False,
|
|
| 160 | 159 |
}
|
| 161 | 160 |
|
| 162 | 161 |
|
| ... | ... | @@ -170,7 +169,7 @@ def is_installed(dependency): |
| 170 | 169 |
return _dependencies[dependency]
|
| 171 | 170 |
|
| 172 | 171 |
def is_flatpak():
|
| 173 |
- return _dependencies['RUN_AS_FLATPAK']
|
|
| 172 |
+ return gajim.IS_FLATPAK
|
|
| 174 | 173 |
|
| 175 | 174 |
def disable_dependency(dependency):
|
| 176 | 175 |
_dependencies[dependency] = False
|
| ... | ... | @@ -296,10 +295,6 @@ def detect_dependencies(): |
| 296 | 295 |
except (ImportError, ValueError):
|
| 297 | 296 |
pass
|
| 298 | 297 |
|
| 299 |
- # RUN AS FLATPAK
|
|
| 300 |
- if os.path.exists('/app/share/run-as-flatpak'):
|
|
| 301 |
- _dependencies['RUN_AS_FLATPAK'] = True
|
|
| 302 |
- |
|
| 303 | 298 |
# Print results
|
| 304 | 299 |
for dep, val in _dependencies.items():
|
| 305 | 300 |
log('gajim').info('%-13s %s', dep, val)
|