- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] trans.c: create transaction prior to checking DB version
by Dave Reisner 15 May '11

15 May '11

The addition of the DB version check introduces a lag time between the lockfile creation and the transaction initialization. In cases where the local DB is large enough and/or the user's disk is slow enough, this time is significant enough that its possible for a user to send a SIGINT and leave behind a db.lck file. Signed-off-by: Dave Reisner <d(a)falconindy.com> --- lib/libalpm/trans.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index 4e88668..af1bcce 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -116,15 +116,6 @@ int SYMEXPORT alpm_trans_init(pmtransflag_t flags, } } - /* check database version */ - db_version = _alpm_db_version(handle->db_local); - if(db_version < required_db_version) { - _alpm_log(PM_LOG_ERROR, - _("%s database version is too old\n"), handle->db_local->treename); - remove_lock(handle); - RET_ERR(PM_ERR_DB_VERSION, -1); - } - trans = _alpm_trans_new(); if(trans == NULL) { RET_ERR(PM_ERR_MEMORY, -1); @@ -138,6 +129,16 @@ int SYMEXPORT alpm_trans_init(pmtransflag_t flags, handle->trans = trans; + /* check database version */ + db_version = _alpm_db_version(handle->db_local); + if(db_version < required_db_version) { + _alpm_log(PM_LOG_ERROR, + _("%s database version is too old\n"), handle->db_local->treename); + remove_lock(handle); + _alpm_trans_free(trans); + RET_ERR(PM_ERR_DB_VERSION, -1); + } + return 0; } -- 1.7.5.1

2 1

[pacman-dev] configurable shell for install scripts
by Allan McRae 12 May '11

12 May '11

Hi, I thought I'd run this past people on this list before I spent the two weeks that this would take me to figure out how to implement it! This is motivated by experience packaging for Arch. Install scriptlets are written assuming /bin/sh is bash, which is true on a default system. But some people want to change their /bin/sh to (e.g.) dash. As pacman uses the default shell (as given by /bin/sh) to run install scriptlets, pointing /bin/sh at dash may cause failures when bash specific features are used. So I thought, why not manually specify the shell for install scriptlets in pacman.conf. Something like "INSTALL_SHELL=/bin/sh" by default. Then _alpm_runscriptlet would call something like "<shell> -c ". <scriptlet path> && <function>" (which works for bash, dash, zsh, pdksh). Comments? Allan

5 6

[pacman-dev] [PATCH] patch for remove prefix "::" from messages
by Vojtěch Gondžala 12 May '11

12 May '11

