summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apt/package.py24
-rw-r--r--debian/changelog1
2 files changed, 20 insertions, 5 deletions
diff --git a/apt/package.py b/apt/package.py
index 9749da52..1d2f6ace 100644
--- a/apt/package.py
+++ b/apt/package.py
@@ -215,12 +215,26 @@ class Package(object):
installedSize = property(installedSize)
# canidate origin
+ class Origin:
+ def __init__(self,pkg):
+ ver = pkg._depcache.GetCandidateVer(pkg._pkg)
+ if not ver:
+ return None
+ (VerFileIter,index) = ver.FileList.pop()
+ #print len(VerFileIter)
+ #print VerFileIter
+ #return VerFileIter.Component
+ self.component = VerFileIter.Component
+ self.archive = VerFileIter.Archive
+ self.origin = VerFileIter.Origin
+ self.label = VerFileIter.Label
+ self.site = VerFileIter.Site
+ def __str__(self):
+ return "%s %s %s %s %s" % (self.component, self.archive,
+ self.origin, self.label, self.site)
+
def candidateOrigin(self):
- ver = self._depcache.GetCandidateVer(self._pkg)
- (VerFileIter,index) = ver.FileList.pop()
- print len(VerFileIter)
- print VerFileIter
- return VerFileIter.Component
+ return self.Origin(self)
candidateOrigin = property(candidateOrigin)
# depcache actions
diff --git a/debian/changelog b/debian/changelog
index 51041924..1eb5022a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
python-apt (0.6.14.1) unstable; urgency=low
* fix a invalid return from cache.commit(), fail if a download failed
+ * apt.Package.candidateOrigin returns a class now
-- Michael Vogt <michael.vogt@ubuntu.com> Thu, 17 Nov 2005 13:00:14 +0100