You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
57 lines
1.6 KiB
57 lines
1.6 KiB
12 years ago
|
From 553961c332e9a588da9085228f297767d47884e2 Mon Sep 17 00:00:00 2001
|
||
|
From: Brian Harring <ferringb@gmail.com>
|
||
|
Date: Sun, 14 Oct 2012 15:03:39 -0700
|
||
|
Subject: [PATCH] Fix pkgcore support for >0.8.
|
||
|
|
||
|
---
|
||
|
gentoopm/pkgcorepm/__init__.py | 7 +++++--
|
||
|
gentoopm/pkgcorepm/repo.py | 8 ++++++--
|
||
|
2 files changed, 11 insertions(+), 4 deletions(-)
|
||
|
|
||
|
diff --git a/gentoopm/pkgcorepm/__init__.py b/gentoopm/pkgcorepm/__init__.py
|
||
|
index aa117a0..1071e49 100644
|
||
|
--- a/gentoopm/pkgcorepm/__init__.py
|
||
|
+++ b/gentoopm/pkgcorepm/__init__.py
|
||
|
@@ -33,8 +33,11 @@ class PkgCorePM(PackageManager):
|
||
|
|
||
|
@property
|
||
|
def installed(self):
|
||
|
- return PkgCoreInstalledRepo(self._domain.named_repos['vdb'],
|
||
|
- self._domain)
|
||
|
+ if hasattr(self._domain, 'repos_raw'):
|
||
|
+ repos = self._domain.repos_raw
|
||
|
+ else:
|
||
|
+ repos = self._domain.named_repos
|
||
|
+ return PkgCoreInstalledRepo(repos['vdb'], self._domain)
|
||
|
|
||
|
@property
|
||
|
def Atom(self):
|
||
|
diff --git a/gentoopm/pkgcorepm/repo.py b/gentoopm/pkgcorepm/repo.py
|
||
|
index dc43148..d3bacf9 100644
|
||
|
--- a/gentoopm/pkgcorepm/repo.py
|
||
|
+++ b/gentoopm/pkgcorepm/repo.py
|
||
|
@@ -18,14 +18,18 @@ from .filter import transform_filters
|
||
|
|
||
|
class PkgCoreRepoDict(PMRepositoryDict):
|
||
|
def __iter__(self):
|
||
|
+ if hasattr(self._domain, 'repos_raw'):
|
||
|
+ trees = self._domain.repos_raw
|
||
|
+ else:
|
||
|
+ trees = self._domain.named_repos
|
||
|
try:
|
||
|
- trees = self._domain.named_repos['repo-stack'].trees
|
||
|
+ trees = trees['repo-stack'].trees
|
||
|
except KeyError: # pkgcore-0.7.5+
|
||
|
def _match_ebuild_repos(x):
|
||
|
return isinstance(x, UnconfiguredTree)
|
||
|
|
||
|
trees = filter(_match_ebuild_repos,
|
||
|
- self._domain.named_repos.values())
|
||
|
+ trees.values())
|
||
|
rev = -1
|
||
|
else:
|
||
|
rev = 1
|
||
|
--
|
||
|
1.7.12
|
||
|
|