comariface: safe_script_name is a better name
This commit is contained in:
+5
-5
@@ -41,8 +41,8 @@ def is_method_missing(exception):
|
||||
return True
|
||||
return False
|
||||
|
||||
def safe_package_name(package):
|
||||
"""Generates DBus-safe object name for package name."""
|
||||
def safe_script_name(package):
|
||||
"""Generates DBus-safe object name for package script names."""
|
||||
object = package
|
||||
for char in package:
|
||||
if not is_char_valid(char):
|
||||
@@ -97,7 +97,7 @@ def post_install(package_name, provided_scripts,
|
||||
ctx.ui.info(_("Configuring %s package") % package_name)
|
||||
self_post = False
|
||||
|
||||
package_name = safe_package_name(package_name)
|
||||
package_name = safe_script_name(package_name)
|
||||
|
||||
if package_name == 'comar':
|
||||
ctx.ui.debug(_("COMAR package updated. From now on,"
|
||||
@@ -158,7 +158,7 @@ def pre_remove(package_name, metapath, filepath):
|
||||
ctx.ui.info(_("Running pre removal operations for %s") % package_name)
|
||||
link = get_link()
|
||||
|
||||
package_name = safe_package_name(package_name)
|
||||
package_name = safe_script_name(package_name)
|
||||
|
||||
if package_name in list(link.System.Package):
|
||||
ctx.ui.debug(_("Running package's pre remove script"))
|
||||
@@ -188,7 +188,7 @@ def post_remove(package_name, metapath, filepath, provided_scripts=[]):
|
||||
ctx.ui.info(_("Running post removal operations for %s") % package_name)
|
||||
link = get_link()
|
||||
|
||||
package_name = safe_package_name(package_name)
|
||||
package_name = safe_script_name(package_name)
|
||||
scripts = set([s.name for s in provided_scripts if s.name])
|
||||
scripts.add(package_name)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user