diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2005-11-16 16:21:04 +0000 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2005-11-16 16:21:04 +0000 |
| commit | 7230ad48a5c7766281c824c7373ecc8900e25995 (patch) | |
| tree | 15a6dc1171c9d2b9696b67c22c1b5d4c6c863a75 /cmdline/apt-get.cc | |
| parent | 74a05226eff7041cd8f2380fe599862d350a1ac3 (diff) | |
| parent | 7e15443375875a15babd8bc35eeaef2785a06374 (diff) | |
* merged with apt--mvo--0
Patches applied:
* apt@packages.debian.org/apt--sources-list-d--0--base-0
tag of apt@packages.debian.org/apt--main--0--patch-30
* apt@packages.debian.org/apt--sources-list-d--0--patch-1
Patch from apt-rpm via Michael Vogt to implement /etc/apt/sources.list.d
* bubulle@debian.org--2005/apt--main--0--patch-96
Sync with Matt
* bubulle@debian.org--2005/apt--main--0--patch-97
Merge with Matt
* bubulle@debian.org--2005/apt--main--0--patch-98
Update PO files with the POT
* bubulle@debian.org--2005/apt--main--0--patch-99
Added Galician translation
* bubulle@debian.org--2005/apt--main--0--patch-100
Completed Danish translation
* bubulle@debian.org--2005/apt--main--0--patch-101
Merge with Matt
* bubulle@debian.org--2005/apt--main--0--patch-102
Merge with Michael Vogt's archive
* bubulle@debian.org--2005/apt--main--0--patch-103
Update the POT files and all PO files to resync with recent code
* bubulle@debian.org--2005/apt--main--0--patch-104
French translation completed
* bubulle@debian.org--2005/apt--main--0--patch-105
Proofread by Fred Bothamy
* bubulle@debian.org--2005/apt--main--0--patch-106
Merge with mvo
* bubulle@debian.org--2005/apt--main--0--patch-107
Italian translation corrected
* bubulle@debian.org--2005/apt--main--0--patch-108
Italian translation update
* bubulle@debian.org--2005/apt--main--0--patch-109
Italian translation completed
* bubulle@debian.org--2005/apt--main--0--patch-110
Swedish translation update
* bubulle@debian.org--2005/apt--main--0--patch-111
Merge with Michael
* bubulle@debian.org--2005/apt--main--0--patch-112
Swedish translation completed
* bubulle@debian.org--2005/apt--main--0--patch-113
Silly update to French translation (testing)
* bubulle@debian.org--2005/apt--main--0--patch-114
Basque translation update
* bubulle@debian.org--2005/apt--main--0--patch-115
Basque translation completed
* bubulle@debian.org--2005/apt--main--0--patch-116
Merge with Michael
* bubulle@debian.org--2005/apt--main--0--patch-117
Merge with Michael
* bubulle@debian.org--2005/apt--main--0--patch-118
Russian translation update by Yuri Kozlov
* bubulle@debian.org--2005/apt--main--0--patch-119
Merge with Michael and add update-po as a pre-req for binary
* bubulle@debian.org--2005/apt--main--0--patch-120
Re-generate all PO Files
* bubulle@debian.org--2005/apt--main--0--patch-121
Complete French translation
* bubulle@debian.org--2005/apt--main--0--patch-122
Correct typography in French translation
* bubulle@debian.org--2005/apt--main--0--patch-123
Spelling fix for consistency in French translation
* bubulle@debian.org--2005/apt--main--0--patch-124
Merge with Michael
* bubulle@debian.org--2005/apt--main--0--patch-125
Fixed localization of y/n questions in German translation
* bubulle@debian.org--2005/apt--main--0--patch-126
Swedish translation update
* bubulle@debian.org--2005/apt--main--0--patch-127
Complete Tagalog translation / Add Changelog
* bubulle@debian.org--2005/apt--main--0--patch-128
Danish translation update
* bubulle@debian.org--2005/apt--main--0--patch-129
Basque translation update
* bubulle@debian.org--2005/apt--main--0--patch-130
Galician translation completed
* bubulle@debian.org--2005/apt--main--0--patch-131
Simplified Chinese translation update
* michael.vogt@ubuntu.com--2005/apt--bts225947--0--patch-5
* merged with apt--main--0
* michael.vogt@ubuntu.com--2005/apt--bts225947--0--patch-6
* fixed a incorrect po/he.po merge
* michael.vogt@ubuntu.com--2005/apt--cdrom-fallback--0--base-0
tag of apt@packages.debian.org/apt--main--0--patch-110
* michael.vogt@ubuntu.com--2005/apt--cdrom-fallback--0--patch-1
* initial patch to make falling back from cdrom possible
* michael.vogt@ubuntu.com--2005/apt--cdrom-fallback--0--patch-2
* fix in methods/cdrom.cc: don't call Fail() but return false so that apt can fallback to a differencent source
* michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-10
* fix a bug in a man-page, fix a problem with overly long lines in apt-cdrom
* michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-11
* merged with apt--main--0
* michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-12
* fix a incorrect error message (it always added .gz regardless what was downloaded)
* michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-13
* merged with main
* michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-14
* added Hashsum support for file and cdrom
* michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-15
* added README.arch
* michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-16
* merged with main
* michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-17
* move the changelog to the right place
* michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-18
* Change pkgPolicy::Pin from private to protected
* michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-19
* added a default constructor for PrvIterator
* michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-20
* applied otavios patch to reread the statusFile on debSystem::Initialize
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-33
* merged with matt's tree
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-34
* merged with matts tree
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-35
* build debian and ubuntu package from the same source
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-36
* added debian/patches dir
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-37
* fix the breakage from my last commit (note to self: always, _always_ run baz diff before a commit)
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-38
* removed the lsb_release build patch (nobody except me seems to like it)
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-39
* merged from main
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-40
* merged the apt--sane-handle-timeout--0 branch
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-41
* merged apt--bts225947--0
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-42
* merged with apt--main
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-43
* added patch that adds a apt-secure man-page (thanks to jfs@computer.org)
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-44
* added author credits
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-45
* added apt-ftparchive.conf example
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-46
* corrected the utf8 of javier fernandes pena
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-47
* improve the timeout handling (again)
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-48
* merged with apt--fixes--0
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-49
* README.arch updates, comment in apt-pkg/algorithm.h added, apt-pkg/cacheiterators.h order in initlist changed to remove warning
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-50
* meda-change message is send over status-fd now
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-51
* include a human readable string for the MediaChange status-fd message as well
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-52
* finalizing changelog
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-53
* check ctime as well in cron.daily when cleaning up packages in apt.cron.daily
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-54
* fix a stupid typo in apt.cron.daily
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-55
* fix apt-pkg/cdrom.cc to umount the cdrom again if anything fails
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-56
* merged from apt--cdrom-fallback--0
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-57
* changelog update
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-58
* better error string for a failed dpkg-source
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-59
* make sure that the pkgRecords D'tor does not segfault
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-60
* merged updated french man-page
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-61
* merged with bubulle
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-62
* leak fix for debian #250583
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-63
* changelog update
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-64
* merged with bubulle
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-65
* inital support for "apt-get source -t dist" (but no downgrades yet
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-66
* full support for apt-get source -t now (and honor pining too)
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-67
* added APT::Authentication::Trust-CDROM option
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-68
* fix a crash in apt-ftparchive
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-69
* sparc64 alignment fix
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-70
* fix segfault when there is no Archive for a VerFile
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-71
* don't get candidate release as version tag for FindSrc by default. because it break for bin-NMUs :/ (e.g. dpkg source is 1.13.11, but i386 version string is 1.13.11.0.1)
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-72
* corrections in the changelog
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-73
* init the default ScreenWidth to 79 columns by default (Closes: #324921)
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-74
apt-cdrom.cc:fix some missing gettext() calls (closes: #334539); doc/apt-cache.8.xml: fix typo (closes: #334714)
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-75
* seting section to "admin" to match override file
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-76
* finalized the changelog
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-77
* renamed Trust-CDROM to TrustCDROM to make it consistent with ubuntu
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-78
* fix a incorrect example
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-79
* revert patch from patch-59, causes all sorts of trouble
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-80
* fix changelog
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-81
* be extra carefull in cmdline/apt-get.cc:FindSrc() and check VF.File() for NULL
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-82
* merged with bubulle
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-83
* cmdline/apt-get.cc: fix bug in FindSrc() (debian #335213)
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-84
* added armeb to archtable
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-85
* merged with bubulle, changelog updates
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-86
* merged the NMU from Franz Pop, fixed armeb problem (#333599)
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-87
* removed double armeb entry in buildlib/sizetable
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-88
* finalized changelog
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-89
* turn off "secure-acquire" when --allow-unauthenticated is given
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-90
* merged the sources.list.d patch
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-91
* merged with bubulle
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-92
* changelog update
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-93
* sources.list.d documented
* michael.vogt@ubuntu.com--2005/apt--sane-handle-timeout--0--patch-3
* merged with main
* michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0--base-0
tag of apt@packages.debian.org/apt--main--0--patch-79
* michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0--patch-1
* implemented "TrustCDROM" mode
* michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0--patch-2
* added APT::Authentication::TrustCDROM to the configure-index
* otavio@debian.org--2005/apt--fixes--0--patch-28
Reread status configuration, needed for clients using independent apt ...
* philippe.batailler@free.fr--2005/VOGTapt--mvo--0--patch-1
French L10N update
* philippe.batailler@free.fr--2005/VOGTapt--mvo--0--patch-2
Generate correctly french manpages
Diffstat (limited to 'cmdline/apt-get.cc')
| -rw-r--r-- | cmdline/apt-get.cc | 56 |
1 files changed, 42 insertions, 14 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index c8b64f5d8..54c464a37 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -67,7 +67,7 @@ ostream c0out(0); ostream c1out(0); ostream c2out(0); ofstream devnull("/dev/null"); -unsigned int ScreenWidth = 80; +unsigned int ScreenWidth = 80 - 1; /* - 1 for the cursor */ // class CacheFile - Cover class for some dependency cache functions /*{{{*/ // --------------------------------------------------------------------- @@ -1191,24 +1191,54 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, string VerTag; string TmpSrc = Name; string::size_type Slash = TmpSrc.rfind('='); + + // honor default release + string DefRel = _config->Find("APT::Default-Release"); + pkgCache::PkgIterator Pkg = Cache.FindPkg(TmpSrc); + if (Slash != string::npos) { VerTag = string(TmpSrc.begin() + Slash + 1,TmpSrc.end()); TmpSrc = string(TmpSrc.begin(),TmpSrc.begin() + Slash); + } + else if(!Pkg.end() && DefRel.empty() == false) + { + // we have a default release, try to locate the pkg. we do it like + // this because GetCandidateVer() will not "downgrade", that means + // "apt-get source -t stable apt" won't work on a unstable system + for (pkgCache::VerIterator Ver = Pkg.VersionList(); Ver.end() == false; + Ver++) + { + for (pkgCache::VerFileIterator VF = Ver.FileList(); VF.end() == false; + VF++) + { + /* If this is the status file, and the current version is not the + version in the status file (ie it is not installed, or somesuch) + then it is not a candidate for installation, ever. This weeds + out bogus entries that may be due to config-file states, or + other. */ + if ((VF.File()->Flags & pkgCache::Flag::NotSource) == + pkgCache::Flag::NotSource && Pkg.CurrentVer() != Ver) + continue; + + //std::cout << VF.File().Archive() << std::endl; + if(VF.File().Archive() && (VF.File().Archive() == DefRel)) + { + VerTag = Ver.VerStr(); + break; + } + } + } } - + /* Lookup the version of the package we would install if we were to install a version and determine the source package name, then look - in the archive for a source package of the same name. In theory - we could stash the version string as well and match that too but - today there aren't multi source versions in the archive. */ - if (_config->FindB("APT::Get::Only-Source") == false && - VerTag.empty() == true) + in the archive for a source package of the same name. */ + if (_config->FindB("APT::Get::Only-Source") == false) { - pkgCache::PkgIterator Pkg = Cache.FindPkg(TmpSrc); if (Pkg.end() == false) { - pkgCache::VerIterator Ver = Cache.GetCandidateVer(Pkg); + pkgCache::VerIterator Ver = Cache.GetCandidateVer(Pkg); if (Ver.end() == false) { pkgRecords::Parser &Parse = Recs.Lookup(Ver.FileList()); @@ -1266,10 +1296,7 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, } } - if (Last == 0) - return 0; - - if (Last->Jump(Offset) == false) + if (Last == 0 || Last->Jump(Offset) == false) return 0; return Last; @@ -1716,7 +1743,7 @@ bool DoInstall(CommandLine &CmdL) // See if we need to prompt if (Cache->InstCount() == ExpectedInst && Cache->DelCount() == 0) return InstallPackages(Cache,false,false); - + return InstallPackages(Cache,false); } /*}}}*/ @@ -2070,6 +2097,7 @@ bool DoSource(CommandLine &CmdL) if (system(S) != 0) { fprintf(stderr,_("Unpack command '%s' failed.\n"),S); + fprintf(stderr,_("Check if the 'dpkg-dev' package is installed.\n")); _exit(1); } } |