Merge branch 'debian/sid' into feature/more-fancy-progress

[apt.git] / cmdline / apt-get.cc

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 8a0772ce26b716b6a05834ff48b3c5b263892110..caf69da2aeb7b7a735289f601b563e463e735213 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -15,7 +15,7 @@
       upgrade - Smart-Download the newest versions of all packages
       dselect-upgrade - Follows dselect's changes to the Status: field
                        and installes new and removes old packages
       upgrade - Smart-Download the newest versions of all packages
       dselect-upgrade - Follows dselect's changes to the Status: field
                        and installes new and removes old packages

-      dist-upgrade - Powerfull upgrader designed to handle the issues with
+      dist-upgrade - Powerful upgrader designed to handle the issues with

                     a new distribution.
       install - Download and install a given package (by name, not by .deb)
       check - Update the package cache and check for broken packages
                     a new distribution.
       install - Download and install a given package (by name, not by .deb)
       check - Update the package cache and check for broken packages


@@ -27,66 +27,67 @@
 // Include Files                                                       /*{{{*/
 #include <config.h>
 
 // Include Files                                                       /*{{{*/
 #include <config.h>
 

+#include <apt-pkg/acquire-item.h>
+#include <apt-pkg/algorithms.h>

 #include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/aptconfiguration.h>

-#include <apt-pkg/error.h>
+#include <apt-pkg/cachefile.h>
+#include <apt-pkg/cacheset.h>
+#include <apt-pkg/clean.h>

 #include <apt-pkg/cmndline.h>
 #include <apt-pkg/cmndline.h>

-#include <apt-pkg/init.h>
+#include <apt-pkg/debmetaindex.h>

 #include <apt-pkg/depcache.h>
 #include <apt-pkg/depcache.h>

-#include <apt-pkg/sourcelist.h>
-#include <apt-pkg/algorithms.h>
-#include <apt-pkg/acquire-item.h>
-#include <apt-pkg/strutl.h>
+#include <apt-pkg/error.h>

 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/fileutl.h>

-#include <apt-pkg/clean.h>
-#include <apt-pkg/srcrecords.h>
-#include <apt-pkg/version.h>
-#include <apt-pkg/cachefile.h>
-#include <apt-pkg/cacheset.h>
-#include <apt-pkg/sptr.h>
+#include <apt-pkg/indexfile.h>
+#include <apt-pkg/indexrecords.h>
+#include <apt-pkg/init.h>

 #include <apt-pkg/md5.h>
 #include <apt-pkg/md5.h>

-#include <apt-pkg/versionmatch.h>
-#include <apt-pkg/progress.h>
-#include <apt-pkg/pkgsystem.h>
+#include <apt-pkg/metaindex.h>

 #include <apt-pkg/pkgrecords.h>
 #include <apt-pkg/pkgrecords.h>

-#include <apt-pkg/indexfile.h>
+#include <apt-pkg/pkgsystem.h>
+#include <apt-pkg/progress.h>
+#include <apt-pkg/sourcelist.h>
+#include <apt-pkg/srcrecords.h>
+#include <apt-pkg/strutl.h>
+#include <apt-pkg/version.h>
+#include <apt-pkg/acquire.h>
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/macros.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>

 #include <apt-pkg/upgrade.h>
 #include <apt-pkg/upgrade.h>

-#include <apt-pkg/metaindex.h>
-#include <apt-pkg/indexrecords.h>

 
 

+#include <apt-private/acqprogress.h>
+#include <apt-private/private-cacheset.h>
+#include <apt-private/private-cachefile.h>
+#include <apt-private/private-cmndline.h>

 #include <apt-private/private-download.h>
 #include <apt-private/private-install.h>
 #include <apt-private/private-download.h>
 #include <apt-private/private-install.h>

-#include <apt-private/private-upgrade.h>
+#include <apt-private/private-main.h>
+#include <apt-private/private-moo.h>

 #include <apt-private/private-output.h>
 #include <apt-private/private-output.h>

