From 7a9b0e0f0611a47082e3ead71d53b63f84ce4000 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sun, 27 Mar 2011 21:39:13 -0500 Subject: Update pacman.pot with changed strings Signed-off-by: Dan McGee --- po/pacman.pot | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/po/pacman.pot b/po/pacman.pot index c27dff4b..3fb4a0c9 100644 --- a/po/pacman.pot +++ b/po/pacman.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: pacman 3.5.1\n" "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n" -"POT-Creation-Date: 2011-03-20 23:42-0500\n" +"POT-Creation-Date: 2011-03-27 21:37-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -338,18 +338,17 @@ msgid "" msgstr "" #, c-format -msgid " -n, --nosave remove configuration files as well\n" +msgid " -n, --nosave remove configuration files\n" msgstr "" #, c-format msgid "" -" -s, --recursive remove dependencies also (that won't break packages)\n" -" (-ss includes explicitly installed dependencies too)\n" +" -s, --recursive remove unnecessary dependencies\n" +" (-ss includes explicitly installed dependencies)\n" msgstr "" #, c-format -msgid "" -" -u, --unneeded remove unneeded packages (that won't break packages)\n" +msgid " -u, --unneeded remove unneeded packages\n" msgstr "" #, c-format @@ -489,7 +488,9 @@ msgid "" msgstr "" #, c-format -msgid " -d, --nodeps skip dependency checks\n" +msgid "" +" -d, --nodeps skip dependency version checks (-dd to skip all " +"checks)\n" msgstr "" #, c-format @@ -509,7 +510,7 @@ msgstr "" #, c-format msgid "" -" --print only print the targets instead of performing the " +" --print print the targets instead of performing the " "operation\n" msgstr "" @@ -585,10 +586,6 @@ msgstr "" msgid "only one operation may be used at a time\n" msgstr "" -#, c-format -msgid "no operation specified (use -h for help)\n" -msgstr "" - #, c-format msgid "invalid option\n" msgstr "" @@ -668,6 +665,10 @@ msgstr "" msgid "you cannot perform this operation unless you are root.\n" msgstr "" +#, c-format +msgid "no operation specified (use -h for help)\n" +msgstr "" + #, c-format msgid "no file was specified for --owns\n" msgstr "" @@ -1544,6 +1545,9 @@ msgstr "" msgid "%s does not exist or is not a directory." msgstr "" +msgid "%s is not a pacman database directory." +msgstr "" + msgid "You must have correct permissions to upgrade the database." msgstr "" -- cgit v1.2.3-55-g3dc8 From db722bb4b1c997b2ca0eaada0f582d6bc43ef978 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 28 Mar 2011 10:11:28 -0500 Subject: Update .mailmap file Signed-off-by: Dan McGee --- .mailmap | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.mailmap b/.mailmap index 1b13a60e..351ed023 100644 --- a/.mailmap +++ b/.mailmap @@ -6,10 +6,11 @@ Andres P Bryan Ischo Christos Nouskas Daenyth Blank -Daenyth Blank +Daenyth Blank 甘露(Gan Lu) Giovanni Scafora Jaroslaw Swierczynski +Jonathan Conder Juan Pablo González Tognarelli Juan Pablo González Tognarelli Manuel Tortosa -- cgit v1.2.3-55-g3dc8 From 6303d4920c3b3403f2296a9c885468496603737e Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 28 Mar 2011 10:31:08 -0500 Subject: Add initial 3.5.2 notes Signed-off-by: Dan McGee --- NEWS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/NEWS b/NEWS index 2e4133f9..f10c83c4 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,8 @@ VERSION DESCRIPTION ----------------------------------------------------------------------------- +3.5.2 - ensure we show correct missing dependency info (FS#23424) + - pacman usage/--help updates (FS#23433, FS#23369) + - makepkg: simplify log redirection and remove sync (FS#23378) 3.5.1 - don't error on unknown pacman.conf directives (FS#23055) - only read arguments from stdin if '-' is provided as target - fix case with ignore handling in argument list (FS#23342) -- cgit v1.2.3-55-g3dc8 From 1a8c792e8fb8ec2098553112bf02a97fdc96e06e Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 29 Mar 2011 02:20:54 -0500 Subject: Fix an outdated comment Signed-off-by: Dan McGee --- lib/libalpm/db.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index bf6df06e..d9ed331e 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -90,10 +90,7 @@ int SYMEXPORT alpm_db_unregister_all(void) /* Do not unregister a database if a transaction is on-going */ ASSERT(handle->trans == NULL, RET_ERR(PM_ERR_TRANS_NOT_NULL, -1)); - /* since the local DB is registered in alpm_initialize(), we'll be - * symmetrical and let the cleanup occur in alpm_release() */ - - /* and also sync ones */ + /* unregister all sync dbs */ for(i = handle->dbs_sync; i; i = i->next) { db = i->data; db->ops->unregister(db); -- cgit v1.2.3-55-g3dc8 From b6ecb2329be53ad394a33e732ee923d85a278911 Mon Sep 17 00:00:00 2001 From: Andrea Scarpino Date: Tue, 29 Mar 2011 17:43:07 +0200 Subject: call alpm_option_get_localdb once in syncfirst() Signed-off-by: Andrea Scarpino Signed-off-by: Dan McGee --- src/pacman/sync.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 13b65a8f..c56934b6 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -578,10 +578,11 @@ static int sync_list(alpm_list_t *syncs, alpm_list_t *targets) static alpm_list_t *syncfirst(void) { alpm_list_t *i, *res = NULL; + pmdb_t *db_local = alpm_option_get_localdb(); for(i = config->syncfirst; i; i = alpm_list_next(i)) { char *pkgname = alpm_list_getdata(i); - pmpkg_t *pkg = alpm_db_get_pkg(alpm_option_get_localdb(), pkgname); + pmpkg_t *pkg = alpm_db_get_pkg(db_local, pkgname); if(pkg == NULL) { continue; } -- cgit v1.2.3-55-g3dc8 From 287e8d356e8be8ae4af00e34e25d3f6727945952 Mon Sep 17 00:00:00 2001 From: Rémy Oudompheng Date: Mon, 28 Mar 2011 21:47:08 +0200 Subject: alpm/handle.c: ensure handle is not NULL before proceeding MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Many alpm_option_get/set_*() functions already check this and set pm_errno to the right value, but not all, so this improves consistency. Signed-off-by: Rémy Oudompheng Signed-off-by: Dan McGee --- lib/libalpm/handle.c | 23 +++++++++++++++++++++++ lib/libalpm/util.h | 4 ++++ 2 files changed, 27 insertions(+) diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index d4ebe82a..d8ce9fd2 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -302,6 +302,8 @@ int SYMEXPORT alpm_option_set_root(const char *root) ALPM_LOG_FUNC; + ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); + if(!root) { pm_errno = PM_ERR_WRONG_ARGS; return(-1); @@ -342,6 +344,7 @@ int SYMEXPORT alpm_option_set_dbpath(const char *dbpath) ALPM_LOG_FUNC; + ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); if(!dbpath) { pm_errno = PM_ERR_WRONG_ARGS; return(-1); @@ -380,6 +383,7 @@ int SYMEXPORT alpm_option_add_cachedir(const char *cachedir) ALPM_LOG_FUNC; + ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); if(!cachedir) { pm_errno = PM_ERR_WRONG_ARGS; return(-1); @@ -402,6 +406,7 @@ int SYMEXPORT alpm_option_add_cachedir(const char *cachedir) void SYMEXPORT alpm_option_set_cachedirs(alpm_list_t *cachedirs) { + ASSERT(handle != NULL, RET_ERR_VOID(PM_ERR_HANDLE_NULL)); if(handle->cachedirs) FREELIST(handle->cachedirs); if(cachedirs) handle->cachedirs = cachedirs; } @@ -411,6 +416,7 @@ int SYMEXPORT alpm_option_remove_cachedir(const char *cachedir) char *vdata = NULL; char *newcachedir; size_t cachedirlen; + ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); /* verify cachedir ends in a '/' */ cachedirlen = strlen(cachedir); if(cachedir[cachedirlen-1] != '/') { @@ -434,6 +440,7 @@ int SYMEXPORT alpm_option_set_logfile(const char *logfile) ALPM_LOG_FUNC; + ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); if(!logfile) { pm_errno = PM_ERR_WRONG_ARGS; return(-1); @@ -456,16 +463,19 @@ int SYMEXPORT alpm_option_set_logfile(const char *logfile) void SYMEXPORT alpm_option_set_usesyslog(int usesyslog) { + ASSERT(handle != NULL, RET_ERR_VOID(PM_ERR_HANDLE_NULL)); handle->usesyslog = usesyslog; } void SYMEXPORT alpm_option_add_noupgrade(const char *pkg) { + ASSERT(handle != NULL, RET_ERR_VOID(PM_ERR_HANDLE_NULL)); handle->noupgrade = alpm_list_add(handle->noupgrade, strdup(pkg)); } void SYMEXPORT alpm_option_set_noupgrades(alpm_list_t *noupgrade) { + ASSERT(handle != NULL, RET_ERR_VOID(PM_ERR_HANDLE_NULL)); if(handle->noupgrade) FREELIST(handle->noupgrade); if(noupgrade) handle->noupgrade = noupgrade; } @@ -473,6 +483,7 @@ void SYMEXPORT alpm_option_set_noupgrades(alpm_list_t *noupgrade) int SYMEXPORT alpm_option_remove_noupgrade(const char *pkg) { char *vdata = NULL; + ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); handle->noupgrade = alpm_list_remove_str(handle->noupgrade, pkg, &vdata); if(vdata != NULL) { FREE(vdata); @@ -483,11 +494,13 @@ int SYMEXPORT alpm_option_remove_noupgrade(const char *pkg) void SYMEXPORT alpm_option_add_noextract(const char *pkg) { + ASSERT(handle != NULL, RET_ERR_VOID(PM_ERR_HANDLE_NULL)); handle->noextract = alpm_list_add(handle->noextract, strdup(pkg)); } void SYMEXPORT alpm_option_set_noextracts(alpm_list_t *noextract) { + ASSERT(handle != NULL, RET_ERR_VOID(PM_ERR_HANDLE_NULL)); if(handle->noextract) FREELIST(handle->noextract); if(noextract) handle->noextract = noextract; } @@ -495,6 +508,7 @@ void SYMEXPORT alpm_option_set_noextracts(alpm_list_t *noextract) int SYMEXPORT alpm_option_remove_noextract(const char *pkg) { char *vdata = NULL; + ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); handle->noextract = alpm_list_remove_str(handle->noextract, pkg, &vdata); if(vdata != NULL) { FREE(vdata); @@ -505,11 +519,13 @@ int SYMEXPORT alpm_option_remove_noextract(const char *pkg) void SYMEXPORT alpm_option_add_ignorepkg(const char *pkg) { + ASSERT(handle != NULL, RET_ERR_VOID(PM_ERR_HANDLE_NULL)); handle->ignorepkg = alpm_list_add(handle->ignorepkg, strdup(pkg)); } void SYMEXPORT alpm_option_set_ignorepkgs(alpm_list_t *ignorepkgs) { + ASSERT(handle != NULL, RET_ERR_VOID(PM_ERR_HANDLE_NULL)); if(handle->ignorepkg) FREELIST(handle->ignorepkg); if(ignorepkgs) handle->ignorepkg = ignorepkgs; } @@ -517,6 +533,7 @@ void SYMEXPORT alpm_option_set_ignorepkgs(alpm_list_t *ignorepkgs) int SYMEXPORT alpm_option_remove_ignorepkg(const char *pkg) { char *vdata = NULL; + ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); handle->ignorepkg = alpm_list_remove_str(handle->ignorepkg, pkg, &vdata); if(vdata != NULL) { FREE(vdata); @@ -527,11 +544,13 @@ int SYMEXPORT alpm_option_remove_ignorepkg(const char *pkg) void SYMEXPORT alpm_option_add_ignoregrp(const char *grp) { + ASSERT(handle != NULL, RET_ERR_VOID(PM_ERR_HANDLE_NULL)); handle->ignoregrp = alpm_list_add(handle->ignoregrp, strdup(grp)); } void SYMEXPORT alpm_option_set_ignoregrps(alpm_list_t *ignoregrps) { + ASSERT(handle != NULL, RET_ERR_VOID(PM_ERR_HANDLE_NULL)); if(handle->ignoregrp) FREELIST(handle->ignoregrp); if(ignoregrps) handle->ignoregrp = ignoregrps; } @@ -539,6 +558,7 @@ void SYMEXPORT alpm_option_set_ignoregrps(alpm_list_t *ignoregrps) int SYMEXPORT alpm_option_remove_ignoregrp(const char *grp) { char *vdata = NULL; + ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); handle->ignoregrp = alpm_list_remove_str(handle->ignoregrp, grp, &vdata); if(vdata != NULL) { FREE(vdata); @@ -549,17 +569,20 @@ int SYMEXPORT alpm_option_remove_ignoregrp(const char *grp) void SYMEXPORT alpm_option_set_arch(const char *arch) { + ASSERT(handle != NULL, RET_ERR_VOID(PM_ERR_HANDLE_NULL)); if(handle->arch) FREE(handle->arch); if(arch) handle->arch = strdup(arch); } void SYMEXPORT alpm_option_set_usedelta(int usedelta) { + ASSERT(handle != NULL, RET_ERR_VOID(PM_ERR_HANDLE_NULL)); handle->usedelta = usedelta; } void SYMEXPORT alpm_option_set_checkspace(int checkspace) { + ASSERT(handle != NULL, RET_ERR_VOID(PM_ERR_HANDLE_NULL)); handle->checkspace = checkspace; } diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index 3232f004..c66e9881 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -57,6 +57,10 @@ #define ASSERT(cond, action) do { if(!(cond)) { action; } } while(0) +#define RET_ERR_VOID(err) do { pm_errno = (err); \ + _alpm_log(PM_LOG_DEBUG, "returning error %d from %s : %s\n", err, __func__, alpm_strerrorlast()); \ + return; } while(0) + #define RET_ERR(err, ret) do { pm_errno = (err); \ _alpm_log(PM_LOG_DEBUG, "returning error %d from %s : %s\n", err, __func__, alpm_strerrorlast()); \ return(ret); } while(0) -- cgit v1.2.3-55-g3dc8