Pisilinux3/pisi
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

comariface: safe_script_name is a better name

Browse Source
This commit is contained in:
Ozan Çağlayan
2011-01-05 12:14:02 +00:00
parent 371e7b1413
commit 7ae4827703
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi/comariface.py
+5 -5
View File
@@ -41,8 +41,8 @@ def is_method_missing(exception):
return True return True
return False return False
def safe_package_name(package): def safe_script_name(package):
"""Generates DBus-safe object name for package name.""" """Generates DBus-safe object name for package script names."""
object = package object = package
for char in package: for char in package:
if not is_char_valid(char): 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) ctx.ui.info(_("Configuring %s package") % package_name)
self_post = False self_post = False
package_name = safe_package_name(package_name) package_name = safe_script_name(package_name)
if package_name == 'comar': if package_name == 'comar':
ctx.ui.debug(_("COMAR package updated. From now on," 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) ctx.ui.info(_("Running pre removal operations for %s") % package_name)
link = get_link() 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): if package_name in list(link.System.Package):
ctx.ui.debug(_("Running package's pre remove script")) 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) ctx.ui.info(_("Running post removal operations for %s") % package_name)
link = get_link() 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 = set([s.name for s in provided_scripts if s.name])
scripts.add(package_name) scripts.add(package_name)