Changeset 0b4e5b9eed32…
Parent b51c60a7f6e0…
by
Changes to 3 files · Browse files at 0b4e5b9eed32 Showing diff from parent b51c60a7f6e0 Diff from another changeset...
@@ -44,6 +44,7 @@ license_path = "%{_docdir}/%{name}-%{version}/COPYING.txt"
locale_path = "%{_datadir}/locale"
icon_path = "%{_datadir}/pixmaps/tortoisehg/icons"
+nofork = True
EOT
%build
|
@@ -145,6 +145,7 @@ f.write('license_path = "/usr/share/doc/tortoisehg/Copying.txt.gz"\n')
f.write('locale_path = "/usr/share/locale"\n')
f.write('icon_path = "/usr/share/pixmaps/tortoisehg/icons"\n')
+ f.write('nofork = True\n')
f.close()
return _scripts, _packages, _data_files, _extra
|
@@ -25,6 +25,10 @@ from tortoisehg.util.i18n import agettext as _
from tortoisehg.util import hglib, paths, shlib
from tortoisehg.util import version as thgversion
+try:
+ from tortoisehg.util.config import nofork as config_nofork
+except ImportError:
+ config_nofork = None
nonrepo_commands = '''userconfig clone debugcomplete init about help
version thgstatus serve'''
@@ -72,11 +76,13 @@ gtkrun(run, u, **opts)
def portable_fork(ui, opts):
- if 'THG_HGTK_SPAWN' in os.environ:
+ if 'THG_HGTK_SPAWN' in os.environ or \
+ opts.get('nofork') or opts.get('repository'):
return
- if opts.get('nofork') or opts.get('repository'):
- return
- if not ui.configbool('tortoisehg', 'hgtkfork', True):
+ elif ui.configbool('tortoisehg', 'hgtkfork', None) is not None:
+ if not ui.configbool('tortoisehg', 'hgtkfork'):
+ return
+ elif config_nofork:
return
# Spawn background process and exit
if hasattr(sys, "frozen"):
|
Loading...