diff options
Diffstat (limited to 'portato/backend')
| -rw-r--r-- | portato/backend/flags.py | 2 | ||||
| -rw-r--r-- | portato/backend/portage/package.py | 4 | ||||
| -rw-r--r-- | portato/backend/portage/system_22.py | 8 | ||||
| -rw-r--r-- | portato/backend/system_interface.py | 4 |
4 files changed, 14 insertions, 4 deletions
diff --git a/portato/backend/flags.py b/portato/backend/flags.py index 51e5289..9c5b93d 100644 --- a/portato/backend/flags.py +++ b/portato/backend/flags.py @@ -115,7 +115,7 @@ def get_data(pkg, path): flags = [] for line in grep(pkg, path): - file, line, fl = line.split(":") # get file, line and flag-list + file, line, fl = line.split(":", 2) # get file, line and flag-list fl = fl.split() crit = fl[0] fl = fl[1:] diff --git a/portato/backend/portage/package.py b/portato/backend/portage/package.py index 502ee2b..2b40e41 100644 --- a/portato/backend/portage/package.py +++ b/portato/backend/portage/package.py @@ -308,4 +308,6 @@ class PortagePackage (Package): return portage.pkgcmp(v1[1:],v2[1:]) def matches (self, criterion): - return system.cpv_matches(self.get_cpv(), criterion) + # cpv_matches needs explicit slot info + scpv = "%s:%s" % (self.get_cpv(), self.get_package_settings("SLOT")) + return system.cpv_matches(scpv, criterion) diff --git a/portato/backend/portage/system_22.py b/portato/backend/portage/system_22.py index d720a06..f69e15c 100644 --- a/portato/backend/portage/system_22.py +++ b/portato/backend/portage/system_22.py @@ -63,3 +63,11 @@ class PortageSystem_22 (PortageSystem): def new_package (self, cpv): return PortagePackage_22(cpv) + + def get_config_path (self): + path = PortageSystem.get_config_path(self) + + if path[0] != "/": + return os.path.join(self.settings.settings["ROOT"], path) + else: + return path diff --git a/portato/backend/system_interface.py b/portato/backend/system_interface.py index 43de1ec..be79de2 100644 --- a/portato/backend/system_interface.py +++ b/portato/backend/system_interface.py @@ -108,8 +108,8 @@ class SystemInterface (object): @param key: the key to look for @type key: string - @param all: the package set to use - @type all: string + @param pkgSet: the package set to use + @type pkgSet: string @param masked: if True, also look for masked packages @type masked: boolean @param with_version: if True, return CPVs - else CP |