* 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)

diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h
index cb8e0cd94eef786d852e333c0f6027f6fbfa5f2d..d8fde81e6383e1e63a14d29012c8f4873c116386 100644 (file)
--- a/apt-pkg/cacheiterators.h
+++ b/apt-pkg/cacheiterators.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- 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
 /* ######################################################################
    
    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 *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;};
    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 dd5344ec5a8e575cba94241c09639e937a58e6c3..d282f93494816c5ec6383e0d2e3a749167c198d5 100644 (file)
--- 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
     - 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)

 
  --
 
 
  --