summaryrefslogtreecommitdiff
path: root/lib/libalpm
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-03-21 07:53:13 -0500
committerDan McGee <dan@archlinux.org>2011-03-21 07:53:13 -0500
commit0ff52b68452046d61c24649ec94886bd74faab45 (patch)
treea9960a6143d17aeedeb530f2fe57c6796966e205 /lib/libalpm
parentc67c864ffd50ec0e071b055897c4622eaa132fc2 (diff)
parentb0bb4f9024712adcee5e2baf6cebe73c966d7d7f (diff)
downloadpacman-0ff52b68452046d61c24649ec94886bd74faab45.tar.xz
Merge branch 'maint'
Conflicts due to change in return calling style. Conflicts: src/pacman/pacman.c src/pacman/sync.c
Diffstat (limited to 'lib/libalpm')
-rw-r--r--lib/libalpm/be_local.c2
-rw-r--r--lib/libalpm/package.c2
-rw-r--r--lib/libalpm/po/libalpm.pot8
3 files changed, 8 insertions, 4 deletions
diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c
index d023fcd7..82c1d591 100644
--- a/lib/libalpm/be_local.c
+++ b/lib/libalpm/be_local.c
@@ -995,10 +995,10 @@ pmdb_t *_alpm_db_register_local(void)
_alpm_log(PM_LOG_DEBUG, "registering local database\n");
db = _alpm_db_new("local", 1);
- db->ops = &local_db_ops;
if(db == NULL) {
RET_ERR(PM_ERR_DB_CREATE, NULL);
}
+ db->ops = &local_db_ops;
handle->db_local = db;
return db;
diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c
index 2acaa17f..445653ec 100644
--- a/lib/libalpm/package.c
+++ b/lib/libalpm/package.c
@@ -345,7 +345,7 @@ static void find_requiredby(pmpkg_t *pkg, pmdb_t *db, alpm_list_t **reqs)
pmpkg_t *cachepkg = i->data;
if(_alpm_dep_edge(cachepkg, pkg)) {
const char *cachepkgname = cachepkg->name;
- if(alpm_list_find_str(*reqs, cachepkgname) == 0) {
+ if(alpm_list_find_str(*reqs, cachepkgname) == NULL) {
*reqs = alpm_list_add(*reqs, strdup(cachepkgname));
}
}
diff --git a/lib/libalpm/po/libalpm.pot b/lib/libalpm/po/libalpm.pot
index ba88318b..b4a5da66 100644
--- a/lib/libalpm/po/libalpm.pot
+++ b/lib/libalpm/po/libalpm.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pacman 3.5.0\n"
"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-03-16 19:34-0500\n"
+"POT-Creation-Date: 2011-03-20 12:35-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"
@@ -188,7 +188,11 @@ msgid "could not determine mount point for file %s\n"
msgstr ""
#, c-format
-msgid "could not determine filesystem mount points"
+msgid "could not determine filesystem mount points\n"
+msgstr ""
+
+#, c-format
+msgid "could not determine root mount point %s\n"
msgstr ""
#, c-format