[entropy.dep] move helper function remove_tag_from_slot from entropy.spm to entropy.dep

This commit is contained in:
Fabio Erculiani
2011-01-29 21:59:35 +01:00
parent 98e5318207
commit 040ed38590
2 changed files with 9 additions and 5 deletions
+7
View File
@@ -334,6 +334,13 @@ def remove_slot(mydep):
mydep = mydep[:bracket]
return mydep
def remove_tag_from_slot(slot):
"""
Remove, if present, the tag part from SLOT string.
Packages append the kernel tag to the slot, by comma separating it.
"""
return slot[::-1].split(",", 1)[-1][::-1]
# input must be a valid package version or a full atom
def remove_revision(ver):
"""
@@ -2750,9 +2750,6 @@ class PortagePlugin(SpmPlugin):
self._bump_vartree_mtime(portage_cpv)
def __remove_kernel_tag_from_slot(self, slot):
return slot[::-1].split(",", 1)[-1][::-1]
def _get_portage_sets_object(self):
try:
import portage._sets as sets
@@ -2946,7 +2943,7 @@ class PortagePlugin(SpmPlugin):
elif package_metadata['versiontag'] and \
("," in package_metadata['slot']):
# new slot format for kernel tagged packages
myslot = self.__remove_kernel_tag_from_slot(myslot)
myslot = entropy.dep.remove_tag_from_slot(myslot)
keyslot = const_convert_to_rawstring(key+":"+myslot)
key = const_convert_to_rawstring(key)
@@ -3019,7 +3016,7 @@ class PortagePlugin(SpmPlugin):
slot = "0"
elif tag and ("," in slot):
# new kernel tagged pkgs protocol
slot = self.__remove_kernel_tag_from_slot(slot)
slot = entropy.dep.remove_tag_from_slot(slot)
def do_rm_path_atomic(xpath):
for my_el in os.listdir(xpath):