-#include <apt-private/private-cacheset.h>

 #include <apt-private/private-update.h>
 #include <apt-private/private-update.h>

-#include <apt-private/private-cmndline.h>
-#include <apt-private/private-moo.h>
+#include <apt-private/private-upgrade.h>

 #include <apt-private/private-utils.h>
 
 #include <apt-private/private-utils.h>
 

-#include <apt-pkg/debmetaindex.h>
-
-#include <apt-private/acqprogress.h>
-
-#include <set>
-#include <fstream>
-#include <sstream>
-
-#include <locale.h>
-#include <langinfo.h>
-#include <termios.h>
+#include <errno.h>
+#include <signal.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>

 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <sys/statfs.h>
 #include <sys/statvfs.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <sys/statfs.h>
 #include <sys/statvfs.h>

-#include <signal.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <errno.h>
-#include <regex.h>

 #include <sys/wait.h>
 #include <sys/wait.h>

-
-#include <apt-private/private-output.h>
-#include <apt-private/private-main.h>
+#include <unistd.h>
+#include <algorithm>
+#include <fstream>
+#include <iostream>
+#include <set>
+#include <string>
+#include <vector>

 
 #include <apti18n.h>
                                                                        /*}}}*/
 
 #include <apti18n.h>
                                                                        /*}}}*/


@@ -97,7 +98,7 @@ using namespace std;
 // ---------------------------------------------------------------------
 /* This used to be inlined in DoInstall, but with the advent of regex package
    name matching it was split out.. */
 // ---------------------------------------------------------------------
 /* This used to be inlined in DoInstall, but with the advent of regex package
    name matching it was split out.. */

