ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-30 17:56:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

zetuptoolz: don't add ';' to an empty path when appending a new item.

Browse Source 
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
Daira Hopwood 2015-01-30 22:05:54 +00:00
parent 341e263e03
commit 2480a16227
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
setuptools-0.6c16dev6.egg/setuptools/command/scriptsetup.py
View File

@ -154,10 +154,16 @@ def do_scriptsetup(allusers=False):
(value, type) = user_valueandtype or system_valueandtype or (u'', REG_SZ) (value, type) = user_valueandtype or system_valueandtype or (u'', REG_SZ)
key_name_path = (HKEY_CURRENT_USER, "HKEY_CURRENT_USER", USER_ENV) key_name_path = (HKEY_CURRENT_USER, "HKEY_CURRENT_USER", USER_ENV)
def path_append(value, addition):
if value != "":
return value + u';' + addition
else:
return addition
if addition.lower() in value.lower().split(u';'): if addition.lower() in value.lower().split(u';'):
print "Already done: %s." % (goal,) print "Already done: %s." % (goal,)
else: else:
changed |= update(key_name_path, varname, value + u';' + addition, type, goal, what) changed |= update(key_name_path, varname, path_append(value, addition), type, goal, what)
if change_allusers: if change_allusers:
# Also change any overriding environment entry for the current user. # Also change any overriding environment entry for the current user.
@ -167,7 +173,7 @@ def do_scriptsetup(allusers=False):
if not (addition.lower() in split_value or u'%'+varname.lower()+u'%' in split_value): if not (addition.lower() in split_value or u'%'+varname.lower()+u'%' in split_value):
now_what = "the overriding user environment variable %s" % (varname,) now_what = "the overriding user environment variable %s" % (varname,)
changed |= update((HKEY_CURRENT_USER, "HKEY_CURRENT_USER", USER_ENV), changed |= update((HKEY_CURRENT_USER, "HKEY_CURRENT_USER", USER_ENV),
varname, user_value + u';' + addition, user_type, varname, path_append(user_value, addition), user_type,
"add %s to %s" % (addition, now_what), now_what) "add %s to %s" % (addition, now_what), now_what)
return changed return changed