August 2008 - Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.0-16-g9609c0f
by dan＠archlinux.org 20 Aug '08

20 Aug '08

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 9609c0f1351a73e06edcfda1494a41d66c51dcb5 (commit) via 6417ac129def4474270cf2716826a83615748068 (commit) via 729651a55473f6e64c4dc95888efbe2e4c76efa0 (commit) via 232b838a54e689800267e1b98ace207bd442b8cd (commit) via fb5c5086e123690a113c0e8dc85848aa2ba61f54 (commit) via a28b8e187fed67b92a0fb7aeba11b81ff5a24281 (commit) via 89c2c51964d5e4f297e767befb56a65c18dc3d6f (commit) via a23fc08758cbbc7aa861eee2f537d4e1048bb039 (commit) from 57bd8974c73571d827617f4df0a6917f13696493 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 9609c0f1351a73e06edcfda1494a41d66c51dcb5 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Thu Jul 31 16:53:28 2008 +0200 repo-add: add optdepends to the sync database. See FS#10630. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6417ac129def4474270cf2716826a83615748068 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Tue Jan 15 11:50:46 2008 +0100 repo-add: Fix whitespaces handling in variables. repo-add didn't handle whitespaces nicely in fields value, and this has hurt us several times, first with provision version (FS#9171) and then with optdepends (FS#10630), so it is time to fix it. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 729651a55473f6e64c4dc95888efbe2e4c76efa0 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sun Aug 17 21:26:49 2008 +0200 Remove an usused variable from alpm/util.c/_alpm_lckmk() Probably a tweakable "lockdb-retry" option was planned which is not implemented. (Now it should be implemented in front-end.) So now this variable was unused and caused a small memleak. (FREE(dir) was not reached in case of error.) Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 232b838a54e689800267e1b98ace207bd442b8cd Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Tue Aug 19 01:02:40 2008 +0200 libalpm/add.c : ensure the old pkg was fully loaded. This fixes FS#11218. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit fb5c5086e123690a113c0e8dc85848aa2ba61f54 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Wed Aug 13 15:34:29 2008 +0200 pacman.c: fix typo s/NoPassiveFTP/NoPassiveFtp This fixes FS#11203. The doc has always mentioned NoPassiveFtp, but an inconsistency was introduced with commit 76f816b9f764434d02e90207ee4656ebae2b6a8c when case sensitive comparision was introduced, and was only found after commit b3e6cf652c9e989badaf5499abb1d64c1a110927 which dropped the case insensitive comparison. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a28b8e187fed67b92a0fb7aeba11b81ff5a24281 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Wed Aug 13 23:32:52 2008 +0200 pacman.conf : add curl example for XferCommand. curl is likely to be available on the majority of systems and supports the file:// protocol. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 89c2c51964d5e4f297e767befb56a65c18dc3d6f Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Mon Aug 11 23:32:36 2008 +0200 pacman/callback.c : fix detection of totaldownload This fixes FS#11180. The usage of the total percent was detected like this : /* use disp_percent if it is not 0, else show bar_percent */ However, it is very possible that the total percent is 0 at the beginning, if the first packages downloaded are very small compared to the total download. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a23fc08758cbbc7aa861eee2f537d4e1048bb039 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Aug 12 01:26:39 2008 +1000 Fix error when sourcing profile script With the "set -e" property set, a failure when sourcing /etc/profile can cause makepkg to exit without error message. The bash-completion package activates this bug. Fixes FS#11179. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: etc/pacman.conf.in | 1 + lib/libalpm/add.c | 3 +++ lib/libalpm/util.c | 12 ++---------- scripts/makepkg.sh.in | 3 +++ scripts/repo-add.sh.in | 21 +++++++++++---------- src/pacman/callback.c | 4 ++-- src/pacman/pacman.c | 2 +- 7 files changed, 23 insertions(+), 23 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.2.0-16-g9609c0f
by dan＠archlinux.org 20 Aug '08

