diff options
author | René 'Necoro' Neumann <necoro@necoro.net> | 2010-04-11 00:12:25 +0200 |
---|---|---|
committer | René 'Necoro' Neumann <necoro@necoro.net> | 2010-04-11 00:12:25 +0200 |
commit | 3c52ca58438e77d791a5cd5a2e3e0427445e93c2 (patch) | |
tree | 4c9831793ed004a2cc13cab5ac0d248613f552ad /portato/backend | |
parent | 867f1e0b8a8401a82a96daaa998202cc2adcc07f (diff) | |
download | portato-3c52ca58438e77d791a5cd5a2e3e0427445e93c2.tar.gz portato-3c52ca58438e77d791a5cd5a2e3e0427445e93c2.tar.bz2 portato-3c52ca58438e77d791a5cd5a2e3e0427445e93c2.zip |
Fix the stuff merged in from atom
Diffstat (limited to '')
-rw-r--r-- | portato/backend/package.py | 4 | ||||
-rw-r--r-- | portato/backend/portage/package.py | 2 | ||||
-rw-r--r-- | portato/backend/portage/system.py | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/portato/backend/package.py b/portato/backend/package.py index 56b910d..f86ee13 100644 --- a/portato/backend/package.py +++ b/portato/backend/package.py @@ -155,7 +155,7 @@ class Package (_Package): @returns: category/package. @rtype: string""" - return "/".join(self.get_category(), self.get_name()) + return "/".join((self.get_category(), self.get_name())) def get_slot (self): """Returns the slot. @@ -174,7 +174,7 @@ class Package (_Package): @returns: cp:slot @rtype: string""" - return ":".join(self.get_cp(), self.get_slot()) + return ":".join((self.get_cp(), self.get_slot())) def get_package_path(self): """Returns the path to where the ChangeLog, Manifest, .ebuild files reside. diff --git a/portato/backend/portage/package.py b/portato/backend/portage/package.py index 7dbefb7..59ebe1e 100644 --- a/portato/backend/portage/package.py +++ b/portato/backend/portage/package.py @@ -299,5 +299,5 @@ class PortagePackage (Package): def matches (self, criterion): # cpv_matches needs explicit slot info - scpv = ":".join(self.get_cpv(), self.get_slot()) + scpv = ":".join((self.get_cpv(), self.get_slot())) return system.cpv_matches(scpv, criterion) diff --git a/portato/backend/portage/system.py b/portato/backend/portage/system.py index 34d2b5c..b882237 100644 --- a/portato/backend/portage/system.py +++ b/portato/backend/portage/system.py @@ -213,6 +213,8 @@ class PortageSystem (SystemInterface): if (not only_cpv) and with_version: result = map(self.new_package, result) + else: + result = list(result) return result |