From 040ed3859072d3bb7d64bffcef9a2cbe9c6d6e71 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Sat, 29 Jan 2011 21:59:35 +0100 Subject: [PATCH] [entropy.dep] move helper function remove_tag_from_slot from entropy.spm to entropy.dep --- libraries/entropy/dep.py | 7 +++++++ .../spm/plugins/interfaces/portage_plugin/__init__.py | 7 ++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/libraries/entropy/dep.py b/libraries/entropy/dep.py index 63800b95c..7471c63c1 100644 --- a/libraries/entropy/dep.py +++ b/libraries/entropy/dep.py @@ -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): """ diff --git a/libraries/entropy/spm/plugins/interfaces/portage_plugin/__init__.py b/libraries/entropy/spm/plugins/interfaces/portage_plugin/__init__.py index c84038227..24a9828e3 100644 --- a/libraries/entropy/spm/plugins/interfaces/portage_plugin/__init__.py +++ b/libraries/entropy/spm/plugins/interfaces/portage_plugin/__init__.py @@ -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):