- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] New PM_TRANS_EVT_LDCONFIG events
by Nagy Gabor 17 Jul '08

17 Jul '08

From 49899f082d6ccd52dc8164a5856353dd2a12ee20 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Thu, 17 Jul 2008 12:15:29 +0200 Subject: [PATCH] New PM_TRANS_EVT_LDCONFIG events User will see "running ldconfig..." message. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/add.c | 2 ++ lib/libalpm/alpm.h | 4 ++++ lib/libalpm/remove.c | 2 ++ src/pacman/callback.c | 6 +++++- 4 files changed, 13 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 3b60fb3..12a315d 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -873,8 +873,10 @@ int _alpm_add_commit(pmtrans_t *trans, pmdb_t *db) } /* run ldconfig if it exists */ + EVENT(trans, PM_TRANS_EVT_LDCONFIG_START, NULL, NULL); _alpm_log(PM_LOG_DEBUG, "running \"ldconfig -r %s\"\n", handle->root); _alpm_ldconfig(handle->root); + EVENT(trans, PM_TRANS_EVT_LDCONFIG_DONE, NULL, NULL); return(0); } diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index fbef057..c61533a 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -338,6 +338,10 @@ typedef enum _pmtransevt_t { * to the callback, respectively. */ PM_TRANS_EVT_UPGRADE_DONE, + /** ldconfig will run */ + PM_TRANS_EVT_LDCONFIG_START, + /** ldconfig ran */ + PM_TRANS_EVT_LDCONFIG_DONE, /** Target package's integrity will be checked. */ PM_TRANS_EVT_INTEGRITY_START, /** Target package's integrity was checked. */ diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 864fafa..a5ee3f0 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -404,8 +404,10 @@ int _alpm_remove_commit(pmtrans_t *trans, pmdb_t *db) /* run ldconfig if it exists */ if(trans->type != PM_TRANS_TYPE_REMOVEUPGRADE) { + EVENT(trans, PM_TRANS_EVT_LDCONFIG_START, NULL, NULL); _alpm_log(PM_LOG_DEBUG, "running \"ldconfig -r %s\"\n", handle->root); _alpm_ldconfig(handle->root); + EVENT(trans, PM_TRANS_EVT_LDCONFIG_DONE, NULL, NULL); } return(0); diff --git a/src/pacman/callback.c b/src/pacman/callback.c index f968873..3bcf55e 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -159,7 +159,7 @@ void cb_trans_evt(pmtransevt_t event, void *data1, void *data2) { switch(event) { case PM_TRANS_EVT_CHECKDEPS_START: - printf(_("checking dependencies...\n")); + printf(_("checking dependencies...\n")); break; case PM_TRANS_EVT_FILECONFLICTS_START: if(config->noprogressbar) { @@ -230,6 +230,9 @@ void cb_trans_evt(pmtransevt_t event, void *data1, void *data2) case PM_TRANS_EVT_RETRIEVE_START: printf(_(":: Retrieving packages from %s...\n"), (char*)data1); break; + case PM_TRANS_EVT_LDCONFIG_START: + printf(_("running ldconfig...\n")); + break; /* all the simple done events, with fallthrough for each */ case PM_TRANS_EVT_FILECONFLICTS_DONE: case PM_TRANS_EVT_CHECKDEPS_DONE: @@ -238,6 +241,7 @@ void cb_trans_evt(pmtransevt_t event, void *data1, void *data2) case PM_TRANS_EVT_INTEGRITY_DONE: case PM_TRANS_EVT_DELTA_INTEGRITY_DONE: case PM_TRANS_EVT_DELTA_PATCHES_DONE: + case PM_TRANS_EVT_LDCONFIG_DONE: /* nothing */ break; } -- 1.5.6.3

1 1

[pacman-dev] {Translation} Update libpalm zh_CN.po
by 甘露(Lu Gan) 17 Jul '08

17 Jul '08

enjoy.

1 0

[pacman-dev] [Translation] Updated Italian translation
by Giovanni Scafora 16 Jul '08

16 Jul '08

Hi guys, here's updated Italian translations for pacman and libalpam projects. Thanks. -- Arch Linux Developer (voidnull) AUR & Pacman Italian Translations Microdia Developer http://www.archlinux.it

1 0

[pacman-dev] Updated Hungarian translation
by Nagy Gabor 16 Jul '08

16 Jul '08

Hi! Hungarian translation is attached. Bye

1 0

[pacman-dev] [translation] Updated DE-version
by Matthias Gorissen 16 Jul '08

16 Jul '08

Enjoy.

1 0

[pacman-dev] [Translation] Update for Simpilifiled Chinese
by 甘露(Lu Gan) 16 Jul '08

16 Jul '08

Done.

1 0

[pacman-dev] [PATCH] alpm_list_remove treat NULL needle as "nothing"
by Nagy Gabor 16 Jul '08

16 Jul '08

From c44fec0058d8a69d29eeb947698bfaf165a6a080 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Wed, 16 Jul 2008 15:57:08 +0200 Subject: [PATCH] alpm_list_remove treat NULL needle as "nothing" So if you want to remove NULL needle from a list, alpm_list_remove will return with "not found". Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/alpm_list.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/lib/libalpm/alpm_list.c b/lib/libalpm/alpm_list.c index 8756740..9889503 100644 --- a/lib/libalpm/alpm_list.c +++ b/lib/libalpm/alpm_list.c @@ -302,6 +302,10 @@ alpm_list_t SYMEXPORT *alpm_list_remove(alpm_list_t *haystack, const void *needl *data = NULL; } + if(needle == NULL) { + return(haystack); + } + while(i) { if(i->data == NULL) { continue; -- 1.5.6.2

2 2

[pacman-dev] [translation] spanish pacman 3.2 and libalpm files
by Juan Pablo Gonzalez T. 16 Jul '08

16 Jul '08

This is the spanish translation for the next release. greetings to everybody! -- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | Juan Pablo González Tognarelli | http://lacasadeljota.blogspot.com

1 0

[pacman-dev] [PATCH] Fix a possible segfault in alpm/remove.c
by Nagy Gabor 16 Jul '08

16 Jul '08

From 7aff060a6288b250d398fb47abcb2aa26f05a508 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Wed, 16 Jul 2008 15:27:37 +0200 Subject: [PATCH] Fix a possible segfault in alpm/remove.c Before removing a package from target list (in remove_prepare_keep_needed), we should check whether we have already removed it. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/remove.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 625abe6..864fafa 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -120,6 +120,9 @@ static void remove_prepare_keep_needed(pmtrans_t *trans, pmdb_t *db, pmdepmissing_t *miss = (pmdepmissing_t *)i->data; void *vpkg; pmpkg_t *pkg = _alpm_pkg_find(trans->packages, miss->causingpkg); + if(pkg == NULL) { + continue; + } trans->packages = alpm_list_remove(trans->packages, pkg, _alpm_pkg_cmp, &vpkg); pkg = vpkg; -- 1.5.6.2

1 0

[pacman-dev] Segmentation fault
by Nagy Gabor 16 Jul '08

16 Jul '08

I've just tested -Qqg with the following command, and I got a big segfault (debug.log attached): # LANG=C src/pacman/pacman.static -Rus `src/pacman/pacman.static -Qqg xorg gnome` --debug > debug.log # src/pacman/pacman.static -Qqg xorg gnome xf86-input-keyboard xf86-input-mouse xorg-fonts-75dpi xorg-server xorg-xinit xterm gnome-icon-theme gnome-mime-data Bye P.S.: This error appears with current pacman-git, too.

1 0