Permalink
Please sign in to comment.
Browse files
aptcc: Compile with APT 1.1
The latest APT is currently in Debian experimental, but will soon enter unstable. We do not preserve backwards compatibility here - there is already too much cruft in the code, and every bit of that which we can get rid off is worth it.
- Loading branch information...
Showing
with
26 additions
and 149 deletions.
- +2 −4 backends/aptcc/Makefile.am
- +0 −2 backends/aptcc/acqpkitstatus.cpp
- +8 −1 backends/aptcc/acqpkitstatus.h
- +0 −1 backends/aptcc/apt-intf.cpp
- +2 −3 backends/aptcc/apt-utils.cpp
- +1 −3 backends/aptcc/apt-utils.h
- +6 −1 backends/aptcc/deb-file.cpp
- +0 −67 backends/aptcc/pkg_acqfile.cpp
- +0 −58 backends/aptcc/pkg_acqfile.h
- +7 −9 configure.ac
| @@ -1,67 +0,0 @@ | ||
| -/* pkg_acqfile.cpp | ||
| - * | ||
| - * Copyright (c) 2002, 2005 Daniel Burrows | ||
| - * Copyright (c) 2009 Daniel Nicoletti <dantti12@gmail.com> | ||
| - * 2012 Matthias Klumpp <matthias@tenstral.net> | ||
| - * | ||
| - * This program is free software; you can redistribute it and/or modify | ||
| - * it under the terms of the GNU General Public License as published by | ||
| - * the Free Software Foundation; either version 2 of the License, or | ||
| - * (at your option) any later version. | ||
| - * | ||
| - * This program is distributed in the hope that it will be useful, | ||
| - * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| - * GNU General Public License for more details. | ||
| - * | ||
| - * You should have received a copy of the GNU General Public License | ||
| - * along with this program; see the file COPYING. If not, write to | ||
| - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
| - * Boston, MA 02111-1307, USA. | ||
| - */ | ||
| - | ||
| -// (based on pkg_changelog) | ||
| - | ||
| -#include "pkg_acqfile.h" | ||
| - | ||
| -#ifdef HAVE_CONFIG_H | ||
| -#include <config.h> | ||
| -#endif | ||
| - | ||
| -#include <apt-pkg/configuration.h> | ||
| - | ||
| -// Let's all sing a song about apt-pkg's brokenness.. | ||
| - | ||
| -pkgAcqFileSane::pkgAcqFileSane(pkgAcquire *Owner, string URI, | ||
| - string Description, string ShortDesc, | ||
| - string filename) : | ||
| - Item(Owner) | ||
| -{ | ||
| - Retries=_config->FindI("Acquire::Retries",0); | ||
| - DestFile=filename; | ||
| - | ||
| - Desc.URI=URI; | ||
| - Desc.Description=Description; | ||
| - Desc.Owner=this; | ||
| - Desc.ShortDesc=ShortDesc; | ||
| - | ||
| - QueueURI(Desc); | ||
| -} | ||
| - | ||
| -// Straight from acquire-item.cc | ||
| -/* Here we try other sources */ | ||
| -void pkgAcqFileSane::Failed(string Message,pkgAcquire::MethodConfig *Cnf) | ||
| -{ | ||
| - ErrorText = LookupTag(Message,"Message"); | ||
| - | ||
| - // This is the retry counter | ||
| - if (Retries != 0 && | ||
| - Cnf->LocalOnly == false && | ||
| - StringToBool(LookupTag(Message,"Transient-Failure"),false) == true) { | ||
| - Retries--; | ||
| - QueueURI(Desc); | ||
| - return; | ||
| - } | ||
| - | ||
| - Item::Failed(Message,Cnf); | ||
| -} |
| @@ -1,58 +0,0 @@ | ||
| -/* pkg_acqfile.h | ||
| - * | ||
| - * Copyright (c) 2002, 2005 Daniel Burrows | ||
| - * Copyright (c) 2009 Daniel Nicoletti <dantti@gmail.com> | ||
| - * 2012 Matthias Klumpp <matthias@tenstral.net> | ||
| - * | ||
| - * This program is free software; you can redistribute it and/or modify | ||
| - * it under the terms of the GNU General Public License as published by | ||
| - * the Free Software Foundation; either version 2 of the License, or | ||
| - * (at your option) any later version. | ||
| - * | ||
| - * This program is distributed in the hope that it will be useful, | ||
| - * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| - * GNU General Public License for more details. | ||
| - * | ||
| - * You should have received a copy of the GNU General Public License | ||
| - * along with this program; see the file COPYING. If not, write to | ||
| - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
| - * Boston, MA 02111-1307, USA. | ||
| - */ | ||
| - | ||
| -#ifndef PKG_ACQFILE_H | ||
| -#define PKG_ACQFILE_H | ||
| - | ||
| -#include <apt-pkg/acquire-item.h> | ||
| - | ||
| -/** \file pkg_acqfile.h | ||
| - */ | ||
| - | ||
| -class pkgAcqFileSane : public pkgAcquire::Item | ||
| - // This is frustrating: pkgAcqFile is **almost** good enough, but has some | ||
| - // hardcoded stuff that makes it not quite work. | ||
| - // | ||
| - // Based heavily on that class, though. | ||
| -{ | ||
| - pkgAcquire::ItemDesc Desc; | ||
| - string Md5Hash; | ||
| - unsigned int Retries; | ||
| - | ||
| -public: | ||
| - pkgAcqFileSane(pkgAcquire *Owner, string URI, | ||
| - string Description, string ShortDesc, string filename); | ||
| - | ||
| - void Failed(string Message, pkgAcquire::MethodConfig *Cnf); | ||
| - string MD5Sum() {return Md5Hash;} | ||
| - string DescURI() {return Desc.URI;} | ||
| - virtual ~pkgAcqFileSane() {} | ||
| -}; | ||
| - | ||
| -class pkgAcqArchiveSane : public pkgAcqArchive | ||
| -{ | ||
| -public: | ||
| - // This is insane the version is protected | ||
| - pkgCache::VerIterator version() { return Version; } | ||
| -}; | ||
| - | ||
| -#endif |
16
configure.ac
0 comments on commit
30bfee4