diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2010-01-13 14:51:28 +0100 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2010-01-13 14:51:28 +0100 |
| commit | be4eec613e34a43f34eb9a9b227b69a58fe66ec8 (patch) | |
| tree | ffc2b4d427c95558bbfe8e0202724004751c5ad0 /cmdline | |
| parent | f45fd56b58a71f2827eb8b4f96333782d84b7b63 (diff) | |
| parent | 72f6c6f8d9b1a92c7795ffcfbdc3b8858eb79a70 (diff) | |
merge with lp:~mvo/apt/debian-sid to get 0.7.25.1 and my changes back
Diffstat (limited to 'cmdline')
| -rw-r--r-- | cmdline/apt-get.cc | 24 | ||||
| -rwxr-xr-x | cmdline/apt-key | 11 |
2 files changed, 23 insertions, 12 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index f84c82d28..dede0137e 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1299,31 +1299,41 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, { pkgRecords::Parser &Parse = Recs.Lookup(VF); Src = Parse.SourcePkg(); + // no SourcePkg name, so it is the "binary" name + if (Src.empty() == true) + Src = TmpSrc; + // no Version, so we try the Version of the SourcePkg - + // and after that the version of the binary package if (VerTag.empty() == true) VerTag = Parse.SourceVer(); + if (VerTag.empty() == true) + VerTag = Ver.VerStr(); break; } } + if (Src.empty() == false) + break; } if (Src.empty() == true) { - if (VerTag.empty() == false) - _error->Warning(_("Ignore unavailable version '%s' of package '%s'"), VerTag.c_str(), TmpSrc.c_str()); - else + // Sources files have no codename information + if (VerTag.empty() == true && DefRel.empty() == false) _error->Warning(_("Ignore unavailable target release '%s' of package '%s'"), DefRel.c_str(), TmpSrc.c_str()); - VerTag.clear(); DefRel.clear(); } } - if (VerTag.empty() == true && DefRel.empty() == true) + if (Src.empty() == true) { - // if we don't have a version or default release, use the CandidateVer to find the Source + // if we don't have found a fitting package yet so we will + // choose a good candidate and proceed with that. + // Maybe we will find a source later on with the right VerTag pkgCache::VerIterator Ver = Cache.GetCandidateVer(Pkg); if (Ver.end() == false) { pkgRecords::Parser &Parse = Recs.Lookup(Ver.FileList()); Src = Parse.SourcePkg(); - VerTag = Parse.SourceVer(); + if (VerTag.empty() == true) + VerTag = Parse.SourceVer(); } } } diff --git a/cmdline/apt-key b/cmdline/apt-key index 1950723f3..e45468fd4 100755 --- a/cmdline/apt-key +++ b/cmdline/apt-key @@ -132,7 +132,7 @@ usage() { # Determine on which keyring we want to work if [ "$1" = "--keyring" ]; then - echo "keyfile given" + #echo "keyfile given" shift TRUSTEDFILE="$1" if [ -r "$TRUSTEDFILE" ]; then @@ -142,8 +142,9 @@ if [ "$1" = "--keyring" ]; then exit 1 fi shift +# otherwise use the default else - echo "generate list" + #echo "generate list" TRUSTEDFILE="/etc/apt/trusted.gpg" if [ -r "$TRUSTEDFILE" ]; then GPG="$GPG --keyring $TRUSTEDFILE" @@ -151,14 +152,14 @@ else GPG="$GPG --primary-keyring $TRUSTEDFILE" TRUSTEDPARTS="/etc/apt/trusted.gpg.d" if [ -d "$TRUSTEDPARTS" ]; then - echo "parts active" + #echo "parts active" for trusted in $(run-parts --list $TRUSTEDPARTS --regex '^.*\.gpg$'); do - echo "part -> $trusted" + #echo "part -> $trusted" GPG="$GPG --keyring $trusted" done fi fi -echo "COMMAND: $GPG" +#echo "COMMAND: $GPG" command="$1" if [ -z "$command" ]; then |