diff options
Diffstat (limited to 'portato/backend/portage')
| -rw-r--r-- | portato/backend/portage/package.py | 20 | ||||
| -rw-r--r-- | portato/backend/portage/system.py | 18 |
2 files changed, 24 insertions, 14 deletions
diff --git a/portato/backend/portage/package.py b/portato/backend/portage/package.py index 74a5107..376a6f4 100644 --- a/portato/backend/portage/package.py +++ b/portato/backend/portage/package.py @@ -59,9 +59,9 @@ class PortagePackage (Package): return False def is_testing(self, use_keywords = False): - testArch = "~" + self.get_settings("ARCH") + testArch = "~" + self.get_global_settings("ARCH") if not use_keywords: # keywords are NOT taken into account - if testArch in self.get_env_var("KEYWORDS").split(): + if testArch in self.get_package_settings("KEYWORDS").split(): return True return False @@ -92,12 +92,12 @@ class PortagePackage (Package): else: tree = self._settings.porttree - return list(set(self.get_env_var("IUSE", tree = tree).split()).difference(self.forced_flags)) + return list(set(self.get_package_settings("IUSE", tree = tree).split()).difference(self.forced_flags)) def get_matched_dep_packages (self, depvar): # change the useflags, because we have internally changed some, but not made them visible for portage newUseFlags = self.get_new_use_flags() - actual = self.get_settings("USE").split() + actual = self.get_global_settings("USE").split() if newUseFlags: for u in newUseFlags: if u[0] == "-" and flags.invert_use_flag(u) in actual: @@ -107,7 +107,7 @@ class PortagePackage (Package): depstring = "" for d in depvar: - depstring += self.get_env_var(d)+" " + depstring += self.get_package_settings(d)+" " portage_dep._dep_check_strict = False deps = portage.dep_check(depstring, None, self._settings.settings, myuse = actual, trees = self._trees) @@ -134,7 +134,7 @@ class PortagePackage (Package): # change the useflags, because we have internally changed some, but not made them visible for portage newUseFlags = self.get_new_use_flags() - actual = self.get_settings("USE").split() + actual = self.get_global_settings("USE").split() if newUseFlags: for u in newUseFlags: if u[0] == "-" and flags.invert_use_flag(u) in actual: @@ -144,7 +144,7 @@ class PortagePackage (Package): depstring = "" for d in depvar: - depstring += self.get_env_var(d)+" " + depstring += self.get_package_settings(d)+" " # let portage do the main stuff ;) # pay attention to any changes here @@ -188,7 +188,7 @@ class PortagePackage (Package): return dep_pkgs - def get_settings(self, key): + def get_global_settings(self, key): self._settingslock.acquire() self._settings.settings.setcpv(self._cpv) v = self._settings.settings[key] @@ -198,7 +198,7 @@ class PortagePackage (Package): def get_ebuild_path(self): return self._settings.porttree.dbapi.findname(self._cpv) - def get_env_var(self, var, tree = None): + def get_package_settings(self, var, tree = None): if not tree: mytree = self._settings.vartree if not self.is_installed(): @@ -211,7 +211,7 @@ class PortagePackage (Package): def get_use_flags(self): if self.is_installed(): - return self.get_env_var("USE", tree = self._settings.vartree) + return self.get_package_settings("USE", tree = self._settings.vartree) else: return "" def compare_version(self,other): diff --git a/portato/backend/portage/system.py b/portato/backend/portage/system.py index 1cfda62..53384dd 100644 --- a/portato/backend/portage/system.py +++ b/portato/backend/portage/system.py @@ -20,9 +20,10 @@ from portato.helper import debug, unique_array from portato.backend.system_interface import SystemInterface class PortageSystem (SystemInterface): + """This class provides access to the portage-system.""" def __init__ (self): - + """Constructor.""" self.settings = PortageSettings() portage.WORLD_FILE = self.settings.settings["ROOT"]+portage.WORLD_FILE @@ -138,6 +139,15 @@ class PortageSystem (SystemInterface): return self.geneticize_list(t) def __find_resolved_unresolved (self, list, check): + """Checks a given list and divides it into a "resolved" and an "unresolved" part. + + @param list: list of cpv's + @type list: string[] + @param check: function called to check whether an entry is ok + @type check: function(cpv) + + @returns: the divided list: (resolved, unresolved) + @rtype: (Package[], Package[])""" resolved = [] unresolved = [] for x in list: @@ -242,9 +252,9 @@ class PortageSystem (SystemInterface): if len(inst) > 1: myslots = set() for i in inst: # get the slots of the installed packages - myslots.add(i.get_env_var("SLOT")) + myslots.add(i.get_package_settings("SLOT")) - myslots.add(self.find_best_match(p).get_env_var("SLOT")) # add the slot of the best package in portage + myslots.add(self.find_best_match(p).get_package_settings("SLOT")) # add the slot of the best package in portage for slot in myslots: new_packages.append(\ self.find_best(\ @@ -297,7 +307,7 @@ class PortageSystem (SystemInterface): else: old = set(p.get_installed_use_flags()) - new = set(p.get_settings("USE").split()) + new = set(p.get_global_settings("USE").split()) if new_iuse.intersection(new) != old_iuse.intersection(old): tempDeep = True |