diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2013-05-11 10:10:07 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2013-05-16 11:43:46 +0200 |
| commit | 27cc55ee824913aa3687cc3adf91d96e89bd27d0 (patch) | |
| tree | cd38a1519f8b6b6472fcd5bb1cc5c965fc4476ab | |
| parent | 97844726f013c8c1b5d71bdf15c0ad0e02512ee9 (diff) | |
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.
| -rw-r--r-- | apt-pkg/indexcopy.cc | 12 | ||||
| -rw-r--r-- | apt-pkg/indexcopy.h | 10 | ||||
| -rw-r--r-- | debian/changelog | 9 |
3 files changed, 23 insertions, 8 deletions
diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc index a262ef789..0e36b3ded 100644 --- a/apt-pkg/indexcopy.cc +++ b/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) { diff --git a/apt-pkg/indexcopy.h b/apt-pkg/indexcopy.h index aa221158e..e6a07a887 100644 --- a/apt-pkg/indexcopy.h +++ b/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); }; /*}}}*/ diff --git a/debian/changelog b/debian/changelog index d5ae8448b..6ccbd37c4 100644 --- a/debian/changelog +++ b/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 ] |