-bool TryToInstallBuildDep(pkgCache::PkgIterator Pkg,pkgCacheFile &Cache,
+static bool TryToInstallBuildDep(pkgCache::PkgIterator Pkg,pkgCacheFile &Cache,

                  pkgProblemResolver &Fix,bool Remove,bool BrokenFix,
                  bool AllowFail = true)
 {
                  pkgProblemResolver &Fix,bool Remove,bool BrokenFix,
                  bool AllowFail = true)
 {


@@ -138,7 +139,7 @@ bool TryToInstallBuildDep(pkgCache::PkgIterator Pkg,pkgCacheFile &Cache,
 
 // helper that can go wit hthe next ABI break
 #if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR < 13)
 
 // helper that can go wit hthe next ABI break
 #if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR < 13)

-std::string MetaIndexFileNameOnDisk(metaIndex *metaindex)
+static std::string MetaIndexFileNameOnDisk(metaIndex *metaindex)

 {
    // FIXME: this cast is the horror, the horror
    debReleaseIndex *r = (debReleaseIndex*)metaindex;
 {
    // FIXME: this cast is the horror, the horror
    debReleaseIndex *r = (debReleaseIndex*)metaindex;


@@ -159,7 +160,7 @@ std::string MetaIndexFileNameOnDisk(metaIndex *metaindex)
 // GetReleaseForSourceRecord - Return Suite for the given srcrecord    /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // GetReleaseForSourceRecord - Return Suite for the given srcrecord    /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-std::string GetReleaseForSourceRecord(pkgSourceList *SrcList,
+static std::string GetReleaseForSourceRecord(pkgSourceList *SrcList,

                                       pkgSrcRecords::Parser *Parse)
 {
    // try to find release
                                       pkgSrcRecords::Parser *Parse)
 {
    // try to find release


@@ -194,7 +195,7 @@ std::string GetReleaseForSourceRecord(pkgSourceList *SrcList,
 // FindSrc - Find a source record                                      /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // FindSrc - Find a source record                                      /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs,
+static pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs,

                               pkgSrcRecords &SrcRecs,string &Src,
                               CacheFile &CacheFile)
 {
                               pkgSrcRecords &SrcRecs,string &Src,
                               CacheFile &CacheFile)
 {


@@ -430,7 +431,7 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs,
 }
                                                                        /*}}}*/
 /* mark packages as automatically/manually installed.                  {{{*/
 }
                                                                        /*}}}*/
 /* mark packages as automatically/manually installed.                  {{{*/

-bool DoMarkAuto(CommandLine &CmdL)
+static bool DoMarkAuto(CommandLine &CmdL)

 {
    bool Action = true;
    int AutoMarkChanged = 0;
 {
    bool Action = true;
    int AutoMarkChanged = 0;


@@ -475,7 +476,7 @@ bool DoMarkAuto(CommandLine &CmdL)
 // DoDSelectUpgrade - Do an upgrade by following dselects selections   /*{{{*/
 // ---------------------------------------------------------------------
 /* Follows dselect's selections */
 // DoDSelectUpgrade - Do an upgrade by following dselects selections   /*{{{*/
 // ---------------------------------------------------------------------
 /* Follows dselect's selections */

-bool DoDSelectUpgrade(CommandLine &CmdL)
+static bool DoDSelectUpgrade(CommandLine &)

 {
    CacheFile Cache;
    if (Cache.OpenForInstall() == false || Cache.CheckDeps() == false)
 {
    CacheFile Cache;
    if (Cache.OpenForInstall() == false || Cache.CheckDeps() == false)


@@ -513,7 +514,7 @@ bool DoDSelectUpgrade(CommandLine &CmdL)
    }
 
    /* Resolve any problems that dselect created, allupgrade cannot handle
    }
 
    /* Resolve any problems that dselect created, allupgrade cannot handle

-      such things. We do so quite agressively too.. */
+      such things. We do so quite aggressively too.. */

    if (Cache->BrokenCount() != 0)
    {      
       pkgProblemResolver Fix(Cache);
    if (Cache->BrokenCount() != 0)
    {      
       pkgProblemResolver Fix(Cache);


@@ -551,7 +552,7 @@ bool DoDSelectUpgrade(CommandLine &CmdL)
 // DoClean - Remove download archives                                  /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // DoClean - Remove download archives                                  /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-bool DoClean(CommandLine &CmdL)
+static bool DoClean(CommandLine &)

 {
    std::string const archivedir = _config->FindDir("Dir::Cache::archives");
    std::string const pkgcache = _config->FindFile("Dir::cache::pkgcache");
 {
    std::string const archivedir = _config->FindDir("Dir::Cache::archives");
    std::string const pkgcache = _config->FindFile("Dir::cache::pkgcache");


@@ -599,7 +600,7 @@ class LogCleaner : public pkgArchiveCleaner
    };
 };
 
    };
 };
 

-bool DoAutoClean(CommandLine &CmdL)
+static bool DoAutoClean(CommandLine &)

 {
    // Lock the archive directory
    FileFd Lock;
 {
    // Lock the archive directory
    FileFd Lock;


@@ -623,15 +624,15 @@ bool DoAutoClean(CommandLine &CmdL)
                                                                        /*}}}*/
 // DoDownload - download a binary                                      /*{{{*/
 // ---------------------------------------------------------------------
                                                                        /*}}}*/
 // DoDownload - download a binary                                      /*{{{*/
 // ---------------------------------------------------------------------

-bool DoDownload(CommandLine &CmdL)
+static bool DoDownload(CommandLine &CmdL)

 {
    CacheFile Cache;
    if (Cache.ReadOnlyOpen() == false)
       return false;
 
    APT::CacheSetHelper helper(c0out);
 {
    CacheFile Cache;
    if (Cache.ReadOnlyOpen() == false)
       return false;
 
    APT::CacheSetHelper helper(c0out);

-   APT::VersionList verset = APT::VersionList::FromCommandLine(Cache,
-               CmdL.FileList + 1, APT::VersionList::CANDIDATE, helper);
+   APT::VersionSet verset = APT::VersionSet::FromCommandLine(Cache,
+               CmdL.FileList + 1, APT::VersionSet::CANDIDATE, helper);

 
    if (verset.empty() == true)
       return false;
 
    if (verset.empty() == true)
       return false;


@@ -650,7 +651,7 @@ bool DoDownload(CommandLine &CmdL)
    std::string const cwd = SafeGetCWD();
    _config->Set("Dir::Cache::Archives", cwd);
    int i = 0;
    std::string const cwd = SafeGetCWD();
    _config->Set("Dir::Cache::Archives", cwd);
    int i = 0;

-   for (APT::VersionList::const_iterator Ver = verset.begin();
+   for (APT::VersionSet::const_iterator Ver = verset.begin();

         Ver != verset.end(); ++Ver, ++i)
    {
       pkgAcquire::Item *I = new pkgAcqArchive(&Fetcher, SrcList, &Recs, *Ver, storefile[i]);
         Ver != verset.end(); ++Ver, ++i)
    {
       pkgAcquire::Item *I = new pkgAcqArchive(&Fetcher, SrcList, &Recs, *Ver, storefile[i]);


@@ -678,14 +679,17 @@ bool DoDownload(CommandLine &CmdL)
 
    // copy files in local sources to the current directory
    for (pkgAcquire::ItemIterator I = Fetcher.ItemsBegin(); I != Fetcher.ItemsEnd(); ++I)
 
    // copy files in local sources to the current directory
    for (pkgAcquire::ItemIterator I = Fetcher.ItemsBegin(); I != Fetcher.ItemsEnd(); ++I)

-      if ((*I)->Local == true && (*I)->Status == pkgAcquire::Item::StatDone)
+   {
+      std::string const filename = cwd + flNotDir((*I)->DestFile);
+      if ((*I)->Local == true &&
+          filename != (*I)->DestFile &&
+          (*I)->Status == pkgAcquire::Item::StatDone)

       {
       {

-        std::string const filename = cwd + flNotDir((*I)->DestFile);

         std::ifstream src((*I)->DestFile.c_str(), std::ios::binary);
         std::ofstream dst(filename.c_str(), std::ios::binary);
         dst << src.rdbuf();
       }
         std::ifstream src((*I)->DestFile.c_str(), std::ios::binary);
         std::ofstream dst(filename.c_str(), std::ios::binary);
         dst << src.rdbuf();
       }

-
+   }

    return Failed == false;
 }
                                                                        /*}}}*/
    return Failed == false;
 }
                                                                        /*}}}*/


@@ -693,7 +697,7 @@ bool DoDownload(CommandLine &CmdL)
 // ---------------------------------------------------------------------
 /* Opening automatically checks the system, this command is mostly used
    for debugging */
 // ---------------------------------------------------------------------
 /* Opening automatically checks the system, this command is mostly used
    for debugging */

-bool DoCheck(CommandLine &CmdL)
+static bool DoCheck(CommandLine &)

 {
    CacheFile Cache;
    Cache.Open();
 {
    CacheFile Cache;
    Cache.Open();


@@ -712,7 +716,7 @@ struct DscFile
    string Dsc;
 };
 
    string Dsc;
 };
 

-bool DoSource(CommandLine &CmdL)
+static bool DoSource(CommandLine &CmdL)

 {
    CacheFile Cache;
    if (Cache.Open(false) == false)
 {
    CacheFile Cache;
    if (Cache.Open(false) == false)


@@ -737,7 +741,7 @@ bool DoSource(CommandLine &CmdL)
    pkgAcquire Fetcher;
    Fetcher.SetLog(&Stat);
 
    pkgAcquire Fetcher;
    Fetcher.SetLog(&Stat);
 

-   DscFile *Dsc = new DscFile[CmdL.FileSize()];
+   SPtrArray<DscFile> Dsc = new DscFile[CmdL.FileSize()];

    
    // insert all downloaded uris into this set to avoid downloading them
    // twice
    
    // insert all downloaded uris into this set to avoid downloading them
    // twice


@@ -758,7 +762,6 @@ bool DoSource(CommandLine &CmdL)
       pkgSrcRecords::Parser *Last = FindSrc(*I,Recs,SrcRecs,Src,Cache);
       
       if (Last == 0) {
       pkgSrcRecords::Parser *Last = FindSrc(*I,Recs,SrcRecs,Src,Cache);
       
       if (Last == 0) {

-        delete[] Dsc;

         return _error->Error(_("Unable to find a source package for %s"),Src.c_str());
       }
       
         return _error->Error(_("Unable to find a source package for %s"),Src.c_str());
       }
       


@@ -792,7 +795,6 @@ bool DoSource(CommandLine &CmdL)
       // Back track
       vector<pkgSrcRecords::File> Lst;
       if (Last->Files(Lst) == false) {
       // Back track
       vector<pkgSrcRecords::File> Lst;
       if (Last->Files(Lst) == false) {

-        delete[] Dsc;

         return false;
       }
 
         return false;
       }
 


@@ -855,7 +857,6 @@ bool DoSource(CommandLine &CmdL)
    struct statvfs Buf;
    string OutputDir = ".";
    if (statvfs(OutputDir.c_str(),&Buf) != 0) {
    struct statvfs Buf;
    string OutputDir = ".";
    if (statvfs(OutputDir.c_str(),&Buf) != 0) {

-      delete[] Dsc;

       if (errno == EOVERFLOW)
         return _error->WarningE("statvfs",_("Couldn't determine free space in %s"),
                                OutputDir.c_str());
       if (errno == EOVERFLOW)
         return _error->WarningE("statvfs",_("Couldn't determine free space in %s"),
                                OutputDir.c_str());


@@ -870,7 +871,6 @@ bool DoSource(CommandLine &CmdL)
            || unsigned(Stat.f_type) != RAMFS_MAGIC
 #endif
            )  {
            || unsigned(Stat.f_type) != RAMFS_MAGIC
 #endif
            )  {

-        delete[] Dsc;

           return _error->Error(_("You don't have enough free space in %s"),
               OutputDir.c_str());
        }
           return _error->Error(_("You don't have enough free space in %s"),
               OutputDir.c_str());
        }


@@ -892,7 +892,6 @@ bool DoSource(CommandLine &CmdL)
    {
       for (unsigned I = 0; I != J; I++)
         ioprintf(cout,_("Fetch source %s\n"),Dsc[I].Package.c_str());
    {
       for (unsigned I = 0; I != J; I++)
         ioprintf(cout,_("Fetch source %s\n"),Dsc[I].Package.c_str());

-      delete[] Dsc;

       return true;
    }
    
       return true;
    }
    


@@ -903,7 +902,6 @@ bool DoSource(CommandLine &CmdL)
       for (; I != Fetcher.UriEnd(); ++I)
         cout << '\'' << I->URI << "' " << flNotDir(I->Owner->DestFile) << ' ' << 
               I->Owner->FileSize << ' ' << I->Owner->HashSum() << endl;
       for (; I != Fetcher.UriEnd(); ++I)
         cout << '\'' << I->URI << "' " << flNotDir(I->Owner->DestFile) << ' ' << 
               I->Owner->FileSize << ' ' << I->Owner->HashSum() << endl;

-      delete[] Dsc;

       return true;
    }
 
       return true;
    }
 


@@ -911,14 +909,12 @@ bool DoSource(CommandLine &CmdL)
    bool Failed = false;
    if (AcquireRun(Fetcher, 0, &Failed, NULL) == false || Failed == true)
    {
    bool Failed = false;
    if (AcquireRun(Fetcher, 0, &Failed, NULL) == false || Failed == true)
    {

-      delete[] Dsc;

       return _error->Error(_("Failed to fetch some archives."));
    }
 
    if (_config->FindB("APT::Get::Download-only",false) == true)
    {
       c1out << _("Download complete and in download only mode") << endl;
       return _error->Error(_("Failed to fetch some archives."));
    }
 
    if (_config->FindB("APT::Get::Download-only",false) == true)
    {
       c1out << _("Download complete and in download only mode") << endl;

-      delete[] Dsc;

       return true;
    }
 
       return true;
    }
 


@@ -967,6 +963,12 @@ bool DoSource(CommandLine &CmdL)
            string buildopts = _config->Find("APT::Get::Host-Architecture");
            if (buildopts.empty() == false)
               buildopts = "-a" + buildopts + " ";
            string buildopts = _config->Find("APT::Get::Host-Architecture");
            if (buildopts.empty() == false)
               buildopts = "-a" + buildopts + " ";

+
+           // get all active build profiles
+           std::string const profiles = APT::Configuration::getBuildProfilesString();
+           if (profiles.empty() == false)
+              buildopts.append(" -P").append(profiles).append(" ");
+

            buildopts.append(_config->Find("DPkg::Build-Options","-b -uc"));
 
            // Call dpkg-buildpackage
            buildopts.append(_config->Find("DPkg::Build-Options","-b -uc"));
 
            // Call dpkg-buildpackage


@@ -986,7 +988,6 @@ bool DoSource(CommandLine &CmdL)
       
       _exit(0);
    }
       
       _exit(0);
    }

-   delete[] Dsc;

 
    // Wait for the subprocess
    int Status = 0;
 
    // Wait for the subprocess
    int Status = 0;


@@ -1007,7 +1008,7 @@ bool DoSource(CommandLine &CmdL)
 // ---------------------------------------------------------------------
 /* This function will look at the build depends list of the given source 
    package and install the necessary packages to make it true, or fail. */
 // ---------------------------------------------------------------------
 /* This function will look at the build depends list of the given source 
    package and install the necessary packages to make it true, or fail. */

-bool DoBuildDep(CommandLine &CmdL)
+static bool DoBuildDep(CommandLine &CmdL)

 {
    CacheFile Cache;
 
 {
    CacheFile Cache;
 


@@ -1401,7 +1402,7 @@ bool DoBuildDep(CommandLine &CmdL)
  * pool/ next to the deb itself)
  * Example return: "pool/main/a/apt/apt_0.8.8ubuntu3" 
  */
  * pool/ next to the deb itself)
  * Example return: "pool/main/a/apt/apt_0.8.8ubuntu3" 
  */

-string GetChangelogPath(CacheFile &Cache, 
+static string GetChangelogPath(CacheFile &Cache, 

                         pkgCache::PkgIterator Pkg,
                         pkgCache::VerIterator Ver)
 {
                         pkgCache::PkgIterator Pkg,
                         pkgCache::VerIterator Ver)
 {


@@ -1428,7 +1429,7 @@ string GetChangelogPath(CacheFile &Cache,
  * apt-get changelog mplayer-doc:
  *  http://packages.medibuntu.org/pool/non-free/m/mplayer/mplayer_1.0~rc4~try1.dsfg1-1ubuntu1+medibuntu1.changelog
  */
  * apt-get changelog mplayer-doc:
  *  http://packages.medibuntu.org/pool/non-free/m/mplayer/mplayer_1.0~rc4~try1.dsfg1-1ubuntu1+medibuntu1.changelog
  */

-bool GuessThirdPartyChangelogUri(CacheFile &Cache, 
+static bool GuessThirdPartyChangelogUri(CacheFile &Cache, 

                                  pkgCache::PkgIterator Pkg,
                                  pkgCache::VerIterator Ver,
                                  string &out_uri)
                                  pkgCache::PkgIterator Pkg,
                                  pkgCache::VerIterator Ver,
                                  string &out_uri)


@@ -1453,7 +1454,7 @@ bool GuessThirdPartyChangelogUri(CacheFile &Cache,
                                                                        /*}}}*/
 // DownloadChangelog - Download the changelog                          /*{{{*/
 // ---------------------------------------------------------------------
                                                                        /*}}}*/
 // DownloadChangelog - Download the changelog                          /*{{{*/
 // ---------------------------------------------------------------------

-bool DownloadChangelog(CacheFile &CacheFile, pkgAcquire &Fetcher, 
+static bool DownloadChangelog(CacheFile &CacheFile, pkgAcquire &Fetcher, 

                        pkgCache::VerIterator Ver, string targetfile)
 /* Download a changelog file for the given package version to
  * targetfile. This will first try the server from Apt::Changelogs::Server
                        pkgCache::VerIterator Ver, string targetfile)
 /* Download a changelog file for the given package version to
  * targetfile. This will first try the server from Apt::Changelogs::Server


@@ -1508,7 +1509,7 @@ bool DownloadChangelog(CacheFile &CacheFile, pkgAcquire &Fetcher,
                                                                        /*}}}*/
 // DoChangelog - Get changelog from the command line                   /*{{{*/
 // ---------------------------------------------------------------------
                                                                        /*}}}*/
 // DoChangelog - Get changelog from the command line                   /*{{{*/
 // ---------------------------------------------------------------------

-bool DoChangelog(CommandLine &CmdL)
+static bool DoChangelog(CommandLine &CmdL)

 {
    CacheFile Cache;
    if (Cache.ReadOnlyOpen() == false)
 {
    CacheFile Cache;
    if (Cache.ReadOnlyOpen() == false)


@@ -1572,7 +1573,7 @@ bool DoChangelog(CommandLine &CmdL)
 // ShowHelp - Show a help screen                                       /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // ShowHelp - Show a help screen                                       /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-bool ShowHelp(CommandLine &CmdL)
+static bool ShowHelp(CommandLine &)

 {
    ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
            COMMON_ARCH,__DATE__,__TIME__);
 {
    ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
            COMMON_ARCH,__DATE__,__TIME__);


@@ -1668,7 +1669,7 @@ bool ShowHelp(CommandLine &CmdL)
 // SigWinch - Window size change signal handler                                /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // SigWinch - Window size change signal handler                                /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-void SigWinch(int)
+static void SigWinch(int)

 {
    // Riped from GNU ls
 #ifdef TIOCGWINSZ
 {
    // Riped from GNU ls
 #ifdef TIOCGWINSZ


@@ -1677,14 +1678,6 @@ void SigWinch(int)
    if (ioctl(1, TIOCGWINSZ, &ws) != -1 && ws.ws_col >= 5)
       ScreenWidth = ws.ws_col - 1;
 #endif
    if (ioctl(1, TIOCGWINSZ, &ws) != -1 && ws.ws_col >= 5)
       ScreenWidth = ws.ws_col - 1;
 #endif

-}
-                                                                       /*}}}*/
-bool DoUpgrade(CommandLine &CmdL)                                      /*{{{*/
-{
-   if (_config->FindB("APT::Get::Upgrade-Allow-New", false) == true)
-      return DoUpgradeWithAllowNewPackages(CmdL);
-   else
-      return DoUpgradeNoNewPackages(CmdL);

 }
                                                                        /*}}}*/
 int main(int argc,const char *argv[])                                  /*{{{*/
 }
                                                                        /*}}}*/
 int main(int argc,const char *argv[])                                  /*{{{*/


@@ -1741,10 +1734,6 @@ int main(int argc,const char *argv[])                                    /*{{{*/
    // see if we are in simulate mode
    CheckSimulateMode(CmdL);
 
    // see if we are in simulate mode
    CheckSimulateMode(CmdL);
 

-   // Deal with stdout not being a tty
-   if (!isatty(STDOUT_FILENO) && _config->FindI("quiet", -1) == -1)
-      _config->Set("quiet","1");
-

    // Setup the output streams
    InitOutput();
 
    // Setup the output streams
    InitOutput();