summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArch Librarian <arch@canonical.com>2004-09-20 17:03:55 +0000
committerArch Librarian <arch@canonical.com>2004-09-20 17:03:55 +0000
commita2ec6097a7ffb06fe23f329def4dd0f20125564b (patch)
treec7e36c110e2abdf4b4a6c811627b61c3216eadf2
parentf1813c1ac9924dc6be7dd2b64e019a98340125f6 (diff)
* Patch from Koblinger Egmont <egmont@uhulinux.hu> to fix
Author: mdz Date: 2003-10-09 23:15:25 GMT * Patch from Koblinger Egmont <egmont@uhulinux.hu> to fix pkgCache::PkgFileIterator::Label() to correcctly refer to File->Label rather than File->Origin (Closes: #213311)
-rw-r--r--apt-pkg/cacheiterators.h4
-rw-r--r--debian/changelog3
2 files changed, 5 insertions, 2 deletions
diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h
index cb8e0cd94..d8fde81e6 100644
--- a/apt-pkg/cacheiterators.h
+++ b/apt-pkg/cacheiterators.h
@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: cacheiterators.h,v 1.17 2001/04/29 05:13:51 jgg Exp $
+// $Id: cacheiterators.h,v 1.18 2003/10/09 23:15:25 mdz Exp $
/* ######################################################################
Cache Iterators - Iterators for navigating the cache structure
@@ -289,7 +289,7 @@ class pkgCache::PkgFileIterator
inline const char *Component() const {return File->Component == 0?0:Owner->StrP + File->Component;};
inline const char *Version() const {return File->Version == 0?0:Owner->StrP + File->Version;};
inline const char *Origin() const {return File->Origin == 0?0:Owner->StrP + File->Origin;};
- inline const char *Label() const {return File->Origin == 0?0:Owner->StrP + File->Label;};
+ inline const char *Label() const {return File->Label == 0?0:Owner->StrP + File->Label;};
inline const char *Site() const {return File->Site == 0?0:Owner->StrP + File->Site;};
inline const char *Architecture() const {return File->Architecture == 0?0:Owner->StrP + File->Architecture;};
inline const char *IndexType() const {return File->IndexType == 0?0:Owner->StrP + File->IndexType;};
diff --git a/debian/changelog b/debian/changelog
index dd5344ec5..d282f9349 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ apt (0.5.15) unstable; urgency=low
- apt.es.8 wasn't included in the patch, but was referenced. Fetched
version 1.3 from debian-doc cvs
- Create doc/es/.cvsignore
+ * Patch from Koblinger Egmont <egmont@uhulinux.hu> to fix
+ pkgCache::PkgFileIterator::Label() to correcctly refer to File->Label
+ rather than File->Origin (Closes: #213311)
--