diff options
| -rw-r--r-- | apt-pkg/depcache.cc | 6 | ||||
| -rw-r--r-- | cmdline/apt-get.cc | 6 | ||||
| -rw-r--r-- | doc/Bugs | 27 | ||||
| -rw-r--r-- | doc/examples/apt.conf | 3 | ||||
| -rwxr-xr-x | dselect/update | 9 |
5 files changed, 30 insertions, 21 deletions
diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index db1cdad62..90c07658b 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: depcache.cc,v 1.5 1998/11/13 23:20:06 jgg Exp $ +// $Id: depcache.cc,v 1.6 1998/11/23 01:45:58 jgg Exp $ /* ###################################################################### Dependency Cache - Caches Dependency information. @@ -51,7 +51,7 @@ bool pkgDepCache::Init(OpProgress *Prog) if (Prog != 0) { Prog->OverallProgress(0,2*Head().PackageCount,Head().PackageCount, - "Building Dependancy Tree"); + "Building Dependency Tree"); Prog->SubProgress(Head().PackageCount,"Candidate Versions"); } @@ -80,7 +80,7 @@ bool pkgDepCache::Init(OpProgress *Prog) Prog->OverallProgress(Head().PackageCount,2*Head().PackageCount, Head().PackageCount, - "Building Dependancy Tree"); + "Building Dependency Tree"); Prog->SubProgress(Head().PackageCount,"Dependency Generation"); } diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 279a0c4ed..24a3f8e7f 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.16 1998/11/22 23:37:07 jgg Exp $ +// $Id: apt-get.cc,v 1.17 1998/11/23 01:45:59 jgg Exp $ /* ###################################################################### apt-get - Cover for dpkg @@ -913,8 +913,8 @@ int ShowHelp() cout << " check - Verify that there are no broken dependencies" << endl; cout << endl; cout << "Options:" << endl; - cout << " -h This help text." << endl; - cout << " -q Loggable output - no progress indicator" << endl; + cout << " -h This help text." << endl; + cout << " -q Loggable output - no progress indicator" << endl; cout << " -qq No output except for errors" << endl; cout << " -d Download only - do NOT install or unpack archives" << endl; cout << " -s No-act. Perform ordering simulation" << endl; @@ -11,15 +11,9 @@ #24717: apt dies early if one postinst/preinst dies Status: Requires dpkg modifications #22892: Apt improvements -#28184: apt could be smarted regarding mirrors +#28184: apt could be smarter regarding mirrors Summary: Make use of redundant sources Status: 0.3.0 will likely do this, already the information for it is stored. -#24799: Some suggestions for the apt method in dselect - Summary: Wants to be able to specifiy -d from dselect - Status: Likely a APT_OPTIONS enviornment variable will be created, -d can - be put there. - There is already an APT_CONFIG in 0.3, APT_OPTIONS may also - appear.. #25104: APT should retry failed downloads Summary: FTP method has problems with busy servers Status: The 0.3.0 ftp method should probably use the configuration mechanism @@ -29,12 +23,7 @@ Summary: FTP method has no controls for firewalls Status: The 0.3.0 ftp method should probably use the configuration mechanism to control this desired behavoir. -#28373: apt package is missing information on ftp.conf -#29293: apt: Docs reference apt(8) but apt(8) not provided. - Summary: The man pages have references to several non-existent items, - ftp.conf is only one of them. - Status: Fix the man pages. This certainly will be done in 0.3.0 - + -- Fixed but unclosed things #25026: apt: Why do you list the packages you're _not_ doing anything to instead of the ones you are? #22507: apt: apt-get - listing packages to be upgraded (wishlist) @@ -97,6 +86,18 @@ installed Status: Will be implemented in 0.3.0 Try the --no-upgrade options +#28373: apt package is missing information on ftp.conf +#29293: apt: Docs reference apt(8) but apt(8) not provided. + Summary: The man pages have references to several non-existent items, + ftp.conf is only one of them. + Status: Fix the man pages. This certainly will be done in 0.3.0 +#24799: Some suggestions for the apt method in dselect + Summary: Wants to be able to specifiy -d from dselect + Status: Likely a APT_OPTIONS enviornment variable will be created, -d can + be put there. + There is already an APT_CONFIG in 0.3, APT_OPTIONS may also + appear.. + Use Dselect::Options "-d" and others -- Silly things #26592: apt: Problems with ftpd in SunOS 5.6 diff --git a/doc/examples/apt.conf b/doc/examples/apt.conf index 8bd47550a..e89140d47 100644 --- a/doc/examples/apt.conf +++ b/doc/examples/apt.conf @@ -1,4 +1,4 @@ -// $Id: apt.conf,v 1.13 1998/11/22 23:37:09 jgg Exp $ +// $Id: apt.conf,v 1.14 1998/11/23 01:46:01 jgg Exp $ /* This file is an index of all APT configuration directives. It should NOT actually be used as a real config file, though it is a completely valid file. @@ -84,6 +84,7 @@ DSelect { Clean "auto"; Options "-f"; UpdateOptions ""; + PromptAfterUpdate "no"; } /* Options you can set to see some debugging text They corrispond to names diff --git a/dselect/update b/dselect/update index ca507c4c6..3260278b6 100755 --- a/dselect/update +++ b/dselect/update @@ -7,9 +7,11 @@ APTGET="/usr/bin/apt-get" APTCACHE="/usr/bin/apt-cache" DPKG="/usr/bin/dpkg" CACHEDIR="/var/cache/apt" +PROMPT="no" RES=`apt-config shell OPTS DSelect::UpdateOptions \ DPKG Dir::Bin::dpkg APTGET Dir::Bin::apt-get \ - APTCACHE Dir::Bin::apt-cache CACHEDIR Dir::Cache` + APTCACHE Dir::Bin::apt-cache CACHEDIR Dir::Cache \ + PROMPT DSelect::PromptAfterUpdate` eval $RES $APTGET $OPTS update @@ -19,4 +21,9 @@ rm -f /var/cache/apt/available $APTCACHE dumpavail > $CACHEDIR/available $DPKG --update-avail $CACHEDIR/available rm -f $CACHEDIR/available + +if [ $PROMPT == "yes" ]; then + echo "Press enter to continue." && read RES; +fi + exit 0 |