summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--methods/http.cc33
-rw-r--r--po/apt-all.pot104
2 files changed, 68 insertions, 69 deletions
diff --git a/methods/http.cc b/methods/http.cc
index 068d26978..d4e231fbe 100644
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -1164,25 +1164,24 @@ int HttpMethod::Loop()
URIDone(Res);
}
else
- {
- if (Server->ServerFd == -1)
+ {
+ if (Server->ServerFd == -1)
+ {
+ FailCounter++;
+ _error->Discard();
+ Server->Close();
+
+ if (FailCounter >= 2)
{
- FailCounter++;
- _error->Discard();
- Server->Close();
-
- if (FailCounter >= 2)
- {
- Fail(_("Connection failed"),true);
- FailCounter = 0;
- }
-
- QueueBack = Queue;
+ Fail(_("Connection failed"),true);
+ FailCounter = 0;
}
- else
- Fail(true);
- }
-
+
+ QueueBack = Queue;
+ }
+ else
+ Fail(true);
+ }
break;
}
diff --git a/po/apt-all.pot b/po/apt-all.pot
index d1d6c7622..c6483965e 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: 2007-07-11 23:19+0100\n"
+"POT-Creation-Date: 2007-07-14 16:12+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -156,7 +156,7 @@ msgstr ""
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2584 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr ""
@@ -554,7 +554,7 @@ msgstr ""
msgid "Y"
msgstr ""
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
@@ -713,11 +713,11 @@ msgstr ""
msgid "Internal error, Ordering didn't finish"
msgstr ""
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
msgid "Unable to lock the download directory"
msgstr ""
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2332
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr ""
@@ -746,7 +746,7 @@ msgstr ""
msgid "After unpacking %sB disk space will be freed.\n"
msgstr ""
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2186
#, c-format
msgid "Couldn't determine free space in %s"
msgstr ""
@@ -780,7 +780,7 @@ msgstr ""
msgid "Do you want to continue [Y/n]? "
msgstr ""
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2229
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr ""
@@ -789,7 +789,7 @@ msgstr ""
msgid "Some files failed to download"
msgstr ""
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2238
msgid "Download complete and in download only mode"
msgstr ""
@@ -915,7 +915,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
msgid "The following information may help to resolve the situation:"
msgstr ""
@@ -927,37 +927,37 @@ msgstr ""
msgid "Internal error, AllUpgrade broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1543
+#: cmdline/apt-get.cc:1544
#, c-format
msgid "Couldn't find task %s"
msgstr ""
-#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694
+#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
#, c-format
msgid "Couldn't find package %s"
msgstr ""
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1682
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:1711
+#: cmdline/apt-get.cc:1712
#, c-format
msgid "%s set to manual installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:1724
+#: cmdline/apt-get.cc:1725
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
-#: cmdline/apt-get.cc:1727
+#: cmdline/apt-get.cc:1728
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
-#: cmdline/apt-get.cc:1739
+#: cmdline/apt-get.cc:1740
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"
@@ -965,159 +965,159 @@ msgid ""
"or been moved out of Incoming."
msgstr ""
-#: cmdline/apt-get.cc:1747
+#: cmdline/apt-get.cc:1748
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:1755
+#: cmdline/apt-get.cc:1756
msgid "Broken packages"
msgstr ""
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1785
msgid "The following extra packages will be installed:"
msgstr ""
-#: cmdline/apt-get.cc:1873
+#: cmdline/apt-get.cc:1874
msgid "Suggested packages:"
msgstr ""
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Recommended packages:"
msgstr ""
-#: cmdline/apt-get.cc:1902
+#: cmdline/apt-get.cc:1903
msgid "Calculating upgrade... "
msgstr ""
-#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr ""
-#: cmdline/apt-get.cc:1910
+#: cmdline/apt-get.cc:1911
msgid "Done"
msgstr ""
-#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985
+#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
msgid "Internal error, problem resolver broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:2085
+#: cmdline/apt-get.cc:2086
msgid "Must specify at least one package to fetch source for"
msgstr ""
-#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2350
#, c-format
msgid "Unable to find a source package for %s"
msgstr ""
-#: cmdline/apt-get.cc:2164
+#: cmdline/apt-get.cc:2165
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2189
#, c-format
msgid "You don't have enough free space in %s"
msgstr ""
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2194
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:2196
+#: cmdline/apt-get.cc:2197
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:2202
+#: cmdline/apt-get.cc:2203
#, c-format
msgid "Fetch source %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2233
+#: cmdline/apt-get.cc:2234
msgid "Failed to fetch some archives."
msgstr ""
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2273
+#: cmdline/apt-get.cc:2274
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2275
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2291
+#: cmdline/apt-get.cc:2292
#, c-format
msgid "Build command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2310
+#: cmdline/apt-get.cc:2311
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:2326
+#: cmdline/apt-get.cc:2327
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2355
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:2374
+#: cmdline/apt-get.cc:2375
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:2426
+#: cmdline/apt-get.cc:2427
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:2478
+#: cmdline/apt-get.cc:2479
#, 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:2513
+#: cmdline/apt-get.cc:2514
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-#: cmdline/apt-get.cc:2538
+#: cmdline/apt-get.cc:2539
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:2552
+#: cmdline/apt-get.cc:2553
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:2556
+#: cmdline/apt-get.cc:2557
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:2588
+#: cmdline/apt-get.cc:2589
msgid "Supported modules:"
msgstr ""
-#: cmdline/apt-get.cc:2629
+#: cmdline/apt-get.cc:2630
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1857,15 +1857,15 @@ msgstr ""
msgid "Error reading from server"
msgstr ""
-#: methods/http.cc:1108
+#: methods/http.cc:1104
msgid "Bad header data"
msgstr ""
-#: methods/http.cc:1125
+#: methods/http.cc:1121 methods/http.cc:1176
msgid "Connection failed"
msgstr ""
-#: methods/http.cc:1216
+#: methods/http.cc:1228
msgid "Internal error"
msgstr ""