Browse Source

non-inline RunGPGV methods to restore ABI compatibility with previous versions to fix partial upgrades (Closes: #707771)

The rename in 0.9.7.9~exp2 moved the method body to the class definition
which means it became inline, which isn't ABI compatibile. The reverse of
moving inline to non-inline is safe though.
debian/1.8.y
David Kalnischkies 9 years ago
committed by Michael Vogt
parent
commit
27cc55ee82
  1. 12
      apt-pkg/indexcopy.cc
  2. 10
      apt-pkg/indexcopy.h
  3. 9
      debian/changelog

12
apt-pkg/indexcopy.cc

@ -642,6 +642,18 @@ bool SigVerify::CopyAndVerify(string CDROM,string Name,vector<string> &SigList,
return true;
}
/*}}}*/
// SigVerify::RunGPGV - deprecated wrapper calling ExecGPGV /*{{{*/
bool SigVerify::RunGPGV(std::string const &File, std::string const &FileOut,
int const &statusfd, int fd[2]) {
ExecGPGV(File, FileOut, statusfd, fd);
return false;
};
bool SigVerify::RunGPGV(std::string const &File, std::string const &FileOut,
int const &statusfd) {
ExecGPGV(File, FileOut, statusfd);
return false;
};
/*}}}*/
bool TranslationsCopy::CopyTranslations(string CDROM,string Name, /*{{{*/
vector<string> &List, pkgCdromStatus *log)
{

10
apt-pkg/indexcopy.h

@ -100,15 +100,9 @@ class SigVerify /*{{{*/
std::vector<std::string> PkgList,std::vector<std::string> SrcList);
__deprecated static bool RunGPGV(std::string const &File, std::string const &FileOut,
int const &statusfd, int fd[2]) {
ExecGPGV(File, FileOut, statusfd, fd);
return false;
};
int const &statusfd, int fd[2]);
__deprecated static bool RunGPGV(std::string const &File, std::string const &FileOut,
int const &statusfd = -1) {
ExecGPGV(File, FileOut, statusfd);
return false;
};
int const &statusfd = -1);
};
/*}}}*/

9
debian/changelog

@ -1,3 +1,12 @@
apt (0.9.8.1) UNRELEASED; urgency=low
[ David Kalnischkies ]
* apt-pkg/indexcopy.cc:
- non-inline RunGPGV methods to restore ABI compatibility with previous
versions to fix partial upgrades (Closes: #707771)
-- David Kalnischkies <kalnischkies@gmail.com> Sat, 11 May 2013 09:53:59 +0200
apt (0.9.8) UNRELEASED; urgency=low
[ Ludovico Cavedon ]

Loading…
Cancel
Save