20 Aug '08

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, maint has been updated via 9609c0f1351a73e06edcfda1494a41d66c51dcb5 (commit) via 6417ac129def4474270cf2716826a83615748068 (commit) via 729651a55473f6e64c4dc95888efbe2e4c76efa0 (commit) via 232b838a54e689800267e1b98ace207bd442b8cd (commit) via fb5c5086e123690a113c0e8dc85848aa2ba61f54 (commit) via a28b8e187fed67b92a0fb7aeba11b81ff5a24281 (commit) via 89c2c51964d5e4f297e767befb56a65c18dc3d6f (commit) via a23fc08758cbbc7aa861eee2f537d4e1048bb039 (commit) from 57bd8974c73571d827617f4df0a6917f13696493 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 9609c0f1351a73e06edcfda1494a41d66c51dcb5 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Thu Jul 31 16:53:28 2008 +0200 repo-add: add optdepends to the sync database. See FS#10630. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6417ac129def4474270cf2716826a83615748068 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Tue Jan 15 11:50:46 2008 +0100 repo-add: Fix whitespaces handling in variables. repo-add didn't handle whitespaces nicely in fields value, and this has hurt us several times, first with provision version (FS#9171) and then with optdepends (FS#10630), so it is time to fix it. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 729651a55473f6e64c4dc95888efbe2e4c76efa0 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sun Aug 17 21:26:49 2008 +0200 Remove an usused variable from alpm/util.c/_alpm_lckmk() Probably a tweakable "lockdb-retry" option was planned which is not implemented. (Now it should be implemented in front-end.) So now this variable was unused and caused a small memleak. (FREE(dir) was not reached in case of error.) Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 232b838a54e689800267e1b98ace207bd442b8cd Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Tue Aug 19 01:02:40 2008 +0200 libalpm/add.c : ensure the old pkg was fully loaded. This fixes FS#11218. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit fb5c5086e123690a113c0e8dc85848aa2ba61f54 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Wed Aug 13 15:34:29 2008 +0200 pacman.c: fix typo s/NoPassiveFTP/NoPassiveFtp This fixes FS#11203. The doc has always mentioned NoPassiveFtp, but an inconsistency was introduced with commit 76f816b9f764434d02e90207ee4656ebae2b6a8c when case sensitive comparision was introduced, and was only found after commit b3e6cf652c9e989badaf5499abb1d64c1a110927 which dropped the case insensitive comparison. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a28b8e187fed67b92a0fb7aeba11b81ff5a24281 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Wed Aug 13 23:32:52 2008 +0200 pacman.conf : add curl example for XferCommand. curl is likely to be available on the majority of systems and supports the file:// protocol. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 89c2c51964d5e4f297e767befb56a65c18dc3d6f Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Mon Aug 11 23:32:36 2008 +0200 pacman/callback.c : fix detection of totaldownload This fixes FS#11180. The usage of the total percent was detected like this : /* use disp_percent if it is not 0, else show bar_percent */ However, it is very possible that the total percent is 0 at the beginning, if the first packages downloaded are very small compared to the total download. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a23fc08758cbbc7aa861eee2f537d4e1048bb039 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Aug 12 01:26:39 2008 +1000 Fix error when sourcing profile script With the "set -e" property set, a failure when sourcing /etc/profile can cause makepkg to exit without error message. The bash-completion package activates this bug. Fixes FS#11179. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: etc/pacman.conf.in | 1 + lib/libalpm/add.c | 3 +++ lib/libalpm/util.c | 12 ++---------- scripts/makepkg.sh.in | 3 +++ scripts/repo-add.sh.in | 21 +++++++++++---------- src/pacman/callback.c | 4 ++-- src/pacman/pacman.c | 2 +- 7 files changed, 23 insertions(+), 23 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Remove an usused variable from alpm/util.c/_alpm_lckmk()
by Nagy Gabor 17 Aug '08

17 Aug '08

From 7e7e2b74ff03dc0656879ed9ae6f171a82194ea4 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sun, 17 Aug 2008 21:26:49 +0200 Subject: [PATCH] Remove an usused variable from alpm/util.c/_alpm_lckmk() Probably a tweakable "lockdb-retry" option was planned which is not implemented. (Now it should be implemented in front-end.) So now this variable was unused and caused a small memleak. (FREE(dir) was not reached in case of error.) Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/util.c | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 2847db7..b26c970 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -241,7 +241,7 @@ char *_alpm_strreplace(const char *str, const char *needle, const char *replace) /* Create a lock file */ int _alpm_lckmk() { - int fd, count = 0; + int fd; char *dir, *ptr; const char *file = alpm_option_get_lockfile(); @@ -252,17 +252,9 @@ int _alpm_lckmk() *ptr = '\0'; } _alpm_makepath(dir); - - while((fd = open(file, O_WRONLY | O_CREAT | O_EXCL, 0000)) == -1 && errno == EACCES) { - if(++count < 1) { - sleep(1); - } else { - return(-1); - } - } - FREE(dir); + fd = open(file, O_WRONLY | O_CREAT | O_EXCL, 0000); return(fd > 0 ? fd : -1); } -- 1.5.6.5

