[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/sysadmin/libqapt/src
From:       Jonathan Michael Thomas <echidnaman () kubuntu ! org>
Date:       2011-01-06 18:10:34
Message-ID: 20110106181034.AA600AC8B0 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1212370 by jmthomas:

pkgDepCache::GetCandidateVer() should be more robust against failure than using a CandidateVerIter
BUG:262262
FIXED-IN:1.1.0


 M  +13 -13    package.cpp  


--- trunk/extragear/sysadmin/libqapt/src/package.cpp #1212369:1212370
@@ -170,7 +170,7 @@
 QString Package::sourcePackage() const
 {
     QString sourcePackage;
-    const pkgCache::VerIterator &ver = (*d->depCache)[*d->packageIter].CandidateVerIter(*d->depCache);
+    const pkgCache::VerIterator &ver = (*d->depCache).GetCandidateVer(*d->packageIter);
     if (!ver.end()) {
         pkgRecords::Parser &rec = d->records->Lookup(ver.FileList());
         sourcePackage = QLatin1String(rec.SourcePkg().c_str());
@@ -187,7 +187,7 @@
 QString Package::shortDescription() const
 {
     QString shortDescription;
-    const pkgCache::VerIterator &ver = (*d->depCache)[*d->packageIter].CandidateVerIter(*d->depCache);
+    const pkgCache::VerIterator &ver = (*d->depCache).GetCandidateVer(*d->packageIter);
     if (!ver.end()) {
         pkgCache::DescIterator Desc = ver.TranslatedDescription();
         pkgRecords::Parser & parser = d->records->Lookup(Desc.FileList());
@@ -200,7 +200,7 @@
 
 QString Package::longDescription() const
 {
-    const pkgCache::VerIterator &ver = (*d->depCache)[*d->packageIter].CandidateVerIter(*d->depCache);
+    const pkgCache::VerIterator &ver = (*d->depCache).GetCandidateVer(*d->packageIter);
 
     if (!ver.end()) {
         QString rawDescription;
@@ -244,7 +244,7 @@
 QString Package::maintainer() const
 {
     QString maintainer;
-    const pkgCache::VerIterator &ver = (*d->depCache)[*d->packageIter].CandidateVerIter(*d->depCache);
+    const pkgCache::VerIterator &ver = (*d->depCache).GetCandidateVer(*d->packageIter);
     if (!ver.end()) {
         pkgRecords::Parser &parser = d->records->Lookup(ver.FileList());
         maintainer = QString::fromUtf8(parser.Maintainer().data());
@@ -256,7 +256,7 @@
 QString Package::homepage() const
 {
     QString homepage;
-    const pkgCache::VerIterator &ver = (*d->depCache)[*d->packageIter].CandidateVerIter(*d->depCache);
+    const pkgCache::VerIterator &ver = (*d->depCache).GetCandidateVer(*d->packageIter);
     if (!ver.end()) {
         pkgRecords::Parser &parser = d->records->Lookup(ver.FileList());
         homepage = QString::fromUtf8(parser.Homepage().data());
@@ -324,7 +324,7 @@
 
 QString Package::priority() const
 {
-    const pkgCache::VerIterator &ver = (*d->depCache)[*d->packageIter].CandidateVerIter(*d->depCache);
+    const pkgCache::VerIterator &ver = (*d->depCache).GetCandidateVer(*d->packageIter);
     if (!ver) {
         return QLatin1String(ver.PriorityType());
     } else {
@@ -369,7 +369,7 @@
 
 QString Package::origin() const
 {
-    const pkgCache::VerIterator &Ver = (*d->depCache)[*d->packageIter].CandidateVerIter(*d->depCache);
+    const pkgCache::VerIterator &Ver = (*d->depCache).GetCandidateVer(*d->packageIter);
 
     if(!Ver.end()) {
          pkgCache::VerFileIterator VF = Ver.FileList();
@@ -504,7 +504,7 @@
 QString Package::controlField(const QLatin1String &name) const
 {
     QString field;
-    const pkgCache::VerIterator &ver = (*d->depCache)[*d->packageIter].CandidateVerIter(*d->depCache);
+    const pkgCache::VerIterator &ver = (*d->depCache).GetCandidateVer(*d->packageIter);
     if (ver.end()) {
         return field;
     }
@@ -767,7 +767,7 @@
 {
     QStringList recommends;
 
-    const pkgCache::VerIterator &Ver = (*d->depCache)[*d->packageIter].CandidateVerIter(*d->depCache);
+    const pkgCache::VerIterator &Ver = (*d->depCache).GetCandidateVer(*d->packageIter);
 
     if (Ver.end()) {
         return recommends;
@@ -793,7 +793,7 @@
 {
     QStringList suggests;
 
-    const pkgCache::VerIterator &Ver = (*d->depCache)[*d->packageIter].CandidateVerIter(*d->depCache);
+    const pkgCache::VerIterator &Ver = (*d->depCache).GetCandidateVer(*d->packageIter);
 
     if (Ver.end()) {
         return suggests;
@@ -819,7 +819,7 @@
 {
     QStringList enhances;
 
-    const pkgCache::VerIterator &Ver = (*d->depCache)[*d->packageIter].CandidateVerIter(*d->depCache);
+    const pkgCache::VerIterator &Ver = (*d->depCache).GetCandidateVer(*d->packageIter);
 
     if (Ver.end()) {
         return enhances;
@@ -857,7 +857,7 @@
 
 QHash<int, QHash<QString, QVariantMap> > Package::brokenReason() const
 {
-    const pkgCache::VerIterator &Ver = (*d->depCache)[*d->packageIter].CandidateVerIter(*d->depCache);
+    const pkgCache::VerIterator &Ver = (*d->depCache).GetCandidateVer(*d->packageIter);
 
     QHash<QString, QVariantMap> notInstallable;
     QHash<QString, QVariantMap> wrongCandidate;
@@ -962,7 +962,7 @@
 
 bool Package::isTrusted() const
 {
-    const pkgCache::VerIterator &Ver = (*d->depCache)[*d->packageIter].CandidateVerIter(*d->depCache);
+    const pkgCache::VerIterator &Ver = (*d->depCache).GetCandidateVer(*d->packageIter);
     if (!Ver) {
         return false;
     }
[prev in list] [next in list] [prev in thread] [next in thread]