From 005eab0a080925d0d6f780d751f9019dafbafc64 Mon Sep 17 00:00:00 2001
From: Lukas Fleischer <archlinux@cryptocrack.de>
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 <archlinux@cryptocrack.de>
Signed-off-by: Dan McGee <dan@archlinux.org>
---
 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-24-g4f1b


From 67445334e71eaf6138561eee8e5561733a59fc69 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Mon, 8 Aug 2011 16:38:59 -0500
Subject: Update translations from transifex

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 lib/libalpm/po/fi.po       | 17 +++++++++++------
 lib/libalpm/po/libalpm.pot |  4 ++--
 2 files changed, 13 insertions(+), 8 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 <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#   <larso@gmx.com>, 2011.
+# Larso <larso@gmx.com>, 2011.
+# Jesse Jaara <jesse.jaara@gmail.com>, 2011.
+# apuasi <kaannokset.hellberg@gmail.com>, 2011.
+# Dan McGee <dpmcgee@gmail.com>, 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 <kaannokset.hellberg@gmail.com>\n"
-"Language-Team: Finnish <None>\n"
+"POT-Creation-Date: 2011-08-08 16:37-0500\n"
+"PO-Revision-Date: 2011-07-28 22:14+0000\n"
+"Last-Translator: Larso <larso@gmx.com>\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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-- 
cgit v1.2.3-24-g4f1b