Sophie

Sophie

distrib > Mageia > 3 > i586 > media > core-release-src > by-pkgid > 067f3d061c24bfda3b85d1d8bfbfb9bf > files > 6

apt-0.5.15lorg3.94-9.mga3.src.rpm

diff -p -up apt-0.5.15lorg3.94pt/apt-pkg/rpm/rpmhandler.cc.dbapi apt-0.5.15lorg3.94pt/apt-pkg/rpm/rpmhandler.cc
--- apt-0.5.15lorg3.94pt/apt-pkg/rpm/rpmhandler.cc.dbapi	2012-02-05 03:33:08.330926717 +0100
+++ apt-0.5.15lorg3.94pt/apt-pkg/rpm/rpmhandler.cc	2012-02-05 14:42:41.641870992 +0100
@@ -854,19 +854,14 @@ RPMDBHandler::~RPMDBHandler()
 
 string RPMDBHandler::DataPath(bool DirectoryOnly)
 {
-   string File = "packages.rpm";
    char *tmp = (char *) rpmExpand("%{_dbpath}", NULL);
    string DBPath(_config->Find("RPM::RootDir")+tmp);
    free(tmp);
 
-#if RPM_VERSION >= 0x040000
-   if (rpmExpandNumeric("%{_dbapi}") >= 3)
-      File = "Packages";
-#endif
    if (DirectoryOnly == true)
        return DBPath;
    else
-       return DBPath+"/"+File;
+       return DBPath+"/Packages";
 }
 
 bool RPMDBHandler::Skip()