Various minor bug fixes

Author: jgg
Date: 1999-06-24 04:06:30 GMT
Various minor bug fixes

diff --git a/apt-pkg/cachefile.cc b/apt-pkg/cachefile.cc
index 2efa052..d7f3c09 100644 (file)
--- a/apt-pkg/cachefile.cc
+++ b/apt-pkg/cachefile.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: cachefile.cc,v 1.3 1999/05/04 20:09:48 jgg Exp $
+// $Id: cachefile.cc,v 1.4 1999/06/24 04:06:30 jgg Exp $
 /* ######################################################################
    
    CacheFile - Simple wrapper class for opening, generating and whatnot
@@ -65,7 +65,7 @@ bool pkgCacheFile::Open(OpProgress &Progress,bool WithLock)
       if (_error->PendingError() == true)
         return _error->Error("The package lists or status file could not be parsed or opened.");
       if (_error->empty() == false)
-        _error->Warning("You may want to run apt-get update to correct theses missing files");
+        _error->Warning("You may want to run apt-get update to correct these missing files");
       
       // Open the cache file
       FileFd File(_config->FindFile("Dir::Cache::pkgcache"),FileFd::ReadOnly);

diff --git a/apt-pkg/clean.cc b/apt-pkg/clean.cc
index db47b1c..b859e38 100644 (file)
--- a/apt-pkg/clean.cc
+++ b/apt-pkg/clean.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: clean.cc,v 1.1 1999/02/01 08:11:57 jgg Exp $
+// $Id: clean.cc,v 1.2 1999/06/24 04:06:30 jgg Exp $
 /* ######################################################################
 
    Clean - Clean out downloaded directories
@@ -101,7 +101,6 @@ bool pkgArchiveCleaner::Go(string Dir,pkgCache &Cache)
       }
             
       Erase(Dir->d_name,Pkg,Ver,St);
-      unlink(Dir->d_name);
    };
    
    chdir(StartDir.c_str());

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 69e9869..ca93dcd 100644 (file)
--- 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.65 1999/06/13 05:06:40 jgg Exp $
+// $Id: apt-get.cc,v 1.66 1999/06/24 04:06:31 jgg Exp $
 /* ######################################################################
    
    apt-get - Cover for dpkg
@@ -1025,6 +1025,9 @@ class LogCleaner : public pkgArchiveCleaner
    virtual void Erase(const char *File,string Pkg,string Ver,struct stat &St) 
    {
       cout << "Del " << Pkg << " " << Ver << " [" << SizeToStr(St.st_size) << "B]" << endl;
+      
+      if (_config->FindB("APT::Get::Simulate") == false)
+        unlink(File);      
    };
 };
 

diff --git a/debian/changelog b/debian/changelog
index c2f81a6..9acc80e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+apt (0.3.7.1) unstable; urgency=low
+
+  * Spelling error in cachefile.cc. Closes: #39885
+  * Trailing slash in dselect install if you try to use the 
+    default config file. Closes: #40011
+  * Simulate works for autoclean. Closes: #39141
+  * Fixed spelling errors. Closes: #39673
+  
+ -- Ben Gertzfield <che@debian.org>  Sun, 20 Jun 1999 18:36:20 -0700
+
 apt (0.3.7) unstable; urgency=low
 
   * Fixed missing text in the apt-get(8) page. Closes: #37596

diff --git a/doc/apt-get.8.yo b/doc/apt-get.8.yo
index 3b7b909..fb0a05f 100644 (file)
--- a/doc/apt-get.8.yo
+++ b/doc/apt-get.8.yo
@@ -87,7 +87,7 @@ dit(bf(source))
 bf(source) causes apt-get to fetch source packages. APT will examine the
 available packages to decide which source package to fetch. It will then
 find and download into the current directory the newest available version of
-that source package. Source packages are tracked seperately from binary
+that source package. Source packages are tracked separately from binary
 packages via df(deb-src) type lines in the bf(/etc/apt/sources.list) file.
 This probably will mean that you will not get the same source as the package
 you have installed or as you could install. If the --compile options is
@@ -97,7 +97,7 @@ will not be unpacked.
 
 dit(bf(check))
 bf(check) is a diagnostic tool; it updates the package cache and checks for 
-brokenpackages.
+broken packages.
 
 dit(bf(clean))
 bf(clean) clears out the local repository of retrieved package files. It 
@@ -142,7 +142,7 @@ dit(bf(-h, --help))
 Help; display a helpful usage message and exits.
 
 dit(bf(-v, --version))
-Show the program verison.
+Show the program version.
 
 dit(bf(-m, --ignore-missing, --fix-missing))
 Ignore missing packages; If packages cannot be retrieved or fail the    
@@ -156,7 +156,7 @@ force APT to use only the .debs it has already downloaded.
 
 dit(bf(-q, --quiet))
 Quiet; produces output suitable for logging, omitting progress indicators.
-More qs will produce more quiet up to a maximum of 2. You can also use
+More q's will produce more quiet up to a maximum of 2. You can also use
 bf(-q=#) to set the quiet level, overriding the configuration file. Note that
 quiet level 2 implies -y, you should never use -qq without a no-action
 modifier such as -d, --print-uris or -s as APT may decided to do something
@@ -173,8 +173,8 @@ and empty set of square brackets meaning breaks that are of no consequence
 
 dit(bf(-y, --yes, --assume-yes))
 Automatic yes to prompts; assume "yes" as answer to all prompts and run
-non-interactively. If an undesireable situation, such as changing a held
-package or removing an essential package occures then bf(apt-get) will
+non-interactively. If an undesirable situation, such as changing a held
+package or removing an essential package occurs then bf(apt-get) will
 abort. See bf(APT::Get::Assume-Yes).
 
 dit(bf(-u, --show-upgraded))
@@ -186,8 +186,8 @@ Compile source packages after downloading them.
 
 dit(bf(--ignore-hold))
 Ignore package Holds; This causes bf(apt-get) to ignore a hold placed on 
-a package. This may be usefull in conjunction with bf(dist-upgrade) to
-override a large number of undesired holds. See bf(APT::Ingore-Hold).
+a package. This may be useful in conjunction with bf(dist-upgrade) to
+override a large number of undesired holds. See bf(APT::Ignore-Hold).
 
 dit(bf(--no-upgrade))
 Do not upgrade packages; When used in conjunction with bf(install)
@@ -196,7 +196,7 @@ are already installed. See bf(APT::Get::no-upgrade).
 
 dit(bf(--force-yes))
 Force yes; This is a dangerous option that will cause apt to continue without
-prompting if it is doing something potentially harmfull. It should not be used
+prompting if it is doing something potentially harmful. It should not be used
 except in very special situations. Using bf(force-yes) can potentially destroy
 your system! See bf(APT::Get::force-yes).
 
@@ -213,7 +213,7 @@ read the default configuration file and then this configuration file. See
 bf(apt.conf(5)) for syntax information.
 
 dit(bf(-o, --option))
-Set a Configuration Option; This will set an arbitary configuration option.
+Set a Configuration Option; This will set an arbitrary configuration option.
 The syntax is 
 verb(-o Foo::Bar=bar)
 enddit()

diff --git a/dselect/install b/dselect/install
index 6cf5dcf..9e43438 100755 (executable)
--- a/dselect/install
+++ b/dselect/install
@@ -7,7 +7,7 @@ APTGET="/usr/bin/apt-get"
 DPKG="/usr/bin/dpkg"
 set -e
 RES=`apt-config shell CLEAN DSelect::Clean OPTS DSelect::Options \
-                      DPKG Dir::Bin::dpkg/ APTGET Dir::Bin::apt-get/ \
+                      DPKG Dir::Bin::dpkg APTGET Dir::Bin::apt-get \
                      ARCHIVES Dir::Cache::Archives/`
 eval $RES
 set +e