From f95080884ca4b9a952ef02057c0c62cf2228f79e Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Fri, 28 Jan 2011 11:58:21 -0600 Subject: [PATCH 1/2] Enable failure on server error for curl download command This will make a 404 a silent failure that returns an error code rather than 0 as was previously done, screwing up the logic used by pacman/libalpm to allow moving onto the next server on a failed download. Fixes FS#22630. Signed-off-by: Dan McGee --- etc/pacman.conf.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/pacman.conf.in b/etc/pacman.conf.in index 32071196..087e21c9 100644 --- a/etc/pacman.conf.in +++ b/etc/pacman.conf.in @@ -17,7 +17,7 @@ HoldPkg = pacman glibc # If upgrades are available for these packages they will be asked for first SyncFirst = pacman #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u -#XferCommand = /usr/bin/curl -C - %u > %o +#XferCommand = /usr/bin/curl -C - -f %u > %o #CleanMethod = KeepInstalled Architecture = auto From 272f7cf25e9a12268f23a6018000625630026434 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20B=C3=A4chler?= Date: Fri, 28 Jan 2011 21:45:17 +0100 Subject: [PATCH 2/2] libalpm: Fix a missing "nicht" (not) in German translation. Signed-off-by: Dan McGee --- lib/libalpm/po/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libalpm/po/de.po b/lib/libalpm/po/de.po index c1c6a0b8..c90d52a0 100644 --- a/lib/libalpm/po/de.po +++ b/lib/libalpm/po/de.po @@ -205,7 +205,7 @@ msgstr "Konnte Datei '%s' nicht von %s übertragen : %s\n" #, c-format msgid "resuming download of %s not possible; starting over\n" -msgstr "Kann den Download von %s wieder aufnehmen, starte neu\n" +msgstr "Kann den Download von %s nicht wieder aufnehmen, starte neu\n" #, c-format msgid "error writing to file '%s': %s\n"