This is an simple patch for remove prefix "::" from messages, all magic chars are in function `info_msg' like "warning: : and "error: " prefixes in `pm_*printf'. It will be better for translators to, and it's first step prepare for colorize output support for pacman. --- src/pacman/callback.c | 32 +++++++++++++++++--------------- src/pacman/remove.c | 4 ++-- src/pacman/sync.c | 18 +++++++++--------- src/pacman/upgrade.c | 10 +++++----- src/pacman/util.c | 16 ++++++++++++++++ src/pacman/util.h | 1 + 6 files changed, 50 insertions(+), 31 deletions(-) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index e3feea1..263a8cd 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -227,7 +227,7 @@ void cb_trans_evt(pmtransevt_t event, void *data1, void *data2) printf("%s", (char*)data1); break; case PM_TRANS_EVT_RETRIEVE_START: - printf(_(":: Retrieving packages from %s...\n"), (char*)data1); + info_msg(_("Retrieving packages from %s...\n"), (char*)data1); break; case PM_TRANS_EVT_DISKSPACE_START: if(config->noprogressbar) { @@ -256,29 +256,30 @@ void cb_trans_conv(pmtransconv_t event, void *data1, void *data2, { switch(event) { case PM_TRANS_CONV_INSTALL_IGNOREPKG: - *response = yesno(_(":: %s is in IgnorePkg/IgnoreGroup. Install anyway?"), - alpm_pkg_get_name(data1)); + info_msg(_("%s is in IgnorePkg/IgnoreGroup\n"), alpm_pkg_get_name(data1)); + *response = yesno(_("Install %s anyway?"), alpm_pkg_get_name(data1)); break; case PM_TRANS_CONV_REPLACE_PKG: - *response = yesno(_(":: Replace %s with %s/%s?"), + info_msg(_("%s replace %s/%s\n"), alpm_pkg_get_name(data1), (char *)data3, alpm_pkg_get_name(data2)); + *response = yesno(_("Replace %s?"), alpm_pkg_get_name(data1)); break; case PM_TRANS_CONV_CONFLICT_PKG: /* data parameters: target package, local package, conflict (strings) */ /* print conflict only if it contains new information */ if(strcmp(data1, data3) == 0 || strcmp(data2, data3) == 0) { - *response = noyes(_(":: %s and %s are in conflict. Remove %s?"), + info_msg(_("%s and %s are in conflict\n"), (char *)data1, - (char *)data2, (char *)data2); + *response = noyes(_("Remove %s?"), (char *)data2); } else { - *response = noyes(_(":: %s and %s are in conflict (%s). Remove %s?"), + info_msg(_("%s and %s are in conflict (%s)\n"), (char *)data1, (char *)data2, - (char *)data3, - (char *)data2); + (char *)data3); + *response = noyes(_("Remove %s?"), (char *)data2); } break; case PM_TRANS_CONV_REMOVE_PKGS: @@ -289,9 +290,9 @@ void cb_trans_conv(pmtransconv_t event, void *data1, void *data2, namelist = alpm_list_add(namelist, (char *)alpm_pkg_get_name(i->data)); } - printf(_n( - ":: The following package cannot be upgraded due to unresolvable dependencies:\n", - ":: The following packages cannot be upgraded due to unresolvable dependencies:\n", + info_msg(_n( + "The following package cannot be upgraded due to unresolvable dependencies:\n", + "The following packages cannot be upgraded due to unresolvable dependencies:\n", alpm_list_count(namelist))); list_display(" ", namelist); printf("\n"); @@ -304,16 +305,17 @@ void cb_trans_conv(pmtransconv_t event, void *data1, void *data2, break; case PM_TRANS_CONV_LOCAL_NEWER: if(!config->op_s_downloadonly) { - *response = yesno(_(":: %s-%s: local version is newer. Upgrade anyway?"), + info_msg(_("%s-%s: local version is newer\n"), alpm_pkg_get_name(data1), alpm_pkg_get_version(data1)); + *response = yesno(_("Upgrade %s anyway?"), alpm_pkg_get_name(data1)); } else { *response = 1; } break; case PM_TRANS_CONV_CORRUPTED_PKG: - *response = yesno(_(":: File %s is corrupted. Do you want to delete it?"), - (char *)data1); + info_msg(_("File %s is corrupted\n"), (char *)data1); + *response = yesno(_("Delete corrupted file?")); break; } if(config->noask) { diff --git a/src/pacman/remove.c b/src/pacman/remove.c index 52f92ec..07a5aec 100644 --- a/src/pacman/remove.c +++ b/src/pacman/remove.c @@ -79,7 +79,7 @@ int pacman_remove(alpm_list_t *targets) case PM_ERR_PKG_INVALID_ARCH: for(i = data; i; i = alpm_list_next(i)) { char *pkg = alpm_list_getdata(i); - printf(_(":: package %s does not have a valid architecture\n"), pkg); + info_msg(_("package %s does not have a valid architecture\n"), pkg); } break; case PM_ERR_UNSATISFIED_DEPS: @@ -87,7 +87,7 @@ int pacman_remove(alpm_list_t *targets) pmdepmissing_t *miss = alpm_list_getdata(i); pmdepend_t *dep = alpm_miss_get_dep(miss); char *depstring = alpm_dep_compute_string(dep); - printf(_(":: %s: requires %s\n"), alpm_miss_get_target(miss), + info_msg(_("%s: requires %s\n"), alpm_miss_get_target(miss), depstring); free(depstring); } diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 278f15e..579f6b4 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -644,7 +644,7 @@ static int sync_trans(alpm_list_t *targets) } if(config->op_s_upgrade) { - printf(_(":: Starting full system upgrade...\n")); + info_msg(_("Starting full system upgrade...\n")); alpm_logaction("starting full system upgrade\n"); if(alpm_sync_sysupgrade(config->op_s_upgrade >= 2) == -1) { pm_fprintf(stderr, PM_LOG_ERROR, "%s\n", alpm_strerrorlast()); @@ -662,7 +662,7 @@ static int sync_trans(alpm_list_t *targets) case PM_ERR_PKG_INVALID_ARCH: for(i = data; i; i = alpm_list_next(i)) { char *pkg = alpm_list_getdata(i); - printf(_(":: package %s does not have a valid architecture\n"), pkg); + info_msg(_("package %s does not have a valid architecture\n"), pkg); } break; case PM_ERR_UNSATISFIED_DEPS: @@ -670,7 +670,7 @@ static int sync_trans(alpm_list_t *targets) pmdepmissing_t *miss = alpm_list_getdata(i); pmdepend_t *dep = alpm_miss_get_dep(miss); char *depstring = alpm_dep_compute_string(dep); - printf(_(":: %s: requires %s\n"), alpm_miss_get_target(miss), + info_msg(_("%s: requires %s\n"), alpm_miss_get_target(miss), depstring); free(depstring); } @@ -683,9 +683,9 @@ static int sync_trans(alpm_list_t *targets) const char *reason = alpm_conflict_get_reason(conflict); /* only print reason if it contains new information */ if(strcmp(package1, reason) == 0 || strcmp(package2, reason) == 0) { - printf(_(":: %s and %s are in conflict\n"), package1, package2); + info_msg(_("%s and %s are in conflict\n"), package1, package2); } else { - printf(_(":: %s and %s are in conflict (%s)\n"), package1, package2, reason); + info_msg(_("%s and %s are in conflict (%s)\n"), package1, package2, reason); } } break; @@ -806,7 +806,7 @@ int pacman_sync(alpm_list_t *targets) if(config->op_s_sync) { /* grab a fresh package list */ - printf(_(":: Synchronizing package databases...\n")); + info_msg(_("Synchronizing package databases...\n")); alpm_logaction("synchronizing package lists\n"); if(!sync_synctree(config->op_s_sync, sync_dbs)) { return(1); @@ -855,10 +855,10 @@ int pacman_sync(alpm_list_t *targets) alpm_list_t *tmp = NULL; if(config->op_s_upgrade || (tmp = alpm_list_diff(targets, packages, (alpm_list_fn_cmp)strcmp))) { alpm_list_free(tmp); - printf(_(":: The following packages should be upgraded first :\n")); + info_msg(_("The following packages should be upgraded first :\n")); list_display(" ", packages); - if(yesno(_(":: Do you want to cancel the current operation\n" - ":: and upgrade these packages now?"))) { + if(yesno(_("Do you want to cancel the current operation\n" + "and upgrade these packages now?"))) { FREELIST(targs); targs = packages; config->flags = 0; diff --git a/src/pacman/upgrade.c b/src/pacman/upgrade.c index 92a477e..e3c9629 100644 --- a/src/pacman/upgrade.c +++ b/src/pacman/upgrade.c @@ -88,7 +88,7 @@ int pacman_upgrade(alpm_list_t *targets) case PM_ERR_PKG_INVALID_ARCH: for(i = data; i; i = alpm_list_next(i)) { char *pkg = alpm_list_getdata(i); - printf(_(":: package %s does not have a valid architecture\n"), pkg); + info_msg(_("package %s does not have a valid architecture\n"), pkg); } break; case PM_ERR_UNSATISFIED_DEPS: @@ -98,9 +98,9 @@ int pacman_upgrade(alpm_list_t *targets) char *depstring = alpm_dep_compute_string(dep); /* TODO indicate if the error was a virtual package or not: - * :: %s: requires %s, provided by %s + * %s: requires %s, provided by %s */ - printf(_(":: %s: requires %s\n"), alpm_miss_get_target(miss), + info_msg(_("%s: requires %s\n"), alpm_miss_get_target(miss), depstring); free(depstring); } @@ -113,9 +113,9 @@ int pacman_upgrade(alpm_list_t *targets) const char *reason = alpm_conflict_get_reason(conflict); /* only print reason if it contains new information */ if(strcmp(package1, reason) == 0 || strcmp(package2, reason) == 0) { - printf(_(":: %s and %s are in conflict\n"), package1, package2); + info_msg(_("%s and %s are in conflict\n"), package1, package2); } else { - printf(_(":: %s and %s are in conflict (%s)\n"), package1, package2, reason); + info_msg(_("%s and %s are in conflict (%s)\n"), package1, package2, reason); } } break; diff --git a/src/pacman/util.c b/src/pacman/util.c index d91d1d4..e4974b0 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -750,6 +750,22 @@ int noyes(char *fmt, ...) return(ret); } +int info_msg(char *fmt, ...) +{ + int ret; + va_list args; + + /* print a prefix to the message */ + printf(":: "); + + /* print the message using va_arg list */ + va_start(args, fmt); + ret = printf(fmt, args); + va_end(args); + + return(ret); +} + int pm_printf(pmloglevel_t level, const char *format, ...) { int ret; diff --git a/src/pacman/util.h b/src/pacman/util.h index a5c382d..0a5e10e 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -61,6 +61,7 @@ void display_optdepends(pmpkg_t *pkg); void print_packages(const alpm_list_t *packages); int yesno(char *fmt, ...); int noyes(char *fmt, ...); +int info_msg(char *fmt, ...); int pm_printf(pmloglevel_t level, const char *format, ...) __attribute__((format(printf,2,3))); int pm_fprintf(FILE *stream, pmloglevel_t level, const char *format, ...) __attribute__((format(printf,3,4))); int pm_asprintf(char **string, const char *format, ...); -- 1.7.3.5

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.2-177-g70cf454
by dan＠archlinux.org 10 May '11

10 May '11

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 70cf4546d6d35ef9ef2751f37853cde679c88aa7 (commit) via 2cd79bc85305974ac0268838ec9e9a8e0fa42139 (commit) via dd95c96b8ae4e9a585ce185131b25c34e471af65 (commit) via 0fbdfd02dc3d4cf3814b01d18913fa2919102ded (commit) via 6b308d89f97340c16e3e805afcc80d70a1c5eebe (commit) via f2d696cd515ef0365d9708eb3d1caa439e2cc790 (commit) via 42ab639bf715cbacb3598b6c42388ba4bbb2d3d4 (commit) via b14c5477e5e4483352d304a1e97de5922948b934 (commit) via 3045f09ef49d775fec5e772f5f8b894e31388fbf (commit) via 73c74355abf0f6759a2f9a9219ea571444b6495a (commit) via bda208f82325812749396efacf828066947872e5 (commit) via d360153bc6d4368e18a6d2e169d7d667e1640992 (commit) via 47de7973fd501e5253386c50178ec47e9f4c4c8e (commit) from 500a6f576d56c3152567df6c740998439b0e33b2 (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 70cf4546d6d35ef9ef2751f37853cde679c88aa7 Author: Dan McGee <dan(a)archlinux.org> Date: Tue May 10 17:39:22 2011 -0500 Don't balk on .sig files being invalid in package cache Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 2cd79bc85305974ac0268838ec9e9a8e0fa42139 Author: Dan McGee <dan(a)archlinux.org> Date: Thu May 5 15:23:36 2011 -0500 Remove sync DB reregister check It's your own damn fault if you do this, and this code is remnants from an old time when we weren't very good at coding. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit dd95c96b8ae4e9a585ce185131b25c34e471af65 Author: Dan McGee <dan(a)archlinux.org> Date: Thu May 5 15:16:52 2011 -0500 Rework config parsing to reduce variable duplication This removes the need to strdup() the section name at every decent into an Include statement, as well as having duplicate DB pointers around that are never used independently. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0fbdfd02dc3d4cf3814b01d18913fa2919102ded Author: Dan McGee <dan(a)archlinux.org> Date: Thu May 5 15:01:35 2011 -0500 Refactor VerifySig option value parsing into standalone method Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6b308d89f97340c16e3e805afcc80d70a1c5eebe Merge: f2d696c b14c547 Author: Dan McGee <dan(a)archlinux.org> Date: Thu May 5 13:25:10 2011 -0500 Merge branch 'maint' commit f2d696cd515ef0365d9708eb3d1caa439e2cc790 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Oct 18 16:37:55 2010 -0500 Don't null-check handle lists before setting This needlessly prevents the easiest way available of clearing any of these values. We can also do the same for the 'arch' value. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 42ab639bf715cbacb3598b6c42388ba4bbb2d3d4 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Oct 18 16:39:04 2010 -0500 Improve database server API Currently we have one call that has all sorts of crazy behavior and doesn't make a whole lot of sense. Go from one method to the normal four methods we have for all of our other lists we use in the library to make it a lot easier for a frontend to manipulate server lists. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3045f09ef49d775fec5e772f5f8b894e31388fbf Author: Dan McGee <dan(a)archlinux.org> Date: Mon May 2 17:25:45 2011 -0500 Logging changes during DB load The switch from FUNCTION to DEBUG was ill-advised inside the local database load. Instead, add a DEBUG level logger to both local and sync database loads that shows the number of packages processed. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 73c74355abf0f6759a2f9a9219ea571444b6495a Author: Dan McGee <dan(a)archlinux.org> Date: Thu May 5 11:42:42 2011 -0500 Make config parsing a two-part affair This ensures we call any alpm_option type functions before registering databases, making sure all paths and other defaults (e.g. sig verification levels) have been set first. This will ensure we can continue to allow crazy config files where [options] doesn't come first. The diffstat on this commit is misleading; view with -w/--ignore-all-space to get a better idea of what needed to be touched. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit bda208f82325812749396efacf828066947872e5 Author: Dan McGee <dan(a)archlinux.org> Date: Thu May 5 11:12:49 2011 -0500 Move parseconfig to conf.c Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d360153bc6d4368e18a6d2e169d7d667e1640992 Author: Dan McGee <dan(a)archlinux.org> Date: Thu May 5 11:10:44 2011 -0500 pactest: run with root in /tmp and clean up automatically This moves the generated root/ directory into /tmp, or at least a path returned by tempfile.mkdtemp(), by default. This can make test runs significantly faster if done when /tmp is a tmpfs. If you are debugging a failed test, use the new --keep-root option to not clean up and pactest will print the location of the generated root/ test directory. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 47de7973fd501e5253386c50178ec47e9f4c4c8e Author: Dan McGee <dan(a)archlinux.org> Date: Thu May 5 09:58:00 2011 -0500 dload: ensure we return success if we found files on any mirror We were erroring out in the case where a first (possibly bogus) mirror would cause the download process to return a failure code, even though subsequent servers had the file. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: Makefile.am | 1 - lib/libalpm/alpm.h | 15 +- lib/libalpm/be_local.c | 8 +- lib/libalpm/be_sync.c | 23 +-- lib/libalpm/db.c | 96 ++++++-- lib/libalpm/handle.c | 16 +- lib/libalpm/sync.c | 4 +- src/pacman/conf.c | 624 ++++++++++++++++++++++++++++++++++++++++++++++++ src/pacman/conf.h | 2 + src/pacman/pacman.c | 593 +--------------------------------------------- src/pacman/pacman.h | 5 +- src/pacman/sync.c | 23 ++- test/pacman/pactest.py | 34 ++- 13 files changed, 790 insertions(+), 654 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.5.2-8-gb14c547
by dan＠archlinux.org 10 May '11

10 May '11

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 b14c5477e5e4483352d304a1e97de5922948b934 (commit) from 8fd9037cfd8836db7dd35ba0e8825ba86c4e4688 (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 b14c5477e5e4483352d304a1e97de5922948b934 Author: Dan McGee <dan(a)archlinux.org> Date: Mon May 2 16:25:47 2011 -0500 Ensure populate error return codes are consistent It must be -1 to differentiate it from a number of packages loaded count. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/be_local.c | 3 ++- lib/libalpm/be_sync.c | 11 ++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] Pacman request: Messages at the end
by Erick Pérez 07 May '11

07 May '11

Hi: I don't know so well if this is the place for making requests. If it is, here it goes: pacman prints post-install messages when a package is installed, the problem is that when you install a lot of packages the messages pass and you don't see it. Could it be a feature like the one in gentoo that prints all the messages together at the end of the installation process. ? Erick -- El derecho de expresar nuestros pensamientos tiene algún significado tan sólo si somos capaces de tener pensamientos propios. El miedo a la libertad, Erich Fromm

2 1

[pacman-dev] pyqt packages confusion
by kachelaqa 07 May '11

07 May '11

hello i was going to report this as a bug, but i thought i'd ask here first in case i've misunderstood something. firstly: why does python2-pyqt now depend on pyqt (for python3)? why should it be necessary to drag in python3 and pyqt(3) for a python2 package? secondly: looking at the file lists, it appears that several critical files are now missing from python2-pyqt, namely: /usr/bin/pyuic4 /usr/bin/pylupdate4 /usr/bin/pyrcc4 /usr/lib/qt/plugins/designer/libpythonplugin.so (and possibly a few others) presumably, the intention is that those files will be provided by the pyqt(3) package instead. which makes no sense to me, because they are not guaranteed to be compatible. IMHO these two packages *must* be kept separate - it should be possible to install each package completely independently, without any danger of either one clobbering the files of the other. (nb: it might also be worth noting here that the new python2-pyqt package also breaks the python2-qscintilla package. bug report: https://bugs.archlinux.org/task/24144)

1 1

[pacman-dev] [PATCH] pactest: run with root in /tmp and clean up automatically
by Dan McGee 05 May '11

05 May '11

This moves the generated root/ directory into /tmp, or at least a path returned by tempfile.mkdtemp(), by default. This can make test runs significantly faster if done when /tmp is a tmpfs. If you are debugging a failed test, use the new --keep-root option to not clean up and pactest will print the location of the generated root/ test directory. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- test/pacman/pactest.py | 34 ++++++++++++++++++++++++---------- 1 files changed, 24 insertions(+), 10 deletions(-) diff --git a/test/pacman/pactest.py b/test/pacman/pactest.py index 69e655a..64d5651 100755 --- a/test/pacman/pactest.py +++ b/test/pacman/pactest.py @@ -17,8 +17,12 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -import os, sys, glob +import glob from optparse import OptionParser +import os +import shutil +import sys +import tempfile import pmenv import util @@ -63,6 +67,9 @@ def createOptParser(): parser.add_option("-t", "--test", action = "callback", callback = globTests, dest = "testcases", help = "specify test case(s)") + parser.add_option("--keep-root", action = "store_true", + dest = "keeproot", default = False, + help = "don't remove the generated pacman root filesystem") parser.add_option("--nolog", action = "store_true", dest = "nolog", default = False, help = "do not log pacman messages") @@ -80,7 +87,8 @@ def createOptParser(): if __name__ == "__main__": # instantiate env and parser objects - env = pmenv.pmenv() + root_path = tempfile.mkdtemp() + env = pmenv.pmenv(root=root_path) opt_parser = createOptParser() (opts, args) = opt_parser.parse_args() @@ -95,16 +103,22 @@ def createOptParser(): if opts.testcases is None or len(opts.testcases) == 0: print "no tests defined, nothing to do" + os.rmdir(root_path) sys.exit(2) - else: - for i in opts.testcases: - env.addtest(i) - # run tests and print overall results - env.run() - env.results() + for i in opts.testcases: + env.addtest(i) + + # run tests and print overall results + env.run() + env.results() - if env.failed > 0: - sys.exit(1) + if env.failed > 0: + sys.exit(1) + + if not opts.keeproot: + shutil.rmtree(root_path) + else: + print "pacman testing root saved: %s" % root_path # vim: set ts=4 sw=4 et: -- 1.7.5

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.2-164-g500a6f5
by dan＠archlinux.org 05 May '11

05 May '11

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 500a6f576d56c3152567df6c740998439b0e33b2 (commit) from 73553e60ec66484cdc2734eba3494d9a49eb3b70 (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 500a6f576d56c3152567df6c740998439b0e33b2 Author: Allan McRae <allan(a)archlinux.org> Date: Thu May 5 11:07:19 2011 +1000 Dan broke my patch Add a missing space. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/package.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.2-163-g73553e6
by dan＠archlinux.org 04 May '11

04 May '11

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 73553e60ec66484cdc2734eba3494d9a49eb3b70 (commit) from 22b133839088c88801b1f24455e41425a16de372 (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 73553e60ec66484cdc2734eba3494d9a49eb3b70 Author: Dan McGee <dan(a)archlinux.org> Date: Wed May 4 16:46:52 2011 -0500 Fix incorrect memory allocation assignment Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/signing.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- The official pacman repository

1 0