From 005eab0a080925d0d6f780d751f9019dafbafc64 Mon Sep 17 00:00:00 2001 From: Lukas Fleischer Date: Sun, 24 Jul 2011 13:52:05 +0200 Subject: libalpm: Set ret correctly in download_internal() Immediately jump to the cleanup code after setting the return code to -1 in case rename() fails. Otherwise, it will be reset to 0 right after we leave the if branch. Signed-off-by: Lukas Fleischer Signed-off-by: Dan McGee --- lib/libalpm/dload.c | 1 + 1 file changed, 1 insertion(+) (limited to 'lib') diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index a98d84ac..e3d30f23 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -308,6 +308,7 @@ static int download_internal(const char *url, const char *localpath, _alpm_log(PM_LOG_ERROR, _("could not rename %s to %s (%s)\n"), tempfile, destfile, strerror(errno)); ret = -1; + goto cleanup; } ret = 0; -- cgit v1.2.3-70-g09d2 From 67445334e71eaf6138561eee8e5561733a59fc69 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 8 Aug 2011 16:38:59 -0500 Subject: Update translations from transifex Signed-off-by: Dan McGee --- lib/libalpm/po/fi.po | 17 +++++++++++------ lib/libalpm/po/libalpm.pot | 4 ++-- po/de.po | 18 +++++++++++------- po/fi.po | 13 ++++++++----- po/pacman.pot | 4 ++-- 5 files changed, 34 insertions(+), 22 deletions(-) (limited to 'lib') diff --git a/lib/libalpm/po/fi.po b/lib/libalpm/po/fi.po index 4e662b1f..09909f56 100644 --- a/lib/libalpm/po/fi.po +++ b/lib/libalpm/po/fi.po @@ -1,16 +1,21 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Pacman Development Team # This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. # +# , 2011. +# Larso , 2011. +# Jesse Jaara , 2011. +# apuasi , 2011. +# Dan McGee , 2011. msgid "" msgstr "" "Project-Id-Version: Arch Linux Pacman package manager\n" "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n" -"POT-Creation-Date: 2011-04-18 11:23-0500\n" -"PO-Revision-Date: 2011-04-18 11:10+0000\n" -"Last-Translator: apuasi \n" -"Language-Team: Finnish \n" +"POT-Creation-Date: 2011-08-08 16:37-0500\n" +"PO-Revision-Date: 2011-07-28 22:14+0000\n" +"Last-Translator: Larso \n" +"Language-Team: Finnish (http://www.transifex.net/projects/p/archlinux-pacman/" +"team/fi/)\n" "Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -327,7 +332,7 @@ msgstr "toimenpidettä ei ole alustettu" #, c-format msgid "duplicate target" -msgstr "" +msgstr "kohde on useampaan kertaan" #, c-format msgid "transaction not prepared" diff --git a/lib/libalpm/po/libalpm.pot b/lib/libalpm/po/libalpm.pot index 4c69f8cb..768ea204 100644 --- a/lib/libalpm/po/libalpm.pot +++ b/lib/libalpm/po/libalpm.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: pacman 3.5.2\n" +"Project-Id-Version: pacman 3.5.3\n" "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n" -"POT-Creation-Date: 2011-04-18 11:23-0500\n" +"POT-Creation-Date: 2011-08-08 16:37-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/de.po b/po/de.po index bc00b7b4..8aa6aef3 100644 --- a/po/de.po +++ b/po/de.po @@ -1,16 +1,20 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Pacman Development Team # This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. # +# Mineo , 2011. +# Simon Schneider , 2011. +# Matthias Gorissen , 2011. +# Dan McGee , 2011. msgid "" msgstr "" "Project-Id-Version: Arch Linux Pacman package manager\n" "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n" -"POT-Creation-Date: 2011-04-18 11:23-0500\n" -"PO-Revision-Date: 2011-04-28 09:05+0000\n" -"Last-Translator: Mineo \n" -"Language-Team: German \n" +"POT-Creation-Date: 2011-08-08 16:32-0500\n" +"PO-Revision-Date: 2011-06-30 08:35+0000\n" +"Last-Translator: jakob \n" +"Language-Team: German (http://www.transifex.net/projects/p/archlinux-pacman/" +"team/de/)\n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -179,7 +183,7 @@ msgstr "" #, c-format msgid "%s: install reason has been set to 'explicitly installed'\n" msgstr "" -"%s: Installations-Grund wurde auf \"Ausdrücklich installiert\" gesetzt?\n" +"%s: Installations-Grund wurde auf \"Ausdrücklich installiert\" gesetzt\n" #, c-format msgid "Explicitly installed" @@ -1448,7 +1452,7 @@ msgid "" " --holdver Prevent automatic version bumping for development %ss" msgstr "" " --holdver Verhindert die automatische Erhöhung der Versionsnummer " -"für die Entwickler-Vesrion %ss" +"für die Entwickler-Version %ss" msgid " --nocheck Do not run the check() function in the %s" msgstr " --nocheck Unterdrückt die check()-Funktion in %s" diff --git a/po/fi.po b/po/fi.po index 5881f51e..c606289c 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1,15 +1,18 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Pacman Development Team # This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. # +# Larso , 2011. +# Jesse Jaara , 2011. +# apuasi , 2011. +# Dan McGee , 2011. msgid "" msgstr "" "Project-Id-Version: Arch Linux Pacman package manager\n" "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n" -"POT-Creation-Date: 2011-04-18 11:23-0500\n" -"PO-Revision-Date: 2011-05-11 14:51+0000\n" -"Last-Translator: Larso \n" +"POT-Creation-Date: 2011-08-08 16:32-0500\n" +"PO-Revision-Date: 2011-06-14 11:10+0000\n" +"Last-Translator: Huulivoide \n" "Language-Team: Finnish (http://www.transifex.net/projects/p/archlinux-pacman/" "team/fi/)\n" "Language: fi\n" @@ -839,7 +842,7 @@ msgstr "Säilytettävät paketit:\n" #, c-format msgid " All locally installed packages\n" -msgstr " Kaikki paikalliset paketit\n" +msgstr " Kaikki asennetut paketit\n" #, c-format msgid " All current sync database packages\n" diff --git a/po/pacman.pot b/po/pacman.pot index c7451c1c..a3fcc78d 100644 --- a/po/pacman.pot +++ b/po/pacman.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: pacman 3.5.2\n" +"Project-Id-Version: pacman 3.5.3\n" "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n" -"POT-Creation-Date: 2011-04-18 11:23-0500\n" +"POT-Creation-Date: 2011-08-08 16:32-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" -- cgit v1.2.3-70-g09d2