← Back to branch summary

~ubuntu-branches/ubuntu/quantal/synaptic/quantal

« back to all changes in this revision

Viewing changes to common/rpackagelister.cc

  • Committer: Package Import Robot
  • Author(s): Michael Vogt
  • Date: 2012-03-02 10:20:59 UTC
  • mfrom: (3.3.1 sid)
  • Revision ID: package-import@ubuntu.com-20120302102059-xqqwoqzoque0oyhp
Tags: 0.75.5
https://launchpad.net/bugs/936677
* common/rpackagelister.cc:
  - simplify openCache() code to use more modern std::vector features
    and fix crash along the way (LP: #936677)
* common/sections_trans.cc:
  - add "metapackages", "education", "introspection"
* debian/rules:
  - do not build multiarch support in Debian to make it work on 
    unstable that has no multiarch apt yet

Show diffs side-by-side

added added

removed removed

Lines of Context:
common/rpackagelister.cc
347
347
      delete (*I);
348
348
 
349
349
   int packageCount = deps->Head().PackageCount;
350
 
   _packages.resize(packageCount);
351
 
   _nativeArchPackages.resize(packageCount);
 
350
   _packages.clear();
 
351
   _packages.reserve(packageCount);
 
352
 
 
353
   _nativeArchPackages.clear();
 
354
   _nativeArchPackages.reserve(packageCount);
352
355
 
353
356
   _packagesIndex.clear();
354
357
   _packagesIndex.resize(packageCount, -1);
376
379
 
377
380
      RPackage *pkg = new RPackage(this, deps, _records, I);
378
381
      _packagesIndex[I->ID] = count;
379
 
      _packages[count++] = pkg;
 
382
      _packages.push_back(pkg);
 
383
      count++;
380
384
 
381
385
      // this is what is feed to the views
382
386
      if (showAllMultiArch || !pkg->isMultiArchDuplicate())
412
416
#endif
413
417
   }
414
418
 
415
 
   // Truncate due to virtual packages which were skipped above.
416
 
   _packages.resize(count);
417
 
 
418
419
   // refresh the views
419
420
   for (unsigned int i = 0; i != _views.size(); i++)
420
421
      _views[i]->refresh();