From 4a1778448653283970ea094822738ddbed8f7825 Mon Sep 17 00:00:00 2001 From: Matt Zimmerman Date: Tue, 14 Dec 2004 13:25:29 +0000 Subject: Merge from mvo Patches applied: * michael.vogt@canonical.com--2004--laptop/apt--authentication-mvo--0--patch-2 * ignore errors when a Packages.bz2/Sources.bz2 can't be found and try with Packages.gz/Sources.gz again * michael.vogt@canonical.com--2004--laptop/apt--mvo--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-34 * michael.vogt@canonical.com--2004--laptop/apt--mvo--0--patch-1 * merged matt's tree (with all those apt-authentication changes) * michael.vogt@canonical.com--2004--laptop/apt--mvo--0--patch-2 don't display a error if a bzip2 package can not be downloaded, just ignore (Ign) it * michael.vogt@canonical.com--2004--laptop/apt--mvo--0--patch-3 * "chmod 755 cmdline/apt-key", changed version to 0.6.27ubuntu1 * michael.vogt@canonical.com--2004--laptop/apt--mvo--0--patch-4 * fix for a stupid merge error (from 0.5->0.6) * michael.vogt@canonical.com--2004--laptop/apt--mvo--0--patch-5 * unstable should really be hoary --- apt-pkg/acquire-item.cc | 26 ++++++--- apt-pkg/acquire-item.h | 2 +- cmdline/apt-key | 0 configure.in | 2 +- debian/changelog | 14 +++++ debian/rules | 2 +- po/apt-all.pot | 151 +++++++++++++++++++++++++----------------------- 7 files changed, 114 insertions(+), 83 deletions(-) mode change 100644 => 100755 cmdline/apt-key diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index ada640936..f40c6a50d 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -137,7 +137,7 @@ void pkgAcquire::Item::Rename(string From,string To) instantiated to fetch the revision file */ pkgAcqIndex::pkgAcqIndex(pkgAcquire *Owner, string URI,string URIDesc,string ShortDesc, - string ExpectedMD5) : + string ExpectedMD5, string comprExt) : Item(Owner), RealURI(URI), ExpectedMD5(ExpectedMD5) { Decompression = false; @@ -146,11 +146,17 @@ pkgAcqIndex::pkgAcqIndex(pkgAcquire *Owner, DestFile = _config->FindDir("Dir::State::lists") + "partial/"; DestFile += URItoFileName(URI); - // Create the item - if(FileExists("/usr/bin/bzip2")) - Desc.URI = URI + ".bz2"; - else - Desc.URI = URI + ".gz"; + if(comprExt.empty()) + { + // autoselect + if(FileExists("/usr/bin/bzip2")) + Desc.URI = URI + ".bz2"; + else + Desc.URI = URI + ".gz"; + } else { + Desc.URI = URI + comprExt; + } + Desc.Description = URIDesc; Desc.Owner = this; Desc.ShortDesc = ShortDesc; @@ -179,7 +185,13 @@ void pkgAcqIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf) // no .bz2 found, retry with .gz if(Desc.URI.substr(Desc.URI.size()-3,Desc.URI.size()-1) == "bz2") { Desc.URI = Desc.URI.substr(0,Desc.URI.size()-3) + "gz"; - QueueURI(Desc); + + // retry with a gzip one + new pkgAcqIndex(Owner, RealURI, Desc.Description,Desc.ShortDesc, + ExpectedMD5, string(".gz")); + Status = StatDone; + Complete = false; + Dequeue(); return; } diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h index 2b122cffb..ea71153d5 100644 --- a/apt-pkg/acquire-item.h +++ b/apt-pkg/acquire-item.h @@ -103,7 +103,7 @@ class pkgAcqIndex : public pkgAcquire::Item virtual string DescURI() {return RealURI + ".gz";}; pkgAcqIndex(pkgAcquire *Owner,string URI,string URIDesc, - string ShortDesct, string ExpectedMD5); + string ShortDesct, string ExpectedMD5, string compressExt=""); }; struct IndexTarget diff --git a/cmdline/apt-key b/cmdline/apt-key old mode 100644 new mode 100755 diff --git a/configure.in b/configure.in index 43ad48c33..ba80075d3 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.6.27") +AC_DEFINE_UNQUOTED(VERSION,"0.6.27ubuntu2") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index 8dbf5cc8f..a3d16fc4a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +apt (0.6.27ubuntu2) hoary; urgency=low + + * fixed a bug in the rule file that happend during the big 0.5->0.6 merge + + -- Michael Vogt Tue, 14 Dec 2004 12:14:25 +0100 + +apt (0.6.27ubuntu1) hoary; urgency=low + + * chmod 755 /usr/bin/apt-key + * don't display a error when a apt-get update don't find a + Packages.bz2/Sources.bz2 file + + -- Michael Vogt Mon, 13 Dec 2004 18:40:21 +0100 + apt (0.6.27) hoary; urgency=low * Merge apt--authentication--0 branch diff --git a/debian/rules b/debian/rules index caf7bacfd..1fbbb61d1 100755 --- a/debian/rules +++ b/debian/rules @@ -223,7 +223,7 @@ apt: build debian/shlibs.local dh_fixperms -p$@ dh_makeshlibs -p$@ -m$(LIBAPTPKG_MAJOR) -V '$(LIBAPTPKG_PROVIDE)' dh_installdeb -p$@ - dh_shlibdeps -p$@ -l`pwd`/debian/apt/usr/lib:`pwd`/debian/$@/usr/lib -- -Ldebian/shlibs.local.apt-utils + dh_shlibdeps -p$@ -l`pwd`/debian/apt/usr/lib:`pwd`/debian/$@/usr/lib -- -Ldebian/shlibs.local.apt dh_gencontrol -p$@ -u -Vlibapt-pkg:provides=$(LIBAPTPKG_PROVIDE) dh_md5sums -p$@ dh_builddeb -p$@ diff --git a/po/apt-all.pot b/po/apt-all.pot index bb60a995c..fc1768ecc 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-12-01 19:50+0100\n" +"POT-Creation-Date: 2004-12-14 12:20+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -148,7 +148,7 @@ msgstr "" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:731 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 -#: cmdline/apt-get.cc:2312 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "" @@ -424,7 +424,12 @@ msgstr "" msgid " %s maintainer is %s not %s\n" msgstr "" -#: ftparchive/contents.cc:346 ftparchive/contents.cc:377 +#: ftparchive/contents.cc:317 +#, c-format +msgid "Internal Error, could not locate member %s" +msgstr "" + +#: ftparchive/contents.cc:353 ftparchive/contents.cc:384 msgid "realloc - Failed to allocate memory" msgstr "" @@ -518,7 +523,7 @@ msgstr "" msgid "Y" msgstr "" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1474 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -665,11 +670,11 @@ msgstr "" msgid "Packages need to be removed but Remove is disabled." msgstr "" -#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1801 +#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1849 cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "" @@ -723,7 +728,7 @@ msgstr "" msgid "Do you want to continue? [Y/n] " msgstr "" -#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1333 cmdline/apt-get.cc:1958 +#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" @@ -732,7 +737,7 @@ msgstr "" msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1967 +#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968 msgid "Download complete and in download only mode" msgstr "" @@ -832,37 +837,37 @@ msgstr "" msgid "Unable to lock the list directory" msgstr "" -#: cmdline/apt-get.cc:1352 +#: cmdline/apt-get.cc:1353 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1372 msgid "Internal Error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1461 cmdline/apt-get.cc:1497 +#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:1484 +#: cmdline/apt-get.cc:1485 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1514 +#: cmdline/apt-get.cc:1515 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1517 +#: cmdline/apt-get.cc:1518 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1530 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -870,149 +875,149 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1537 +#: cmdline/apt-get.cc:1538 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" "that package should be filed." msgstr "" -#: cmdline/apt-get.cc:1542 +#: cmdline/apt-get.cc:1543 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1545 +#: cmdline/apt-get.cc:1546 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:1571 +#: cmdline/apt-get.cc:1572 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1642 +#: cmdline/apt-get.cc:1643 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1644 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:1663 +#: cmdline/apt-get.cc:1664 msgid "Calculating Upgrade... " msgstr "" -#: cmdline/apt-get.cc:1666 methods/ftp.cc:702 methods/connect.cc:99 +#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99 msgid "Failed" msgstr "" -#: cmdline/apt-get.cc:1671 +#: cmdline/apt-get.cc:1672 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:1844 +#: cmdline/apt-get.cc:1845 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:1871 cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:1918 +#: cmdline/apt-get.cc:1919 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:1923 +#: cmdline/apt-get.cc:1924 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:1927 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1932 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Fetch Source %s\n" msgstr "" -#: cmdline/apt-get.cc:1963 +#: cmdline/apt-get.cc:1964 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:1991 +#: cmdline/apt-get.cc:1992 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2003 +#: cmdline/apt-get.cc:2004 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2020 +#: cmdline/apt-get.cc:2021 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2039 +#: cmdline/apt-get.cc:2040 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2055 +#: cmdline/apt-get.cc:2056 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2083 +#: cmdline/apt-get.cc:2084 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2103 +#: cmdline/apt-get.cc:2104 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2155 +#: cmdline/apt-get.cc:2156 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2207 +#: cmdline/apt-get.cc:2208 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:2242 +#: cmdline/apt-get.cc:2243 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2267 +#: cmdline/apt-get.cc:2268 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2281 +#: cmdline/apt-get.cc:2282 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2285 +#: cmdline/apt-get.cc:2286 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:2318 msgid "Supported Modules:" msgstr "" -#: cmdline/apt-get.cc:2358 +#: cmdline/apt-get.cc:2359 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1136,23 +1141,23 @@ msgstr "" msgid "Merging Available information" msgstr "" -#: apt-inst/contrib/extracttar.cc:116 +#: apt-inst/contrib/extracttar.cc:117 msgid "Failed to create pipes" msgstr "" -#: apt-inst/contrib/extracttar.cc:141 +#: apt-inst/contrib/extracttar.cc:143 msgid "Failed to exec gzip " msgstr "" -#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 +#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 msgid "Corrupted archive" msgstr "" -#: apt-inst/contrib/extracttar.cc:193 +#: apt-inst/contrib/extracttar.cc:195 msgid "Tar Checksum failed, archive corrupted" msgstr "" -#: apt-inst/contrib/extracttar.cc:296 +#: apt-inst/contrib/extracttar.cc:298 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "" @@ -1375,30 +1380,30 @@ msgstr "" msgid "Error parsing MD5. Offset %lu" msgstr "" -#: apt-inst/deb/debfile.cc:55 +#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "" -#: apt-inst/deb/debfile.cc:72 +#: apt-inst/deb/debfile.cc:52 #, c-format -msgid "Internal Error, could not locate member %s" +msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" msgstr "" -#: apt-inst/deb/debfile.cc:104 +#: apt-inst/deb/debfile.cc:112 #, c-format msgid "Couldn't change to %s" msgstr "" -#: apt-inst/deb/debfile.cc:125 +#: apt-inst/deb/debfile.cc:138 msgid "Internal Error, could not locate member" msgstr "" -#: apt-inst/deb/debfile.cc:158 +#: apt-inst/deb/debfile.cc:171 msgid "Failed to locate a valid control file" msgstr "" -#: apt-inst/deb/debfile.cc:243 +#: apt-inst/deb/debfile.cc:256 msgid "Unparsible control file" msgstr "" @@ -1490,7 +1495,7 @@ msgstr "" msgid "Server closed the connection" msgstr "" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:452 methods/rsh.cc:190 +#: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:452 msgid "Read error" msgstr "" @@ -1579,7 +1584,7 @@ msgstr "" msgid "Query" msgstr "" -#: methods/ftp.cc:1104 +#: methods/ftp.cc:1106 msgid "Unable to invoke " msgstr "" @@ -1723,6 +1728,14 @@ msgstr "" msgid "Internal error" msgstr "" +#: methods/rsh.cc:264 +msgid "File Not Found" +msgstr "" + +#: methods/rsh.cc:330 +msgid "Connection closed prematurely" +msgstr "" + #: apt-pkg/contrib/mmap.cc:82 msgid "Can't mmap an empty file" msgstr "" @@ -2246,31 +2259,31 @@ msgstr "" msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:223 apt-pkg/acquire-item.cc:881 +#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:893 msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:695 +#: apt-pkg/acquire-item.cc:707 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:748 +#: apt-pkg/acquire-item.cc:760 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:784 +#: apt-pkg/acquire-item.cc:796 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:871 +#: apt-pkg/acquire-item.cc:883 msgid "Size mismatch" msgstr "" @@ -2278,11 +2291,3 @@ msgstr "" #, c-format msgid "Vendor block %s contains no fingerprint" msgstr "" - -#: methods/rsh.cc:264 -msgid "File Not Found" -msgstr "" - -#: methods/rsh.cc:330 -msgid "Connection closed prematurely" -msgstr "" -- cgit v1.2.3