Attachment #10219 for bug #41816

View | Details | Raw Unified | Return to bug 41816
Collapse All | Expand All

Lines 32-37 Link Here

(-)a/apt-pkg/cachefile.cc (+4 lines)
32	#include <apt-pkg/version.h>	32	#include <apt-pkg/version.h>
33		33
34	#include <apti18n.h>	34	#include <apti18n.h>
		35
		36	#include "rpm/rpmindexfile.h"
35	/}}}/	37	/}}}/
36		38
37	// lazyCacheFile::lazyCacheFile - Constructor /{{{/	39	// lazyCacheFile::lazyCacheFile - Constructor /{{{/
Lines 241-246 void pkgCacheFile::RemoveCaches() Link Here
241	const std::string pkgcache = _config->FindFile("Dir::Cache::pkgcache");	243	const std::string pkgcache = _config->FindFile("Dir::Cache::pkgcache");
242	const std::string srcpkgcache = _config->FindFile("Dir::Cache::srcpkgcache");	244	const std::string srcpkgcache = _config->FindFile("Dir::Cache::srcpkgcache");
243		245
		246	removeRepositoryCaches();
		247
244	if ((!pkgcache.empty()) && RealFileExists(pkgcache))	248	if ((!pkgcache.empty()) && RealFileExists(pkgcache))
245	RemoveFile("RemoveCaches", pkgcache);	249	RemoveFile("RemoveCaches", pkgcache);
246	if ((!srcpkgcache.empty()) && RealFileExists(srcpkgcache))	250	if ((!srcpkgcache.empty()) && RealFileExists(srcpkgcache))

Lines 52-57 class pkgRepository Link Here

(-)a/apt-pkg/repository.h (+1 lines)
52	if (Vendor) FingerPrintList = Vendor->FingerPrintList;	52	if (Vendor) FingerPrintList = Vendor->FingerPrintList;
53	}	53	}
54		54
		55	virtual ~pkgRepository() = default;
55	};	56	};
56		57
57	#endif	58	#endif




									/*}}}*/
vector<pkgRepository *> RepList;

void removeRepositoryCaches()
{
   for (auto iter = RepList.begin(); iter != RepList.end(); ++iter)
   {
      delete *iter;
   }

   RepList.clear();
}

// rpmListIndex::Release* - Return the URI to the release file		/*{{{*/
// ---------------------------------------------------------------------
/* */

Lines 23-28 class RPMHandler; Link Here

(-)a/apt-pkg/rpm/rpmindexfile.h (-1 / +2 lines)
23	class RPMDBHandler;	23	class RPMDBHandler;
24	class pkgRepository;	24	class pkgRepository;
25		25
		26	void removeRepositoryCaches();
		27
26	class rpmIndexFile : public pkgIndexFile	28	class rpmIndexFile : public pkgIndexFile
27	{	29	{
28		30
29	-

Return to bug 41816

Lines 34-39 Link Here

(-)a/apt-pkg/rpm/rpmindexfile.cc (+10 lines)
34	/}}}/	34	/}}}/
35	vector<pkgRepository *> RepList;	35	vector<pkgRepository *> RepList;
36		36
		37	void removeRepositoryCaches()
		38	{
		39	for (auto iter = RepList.begin(); iter != RepList.end(); ++iter)
		40	{
		41	delete *iter;
		42	}
		43
		44	RepList.clear();
		45	}
		46
37	// rpmListIndex::Release* - Return the URI to the release file /{{{/	47	// rpmListIndex::Release* - Return the URI to the release file /{{{/
38	// ---------------------------------------------------------------------	48	// ---------------------------------------------------------------------
39	/* */	49	/* */