regex for package names executed on Grp- not PkgIterator

diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h
index 6765d3e7c79ef57b67bac7f9ed4c0ea1c362e07c..72b9b5d4d9782716db7f5810ce2a56b67033484b 100644 (file)
--- a/apt-pkg/depcache.h
+++ b/apt-pkg/depcache.h
@@ -331,6 +331,7 @@ class pkgDepCache : protected pkgCache::Namespace
    // Legacy.. We look like a pkgCache
    inline operator pkgCache &() {return *Cache;};
    inline Header &Head() {return *Cache->HeaderP;};
    // Legacy.. We look like a pkgCache
    inline operator pkgCache &() {return *Cache;};
    inline Header &Head() {return *Cache->HeaderP;};

+   inline GrpIterator GrpBegin() {return Cache->GrpBegin();};

    inline PkgIterator PkgBegin() {return Cache->PkgBegin();};
    inline GrpIterator FindGrp(string const &Name) {return Cache->FindGrp(Name);};
    inline PkgIterator FindPkg(string const &Name) {return Cache->FindPkg(Name);};
    inline PkgIterator PkgBegin() {return Cache->PkgBegin();};
    inline GrpIterator FindGrp(string const &Name) {return Cache->FindGrp(Name);};
    inline PkgIterator FindPkg(string const &Name) {return Cache->FindPkg(Name);};

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 7c42e672dd2a0b942c3d9f2f67b93cb2750c1186..52cbce945cc79abce8cd4cad473873de0d0ff887 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1772,11 +1772,14 @@ bool DoInstall(CommandLine &CmdL)
         
            // Run over the matches
            bool Hit = false;
         
            // Run over the matches
            bool Hit = false;

-           for (Pkg = Cache->PkgBegin(); Pkg.end() == false; Pkg++)
+           for (pkgCache::GrpIterator Grp = Cache->GrpBegin(); Grp.end() == false; ++Grp)

            {
            {

-              if (regexec(&Pattern,Pkg.Name(),0,0,0) != 0)
+              if (regexec(&Pattern,Grp.Name(),0,0,0) != 0)

                  continue;
                  continue;

-           
+              Pkg = Grp.FindPkg("native");
+              if (unlikely(Pkg.end() == true))
+                 continue;
+

               ioprintf(c1out,_("Note, selecting %s for regex '%s'\n"),
                        Pkg.Name(),S);
            
               ioprintf(c1out,_("Note, selecting %s for regex '%s'\n"),
                        Pkg.Name(),S);
            

diff --git a/debian/changelog b/debian/changelog
index 4cdbd4d93f395a2fb12f75ed43910e298b2acfde..6cf067952eac280d84966b2d6835528aa119d35a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ apt (0.7.26~exp4) experimental; urgency=low
     - remove the lock file handling and let Acquire take care of it instead
     - display MD5Sum in --print-uris if not forced to use another method
       instead of displaying the strongest available (Closes: #576420)
     - remove the lock file handling and let Acquire take care of it instead
     - display MD5Sum in --print-uris if not forced to use another method
       instead of displaying the strongest available (Closes: #576420)

+    - regex for package names executed on Grp- not PkgIterator

 
  -- David Kalnischkies <kalnischkies@gmail.com>  Sat, 03 Apr 2010 14:58:39 +0200
 
 
  -- David Kalnischkies <kalnischkies@gmail.com>  Sat, 03 Apr 2010 14:58:39 +0200