1 0

[pacman-dev] [PATCH] Move -Sp implementation to the front-end
by Nagy Gabor 17 Aug '08

17 Aug '08

From b6518fd82b2d3fb9dd0dc2541eb5010f2ac80870 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sun, 17 Aug 2008 18:42:35 +0200 Subject: [PATCH] Move -Sp implementation to the front-end This patch kills one of our hackish pseudo transactions: PRINTURIS. (The other one is -Sw) From now on, front-end must not call trans_commit in case of -Sp, it should print the uris of target packages "by hand" instead. PRINTURIS flag was removed, NOCONFLICT flag can be passed to skip conflict checks. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/alpm.h | 8 ++------ lib/libalpm/sync.c | 46 +++++++++++++++++++--------------------------- src/pacman/callback.c | 3 --- src/pacman/conf.h | 1 + src/pacman/pacman.c | 3 ++- src/pacman/sync.c | 41 +++++++++++++++++++++++++---------------- 6 files changed, 49 insertions(+), 53 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 4ea03a9..71c08e4 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -282,7 +282,7 @@ typedef enum _pmtransflag_t { PM_TRANS_FLAG_DOWNLOADONLY = 0x200, PM_TRANS_FLAG_NOSCRIPTLET = 0x400, PM_TRANS_FLAG_NOCONFLICTS = 0x800, - PM_TRANS_FLAG_PRINTURIS = 0x1000, + /* 0x1000 flag can go here */ PM_TRANS_FLAG_NEEDED = 0x2000, PM_TRANS_FLAG_ALLEXPLICIT = 0x4000, PM_TRANS_FLAG_UNNEEDED = 0x8000, @@ -364,14 +364,10 @@ typedef enum _pmtransevt_t { * A line of text is passed to the callback. */ PM_TRANS_EVT_SCRIPTLET_INFO, - /** Print URI. - * The database's URI and the package's filename are passed to the callback. - */ - PM_TRANS_EVT_PRINTURI, /** Files will be downloaded from a repository. * The repository's tree name is passed to the callback. */ - PM_TRANS_EVT_RETRIEVE_START, + PM_TRANS_EVT_RETRIEVE_START } pmtransevt_t; /*@}*/ diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 7a577a1..d85c2dc 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -486,7 +486,7 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync } /* We don't care about conflicts if we're just printing uris */ - if(!(trans->flags & (PM_TRANS_FLAG_NOCONFLICTS | PM_TRANS_FLAG_PRINTURIS))) { + if(!(trans->flags & PM_TRANS_FLAG_NOCONFLICTS)) { /* check for inter-conflicts and whatnot */ EVENT(trans, PM_TRANS_EVT_INTERCONFLICTS_START, NULL, NULL); @@ -826,32 +826,27 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) fname = alpm_pkg_get_filename(spkg); ASSERT(fname != NULL, RET_ERR(PM_ERR_PKG_INVALID_NAME, -1)); - if(trans->flags & PM_TRANS_FLAG_PRINTURIS) { - EVENT(trans, PM_TRANS_EVT_PRINTURI, (char *)alpm_db_get_url(current), - (char *)fname); - } else { - if(spkg->download_size != 0) { - alpm_list_t *delta_path = spkg->delta_path; - if(delta_path) { - alpm_list_t *dlts = NULL; - - for(dlts = delta_path; dlts; dlts = dlts->next) { - pmdelta_t *d = dlts->data; - - if(d->download_size != 0) { - /* add the delta filename to the download list if - * it's not in the cache */ - files = alpm_list_add(files, strdup(d->delta)); - } - - /* keep a list of the delta files for md5sums */ - deltas = alpm_list_add(deltas, d); + if(spkg->download_size != 0) { + alpm_list_t *delta_path = spkg->delta_path; + if(delta_path) { + alpm_list_t *dlts = NULL; + + for(dlts = delta_path; dlts; dlts = dlts->next) { + pmdelta_t *d = dlts->data; + + if(d->download_size != 0) { + /* add the delta filename to the download list if + * it's not in the cache */ + files = alpm_list_add(files, strdup(d->delta)); } - } else { - /* not using deltas, so add the file to the download list */ - files = alpm_list_add(files, strdup(fname)); + /* keep a list of the delta files for md5sums */ + deltas = alpm_list_add(deltas, d); } + + } else { + /* not using deltas, so add the file to the download list */ + files = alpm_list_add(files, strdup(fname)); } } } @@ -868,9 +863,6 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) FREELIST(files); } } - if(trans->flags & PM_TRANS_FLAG_PRINTURIS) { - return(0); - } /* clear out value to let callback know we are done */ if(handle->totaldlcb) { diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 30e34a9..9f4b52b 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -226,9 +226,6 @@ void cb_trans_evt(pmtransevt_t event, void *data1, void *data2) case PM_TRANS_EVT_SCRIPTLET_INFO: printf("%s", (char*)data1); break; - case PM_TRANS_EVT_PRINTURI: - printf("%s/%s\n", (char*)data1, (char*)data2); - break; case PM_TRANS_EVT_RETRIEVE_START: printf(_(":: Retrieving packages from %s...\n"), (char*)data1); break; diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 9d2318d..8ea6662 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -57,6 +57,7 @@ typedef struct __config_t { unsigned short op_s_sync; unsigned short op_s_search; unsigned short op_s_upgrade; + unsigned short op_s_printuris; unsigned short group; pmtransflag_t flags; diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 8b8698b..b828cfb 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -461,7 +461,8 @@ static int parseargs(int argc, char *argv[]) case 'o': config->op_q_owns = 1; break; case 'p': config->op_q_isfile = 1; - config->flags |= PM_TRANS_FLAG_PRINTURIS; + config->op_s_printuris = 1; + config->flags |= PM_TRANS_FLAG_NOCONFLICTS; break; case 'q': config->quiet = 1; diff --git a/src/pacman/sync.c b/src/pacman/sync.c index ae3f523..7bb9ada 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -666,23 +666,32 @@ static int sync_trans(alpm_list_t *targets) goto cleanup; } - if(!(alpm_trans_get_flags() & PM_TRANS_FLAG_PRINTURIS)) { - int confirm; + /* Step 3: actually perform the operation */ + if(config->op_s_printuris) { + /* print uris */ + alpm_list_t *i; + for(i = packages; i; i = alpm_list_next(i)) { + pmpkg_t *pkg = alpm_sync_get_pkg((pmsyncpkg_t *)alpm_list_getdata(i)); + pmdb_t *db = alpm_pkg_get_db(pkg); + printf("%s/%s\n", alpm_db_get_url(db), alpm_pkg_get_filename(pkg)); + } + /* we are done */ + goto cleanup; + } - display_synctargets(packages); - printf("\n"); + display_synctargets(packages); + printf("\n"); - if(config->op_s_downloadonly) { - confirm = yesno(1, _("Proceed with download?")); - } else { - confirm = yesno(1, _("Proceed with installation?")); - } - if(!confirm) { - goto cleanup; - } - }/* else 'print uris' requested. We're done at this point */ + int confirm; + if(config->op_s_downloadonly) { + confirm = yesno(1, _("Proceed with download?")); + } else { + confirm = yesno(1, _("Proceed with installation?")); + } + if(!confirm) { + goto cleanup; + } - /* Step 3: actually perform the installation */ if(alpm_trans_commit(&data) == -1) { pm_fprintf(stderr, PM_LOG_ERROR, _("failed to commit transaction (%s)\n"), alpm_strerrorlast()); @@ -739,7 +748,7 @@ int pacman_sync(alpm_list_t *targets) alpm_list_t *sync_dbs = NULL; /* Display only errors with -Sp and -Sw operations */ - if(config->flags & (PM_TRANS_FLAG_DOWNLOADONLY | PM_TRANS_FLAG_PRINTURIS)) { + if((config->flags & PM_TRANS_FLAG_DOWNLOADONLY) || config->op_s_printuris) { config->logmask &= ~PM_LOG_WARNING; } @@ -811,7 +820,7 @@ int pacman_sync(alpm_list_t *targets) } alpm_list_t *targs = alpm_list_strdup(targets); - if(!(config->flags & (PM_TRANS_FLAG_DOWNLOADONLY | PM_TRANS_FLAG_PRINTURIS))) { + if(!(config->flags & PM_TRANS_FLAG_DOWNLOADONLY) && !config->op_s_printuris) { /* check for newer versions of packages to be upgraded first */ alpm_list_t *packages = syncfirst(); if(packages) { -- 1.5.6.5

2 2

[pacman-dev] [PATCH] New public alpm_pkg_get_db function
by Nagy Gabor 17 Aug '08

17 Aug '08

From 88ca14b8e7d4c53d886bc7397adbbf6c8a338c5d Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sun, 17 Aug 2008 18:32:39 +0200 Subject: [PATCH] New public alpm_pkg_get_db function This function returns with the origin database of a package. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/alpm.h | 1 + lib/libalpm/package.c | 9 +++++++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index fbef057..4ea03a9 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -218,6 +218,7 @@ alpm_list_t *alpm_pkg_get_deltas(pmpkg_t *pkg); alpm_list_t *alpm_pkg_get_replaces(pmpkg_t *pkg); alpm_list_t *alpm_pkg_get_files(pmpkg_t *pkg); alpm_list_t *alpm_pkg_get_backup(pmpkg_t *pkg); +pmdb_t *alpm_pkg_get_db(pmpkg_t *pkg); void *alpm_pkg_changelog_open(pmpkg_t *pkg); size_t alpm_pkg_changelog_read(void *ptr, size_t size, const pmpkg_t *pkg, const void *fp); diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 49238ea..4ed908f 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -409,6 +409,15 @@ alpm_list_t SYMEXPORT *alpm_pkg_get_backup(pmpkg_t *pkg) return pkg->backup; } +pmdb_t SYMEXPORT *alpm_pkg_get_db(pmpkg_t *pkg) +{ + /* Sanity checks */ + ASSERT(pkg != NULL, return(NULL)); + ASSERT(pkg->origin == PKG_FROM_CACHE, return(NULL)); + + return(pkg->origin_data.db); +} + /** * Open a package changelog for reading. Similar to fopen in functionality, * except that the returned 'file stream' could really be from an archive -- 1.5.6.5

1 0

[pacman-dev] alpm_option_set_logcb(), an example of usage
by Imanol Celaya 15 Aug '08

15 Aug '08

Hi, I'm developing pyalpm at the moment(new codebase, not related to 2005 pyalpm) and I don't really see any example of usage of alpm_option_set_logcb() on pacman.c file there is alpm_option_set_logcb(cb_log); but I can't find where is cb_log declared, so I have no clue about what does that function do(as I haven't neither found where is the actual code of that function, only that is declared on alpm.h)

4 6

Re: [pacman-dev] Splitting packages with makepkg
by Marc - A. Dahlhaus [ Administration | Westermann GmbH ] 15 Aug '08

15 Aug '08

Hello, Am Freitag, den 15.08.2008, 12:57 +1000 schrieb Allan McRae: > Henning Garus wrote: > > Now my (maybe) more useful comments: > > > > This looks very much like the PKGBUILD I already had in my head after > > reading the other threads and thinking about splitting packages. While > > thinking I became unsure about two things: > > > > 1) Is one build function enough? In an older thread someone (Aaron I > > think) talked about building packages with different configurations > > from one packagebuild. I am not sure you can do this with one build > > function. What you could do, is using the package functions to do this, > > this would go against the "minimal fakeroot usage" thing, but is > > probably sufficent for something rather uncommon. An alternative would > > be, checking for build_pkgname functions and calling them if they are > > defined. > > > > > Two build functions sounds like it would require two install functions > (as each package would probably have to add a conflict to the other) > which is really two PKGBUILDs. I am not against adding this at the same > time but I would need to be convinced with a (useful) real world example > here. How about this: A "build_${pkgname}" function should be executed for every (including the first) package (if exists for the first of course) after executing the "build" function (if it exists) before the execution of any other "build_${pkgname}" function without executing the packaging of contents "build" may have written to ${startdir}/pkg: (0. -> build) if exist 1. -> build_pkg1 2. -> pack ${startdir}/pkg_pkg1 3. -> build_pkg2 4. -> pack ${startdir}/pkg_pkg2 If there is no build_pkg1 function: 1. -> build 2. -> pack ${startdir}/pkg 3. -> build_pkg2 4. -> pack ${startdir}/pkg_pkg2 That way it is up to the packager if a main build function should be used to build everything and install things in separate functions to override eg. depends or just use separated build functions for every split-package. A real world example would be php5 which could be build for cli, cgi and mod_php usage for apache2. Also many modules for php5 could be packed up separately to minimize the depends for the main packages down to the ones really needed for basic operation. I'll try to adapt my php PKGBUILD to the proposed format over the weekend. > > 2) This is a bit implementation specific, but I think it is important. > > Is there any way, except parsing the PKGBUILD file, to get the contents > > of all depends arrays, to check the depends before building the package? > > If not, overriding depends could be problematic. > > > > As Xavier pointed out, I think that there would a big use of makedepends > and overriding of depends in the individual package functions. In fact, > I am not sure what the depends array at the top of the PKGBUILD actually > means with split packages... I would expect that the global array should represent all needed dependencies to build every spilt-package (it would be the easiest way to get a working "makepkg -s"). OT: I found out that export have to be used to override vars inside of functions that are already defined outside. It could be a bash configuration problem here on my box but i hope someone can verify this behavior. Marc

1 0

[pacman-dev] Splitting packages with makepkg
by Allan McRae 15 Aug '08

15 Aug '08

Hi all, Now that pacman 3.2 is out the door and the initial bug fixes appear done, I am going to work on adding the package splitting feature to makepkg. So the time has come for some input on the prototype PKGBUILD for splitting packages again. We discussed this a couple of months ago on this list (http://archlinux.org/pipermail/pacman-dev/2008-June/012123.html). From that discussion I have come up with a PKGBUILD prototype which I like (prototype 1 at http://dev.archlinux.org/~allan/splitpkg.html) which is inspired by the KDEMod method but has a few significant differences. This is a call for comments or other prototypes to implement this function. Some "rules" to help us all with this: 1) If submitting a new idea, attach a complete prototype (based on the one distributed with pacman) so we can see all details of how the packaging is done. Add notes if necessary. Point out the advantages of your method. 2) Note that the ability to separate the building and packaging stages of a PKGBUILD is going to be added to makepkg so that fakeroot is used for the smallest amount of time. Any new prototype should account for this. 3) No comments about how splitting packages is bad and this will be the ruin of Arch. Arch does not favor package splitting in its main repos and this will not change that fact. Allan

3 5

[pacman-dev] [PATCH] Add autotools magic for pactests
by Henning Garus 14 Aug '08

14 Aug '08

Added a Makefile.am for the pactest/tests dir. This is a blatant ripoff of scripts/Makefile.am, which replaces predefined expressions in NAME.py.in pactests with configure variables. This can be used to write pactests which consider compile time options. Signed-off-by: Henning Garus <henning.garus(a)gmail.com> --- Makefile.am | 2 +- configure.ac | 1 + pactest/tests/Makefile.am | 19 +++++++++++++++++++ 3 files changed, 21 insertions(+), 1 deletions(-) create mode 100644 pactest/tests/Makefile.am diff --git a/Makefile.am b/Makefile.am index ea3b0e0..4f2ea83 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = lib/libalpm src/util src/pacman scripts etc po pactest contrib +SUBDIRS = lib/libalpm src/util src/pacman scripts etc po pactest pactest/tests contrib if WANT_DOC SUBDIRS += doc endif diff --git a/configure.ac b/configure.ac index 9f4209b..5c09e2e 100644 --- a/configure.ac +++ b/configure.ac @@ -342,6 +342,7 @@ doc/Makefile etc/Makefile po/Makefile.in pactest/Makefile +pactest/tests/Makefile contrib/Makefile Makefile ]) diff --git a/pactest/tests/Makefile.am b/pactest/tests/Makefile.am new file mode 100644 index 0000000..4590e3c --- /dev/null +++ b/pactest/tests/Makefile.am @@ -0,0 +1,19 @@ +CONFTESTS = $(patsubst %py.in,%py,$(wildcard *.py.in)) + +noinst_SCRIPTS = $(CONFTESTS) + +CLEANFILES = $(CONFTESTS) + +edit = sed \ + -e 's|@LIBS[@]|$(LIBS)|g' \ + -e 's|@configure_input[@]|Generated from $@.in; do not edit by hand.|g' + + +$(CONFTESTS): Makefile + rm -f $@ $@.tmp + test -f $(srcdir)/$@.in && $(edit) $(srcdir)/$@.in >$@.tmp || true + test -f $@.tmp || false + chmod a-w $@.tmp + mv $@.tmp $@ + +# vim:set ts=2 sw=2 noet: -- 1.5.6.5

1 0

[pacman-dev] minor issue in pacman.conf
by Xavier 13 Aug '08

13 Aug '08

Patch attached.

2 2