summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cmdline/apt-get.cc26
-rw-r--r--debian/changelog1
-rw-r--r--doc/apt.conf.5.yo7
3 files changed, 22 insertions, 12 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 99e41cb5e..4933e38a7 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: apt-get.cc,v 1.90 1999/11/26 00:05:55 jgg Exp $
+// $Id: apt-get.cc,v 1.91 1999/11/28 01:03:28 jgg Exp $
/* ######################################################################
apt-get - Cover for dpkg
@@ -617,6 +617,15 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true,bool Saftey =
c1out << SizeToStr(DebBytes) << 'B';
c1out << " of archives. After unpacking ";
+
+ // Size delta
+ if (Cache->UsrSize() >= 0)
+ c1out << SizeToStr(Cache->UsrSize()) << "B will be used." << endl;
+ else
+ c1out << SizeToStr(-1*Cache->UsrSize()) << "B will be freed." << endl;
+
+ if (_error->PendingError() == true)
+ return false;
// Check for enough free space
struct statfs Buf;
@@ -627,15 +636,6 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true,bool Saftey =
if (unsigned(Buf.f_bfree) < (FetchBytes - FetchPBytes)/Buf.f_bsize)
return _error->Error("Sorry, you don't have enough free space in %s to hold all the .debs.",
OutputDir.c_str());
-
- // Size delta
- if (Cache->UsrSize() >= 0)
- c1out << SizeToStr(Cache->UsrSize()) << "B will be used." << endl;
- else
- c1out << SizeToStr(-1*Cache->UsrSize()) << "B will be freed." << endl;
-
- if (_error->PendingError() == true)
- return false;
// Fail safe check
if (_config->FindI("quiet",0) >= 2 ||
@@ -779,7 +779,7 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache,
Pkg.ProvidesList()->NextProvides == 0)
{
pkgCache::PkgIterator Tmp = Pkg.ProvidesList().OwnerPkg();
- c1out << "Note, installing " << Tmp.Name() << " instead of " << Pkg.Name() << endl;
+ c1out << "Note, selecting " << Tmp.Name() << " instead of " << Pkg.Name() << endl;
Pkg = Tmp;
}
@@ -795,7 +795,11 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache,
// Check if there is something at all to install
pkgDepCache::StateCache &State = Cache[Pkg];
if (Remove == true && Pkg->CurrentVer == 0)
+ {
+ if (AllowFail == false)
+ return false;
return _error->Error("Package %s is not installed",Pkg.Name());
+ }
if (State.CandidateVer == 0 && Remove == false)
{
diff --git a/debian/changelog b/debian/changelog
index 38633457d..6733108d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ apt (0.3.14.1) unstable; urgency=low
* Problem with Protected packages and the new OR code.
* /usr/share/doc stuff. Closes: #51017, #50228, #51141
* Remove doesn't require a package to be installable. Closes: #51175
+ * FTP proxy touch ups in the mabn page. Closes: #51315, #51314
-- Ben Gertzfield <che@debian.org> Sun, 7 Nov 1999 20:21:25 -0800
diff --git a/doc/apt.conf.5.yo b/doc/apt.conf.5.yo
index 212ac05ec..c9a116d45 100644
--- a/doc/apt.conf.5.yo
+++ b/doc/apt.conf.5.yo
@@ -137,7 +137,7 @@ outstanding requests APT should send.
dit(bf(ftp))
FTP URis; ftp::Proxy is the default proxy server to use. It is in the
-standard form of em(http://[[user][:pass]@]host[:port]/) and is overriden
+standard form of em(ftp://[[user][:pass]@]host[:port]/) and is overriden
by the ftp_proxy environment variable. To use a ftp proxy you will have to
set the ftp::ProxyLogin script in the configuration file. This entry
specifies the commands to send to tell the proxy server what to connect
@@ -152,6 +152,11 @@ situations require that passive mode be disabled and port mode ftp used
instead. This can be done globally, for connections that go through a proxy
or for a specific host (See the sample config file for examples)
+It is possible to proxy FTP over HTTP by setting the em(ftp_proxy)
+environment variable to a http url - see the discussion of the http method
+above for syntax. You cannot set this in the configuration file and it is
+not recommended to use FTP over HTTP due to its low efficiency.
+
dit(bf(cdrom))
CDROM URIs; the only setting for CDROM URIs is the mount point, cdrom::Mount
which must be the mount point for the CDROM drive as specified in /etc/fstab.