diff options
| author | Travis Willard <travis@archlinux.org> | 2007-09-04 03:28:17 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2007-09-04 03:50:24 +0200 |
| commit | 824b7fd27b490e599025b38e629e53921df5883d (patch) | |
| tree | 5c1006c08102ffa2f543464d96fab71dd9d31b67 | |
| parent | b3a1619457fa6424570c90c0eaacbbf39fd9662c (diff) | |
| download | pacman-824b7fd27b490e599025b38e629e53921df5883d.tar.gz pacman-824b7fd27b490e599025b38e629e53921df5883d.tar.xz | |
Fix compile-time error with de.po, runtime error with db.c
One string in de.po differed pretty strongly with its translated version.
It may still be totally wrong as far as translations go, but it compiles
now. Get translater to check.
Also, ensure the proper dbpath gets set in the db when it's created.
Signed-off-by: Travis Willard <travis@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
| -rw-r--r-- | lib/libalpm/db.c | 6 | ||||
| -rw-r--r-- | lib/libalpm/po/de.po | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 86165066..09e146e6 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -783,7 +783,11 @@ pmdb_t *_alpm_db_register_sync(const char *treename) } } - db = _alpm_db_new(dbpath, treename); + /* Ensure the db gets the real path. */ + path[0] = '\0'; + snprintf(path, PATH_MAX, "%ssync/", dbpath); + + db = _alpm_db_new(path, treename); if(db == NULL) { RET_ERR(PM_ERR_DB_CREATE, NULL); } diff --git a/lib/libalpm/po/de.po b/lib/libalpm/po/de.po index d3e692b9..2b9eb692 100644 --- a/lib/libalpm/po/de.po +++ b/lib/libalpm/po/de.po @@ -174,7 +174,7 @@ msgstr "Datenbank-Pfad ist nicht definiert" #: lib/libalpm/deps.c:187 msgid "dependency cycle detected\n" -msgstr "Abhängigkeits-Zyklus entdeckt: %s" +msgstr "Abhängigkeits-Zyklus entdeckt\n" #: lib/libalpm/deps.c:646 #, c-format |