- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Add interactive provider selection
by Xavier Chantry 23 Jan '11

23 Jan '11

If there are multiple providers in one db, pacman used to just stop at the first one (both during dependency resolution or for pacman -S 'provision' which uses the same code). This adds a new conversation callback so that the user can choose which provider to install. By default (user press enter or --noconfirm), the first provider is still chosen, so for example the behavior of sync402 and 403 is preserved. But at least the user now has the possibility to make the right choice in a manual run. $ pacman -S community/smtp-server :: There are 3 providers available for smtp-server: 1) courier-mta 2) esmtp 3) exim Which one do you want to install? Enter a number (default=1): Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> --- lib/libalpm/alpm.h | 1 + lib/libalpm/deps.c | 28 +++++++++++++++++++++- src/pacman/callback.c | 13 ++++++++++ src/pacman/util.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++ src/pacman/util.h | 2 + 5 files changed, 103 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 237e235..d9e5439 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -379,6 +379,7 @@ typedef enum _pmtransconv_t { PM_TRANS_CONV_CORRUPTED_PKG = (1 << 3), PM_TRANS_CONV_LOCAL_NEWER = (1 << 4), PM_TRANS_CONV_REMOVE_PKGS = (1 << 5), + PM_TRANS_CONV_SELECT_PROVIDER = (1 << 6), } pmtransconv_t; /* Transaction Progress */ diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index cdaf524..f94f16c 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -510,6 +510,10 @@ pmpkg_t *_alpm_resolvedep(pmdepend_t *dep, alpm_list_t *dbs, { alpm_list_t *i, *j; int ignored = 0; + + alpm_list_t *providers = NULL; + int count; + /* 1. literals */ for(i = dbs; i; i = i->next) { pmpkg_t *pkg = _alpm_db_get_pkgfromcache(i->data, dep->name); @@ -549,11 +553,31 @@ pmpkg_t *_alpm_resolvedep(pmdepend_t *dep, alpm_list_t *dbs, continue; } } - _alpm_log(PM_LOG_WARNING, _("provider package was selected (%s provides %s)\n"), - pkg->name, dep->name); + _alpm_log(PM_LOG_DEBUG, "provider found (%s provides %s)\n", + pkg->name, dep->name); + providers = alpm_list_add(providers, pkg); + /* keep looking for other providers in the current db */ + } + } + /* if there is more than one provider, we ask the user */ + count = alpm_list_count(providers); + if(count == 1) { + pmpkg_t *pkg = alpm_list_getdata(alpm_list_first(providers)); + alpm_list_free(providers); + return(pkg); + } else if(count > 1) { + /* default to first provider if there is no QUESTION callback */ + int index = 0; + QUESTION(handle->trans, PM_TRANS_CONV_SELECT_PROVIDER, + providers, dep, NULL, &index); + if(index >= 0 && index < count) { + pmpkg_t *pkg = alpm_list_getdata(alpm_list_nth(providers, index)); + alpm_list_free(providers); return(pkg); } } + alpm_list_free(providers); + providers = NULL; } if(ignored) { /* resolvedeps will override these */ pm_errno = PM_ERR_PKG_IGNORED; diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 32dafb5..f54fe4a 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -296,6 +296,19 @@ void cb_trans_conv(pmtransconv_t event, void *data1, void *data2, alpm_list_free(namelist); } break; + case PM_TRANS_CONV_SELECT_PROVIDER: + { + alpm_list_t *providers = (alpm_list_t *)data1; + int count = alpm_list_count(providers); + char *depstring = alpm_dep_compute_string((pmdepend_t *)data2); + printf(_(":: There are %d providers available for %s:\n"), count, + depstring); + free(depstring); + select_display(providers); + printf("\n"); + *response = select_question(count, _("Which one do you want to install?")); + } + break; case PM_TRANS_CONV_LOCAL_NEWER: if(!config->op_s_downloadonly) { *response = yesno(_(":: %s-%s: local version is newer. Upgrade anyway?"), diff --git a/src/pacman/util.c b/src/pacman/util.c index 5b4b2e8..0af36b4 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -686,6 +686,67 @@ void display_optdepends(pmpkg_t *pkg) } } +void select_display(const alpm_list_t *pkglist) +{ + const alpm_list_t *i; + int nth = 1; + alpm_list_t *list = NULL; + char *string = NULL; + + for (i = pkglist; i; i = i->next) { + string = NULL; + pm_asprintf(&string, "%d) %s", nth, alpm_pkg_get_name(i->data)); + list = alpm_list_add(list, string); + nth++; + } + list_display(" ", list); + FREELIST(list); +} + +int select_question(int count, char *fmt, ...) +{ + char response[32]; + FILE *stream; + va_list args; + int preset = 1; + + if(config->noconfirm) { + stream = stdout; + } else { + /* Use stderr so questions are always displayed when redirecting output */ + stream = stderr; + } + + va_start(args, fmt); + vfprintf(stream, fmt, args); + va_end(args); + + fprintf(stream, "\n"); + fprintf(stream, _("Enter a number (default=%d)"), preset); + fprintf(stream, ": "); + + if(config->noconfirm) { + fprintf(stream, "\n"); + return(preset-1); + } + + if(fgets(response, sizeof(response), stdin)) { + strtrim(response); + if(strlen(response) > 0) { + char *endptr = NULL; + int n = strtol(response, &endptr, 10); + if(*endptr == '\0' && n >= 1 && n <= count) { + return(n-1); + } else { + fprintf(stream, _("Invalid number: %s\n"), response); + return(-1); + } + } + } + return(preset-1); +} + + /* presents a prompt and gets a Y/N answer */ static int question(short preset, char *fmt, va_list args) { diff --git a/src/pacman/util.h b/src/pacman/util.h index 2e77b0c..7e25b55 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -58,6 +58,8 @@ void display_targets(const alpm_list_t *pkgs, int install); void display_new_optdepends(pmpkg_t *oldpkg, pmpkg_t *newpkg); void display_optdepends(pmpkg_t *pkg); void print_packages(const alpm_list_t *packages); +void select_display(const alpm_list_t *pkglist); +int select_question(int count, char *fmt, ...); int yesno(char *fmt, ...); int noyes(char *fmt, ...); int pm_printf(pmloglevel_t level, const char *format, ...) __attribute__((format(printf,2,3))); -- 1.7.3.1

4 8

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.3-278-g27e8f06
by dan＠archlinux.org 22 Jan '11

22 Jan '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 27e8f06e0335ca560a3d0a261cc1979dbc1caad9 (commit) via 4d291508c2c24d058d0e00ca9588c6c81b24bc92 (commit) via d16a5ae7ddf358c45280a56bc81ed67841a7476f (commit) via 6e71922e6c918de9b60d2e9b1585835421738437 (commit) via a99e7272b8703e54b3c96ac0fdb7fe7eacfabbe8 (commit) via b3d71bf7d0ef8f577114bc39abecdc7ade0395dd (commit) via cda7d7847f3434959ef077ec6eb78ea4b2078a5a (commit) via c91bd3dda9540bb80f9e73fed87eee69b4675977 (commit) via 61864e1f6f51549c3b32c0d82b8c9deacea3ed73 (commit) from 32727efc38bf5376a402c4c4149cc4148ba2068b (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 27e8f06e0335ca560a3d0a261cc1979dbc1caad9 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Jan 22 14:29:02 2011 -0600 Query fileowner performance improvements Clean up some of the code by doing less string copying and printing. This is accomplished by either doing it after we know we need it, or taking advantage of the fact that some strings never change such as the root directory prefix. Also, fix an issue where a file at the root level (e.g. /foobar) could not be queried. End result is a much faster user experience when combined with the mbasename() changes. These timings are for looking up 113 files in /etc/, some of which are owned and some which are not. $ find /etc -maxdepth 1 -type f | xargs time pacman -Qo >/dev/null 6.10user 0.05system 0:06.17elapsed 99%CPU (0avgtext+0avgdata 131040maxresident)k 0inputs+0outputs (0major+9436minor)pagefaults 0swaps $ find /etc -maxdepth 1 -type f | xargs time ./src/pacman/.libs/lt-pacman -Qo >/dev/null 0.86user 0.04system 0:00.92elapsed 99%CPU (0avgtext+0avgdata 131120maxresident)k 0inputs+0outputs (0major+9436minor)pagefaults 0swaps I'll take a 600% increase in speed. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4d291508c2c24d058d0e00ca9588c6c81b24bc92 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Jan 22 14:20:42 2011 -0600 Improve mbasename performance Rather than roll our own, use strrchr() instead, which glibc may have a better implementation than the simple iteration method we were using. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d16a5ae7ddf358c45280a56bc81ed67841a7476f Merge: 6e71922 cda7d78 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Jan 22 16:32:34 2011 -0600 Merge branch 'backup-status' commit 6e71922e6c918de9b60d2e9b1585835421738437 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Jan 22 16:22:01 2011 -0600 Add a few new provides tests These deal with already-installed packages and how they should be the preferred provider in cases where provider selection now occurs. A few involve multiple sync repos. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a99e7272b8703e54b3c96ac0fdb7fe7eacfabbe8 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Jan 22 16:11:33 2011 -0600 pactest: sort repos by alpha order in config file The order was non-deterministic before, and just happened to work for sync023.py as it was written. Ensure there is some sort of predictable ordering. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b3d71bf7d0ef8f577114bc39abecdc7ade0395dd Author: Dan McGee <dan(a)archlinux.org> Date: Sat Jan 22 16:28:43 2011 -0600 pactest: use new-style python classes Signed-off-by: Dan McGee <dan(a)archlinux.org> commit cda7d7847f3434959ef077ec6eb78ea4b2078a5a Author: Dan McGee <dan(a)archlinux.org> Date: Sat Jan 22 11:38:34 2011 -0600 Be smarter about failure to read backup file contents Instead of always printing MISSING, we can switch on the errno value set by access() and print a more useful string. In this case, handle files we can't read by printing UNREADABLE, print MISSING on ENOENT, and print UNKNOWN for anything else. Fixes FS#22546. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c91bd3dda9540bb80f9e73fed87eee69b4675977 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jan 12 00:06:39 2011 -0600 Mark backup status strings as untranslated And also change "Not Modified" -> "UNMODIFIED" for consistency. This makes it a lot easier to machine-parse this and not worry about locale differences. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 61864e1f6f51549c3b32c0d82b8c9deacea3ed73 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jan 12 00:05:22 2011 -0600 Refactor backup file status check into separate function This will make it a lot easier to use this stuff elsewhere. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: src/pacman/package.c | 69 ++++++++++++++++++++++++------------- src/pacman/query.c | 48 +++++++++++++++++-------- src/pacman/util.c | 18 +++------- src/pacman/util.h | 2 +- test/pacman/pmdb.py | 2 +- test/pacman/pmenv.py | 2 +- test/pacman/pmfile.py | 2 +- test/pacman/pmpkg.py | 2 +- test/pacman/pmrule.py | 2 +- test/pacman/pmtest.py | 2 +- test/pacman/tests/provision002.py | 22 ++++++++++++ test/pacman/tests/provision003.py | 23 ++++++++++++ test/pacman/tests/provision004.py | 21 +++++++++++ test/pacman/tests/sync023.py | 3 +- test/pacman/util.py | 5 ++- 15 files changed, 162 insertions(+), 61 deletions(-) create mode 100644 test/pacman/tests/provision002.py create mode 100644 test/pacman/tests/provision003.py create mode 100644 test/pacman/tests/provision004.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 3/3] Be smarter about failure to read backup file contents
by dpmcgee＠gmail.com 22 Jan '11

22 Jan '11

From: Dan McGee <dan(a)archlinux.org> Instead of always printing MISSING, we can switch on the errno value set by access() and print a more useful string. In this case, handle files we can't read by printing UNREADABLE, print MISSING on ENOENT, and print UNKNOWN for anything else. Fixes FS#22546. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- src/pacman/package.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/src/pacman/package.c b/src/pacman/package.c index 68b0693..77a5ee7 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -25,6 +25,7 @@ #include <string.h> #include <unistd.h> #include <limits.h> +#include <errno.h> #include <wchar.h> #include <alpm.h> @@ -183,7 +184,16 @@ static const char *get_backup_file_status(const char *root, } free(md5sum); } else { - ret = "MISSING"; + switch(errno) { + case EACCES: + ret = "UNREADABLE"; + break; + case ENOENT: + ret = "MISSING"; + break; + default: + ret = "UNKNOWN"; + } } return(ret); } -- 1.7.3.5

1 0

[pacman-dev] [PATCH 2/3] Mark backup status strings as untranslated
by dpmcgee＠gmail.com 22 Jan '11

22 Jan '11

From: Dan McGee <dan(a)archlinux.org> And also change "Not Modified" -> "UNMODIFIED" for consistency. This makes it a lot easier to machine-parse this and not worry about locale differences. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- src/pacman/package.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pacman/package.c b/src/pacman/package.c index 34eab22..68b0693 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -177,13 +177,13 @@ static const char *get_backup_file_status(const char *root, /* if checksums don't match, file has been modified */ if (strcmp(md5sum, expected_md5) != 0) { - ret = _("MODIFIED"); + ret = "MODIFIED"; } else { - ret = _("Not Modified"); + ret = "UNMODIFIED"; } free(md5sum); } else { - ret = _("MISSING"); + ret = "MISSING"; } return(ret); } -- 1.7.3.5

1 0

[pacman-dev] [PATCH 1/3] Refactor backup file status check into separate function
by dpmcgee＠gmail.com 22 Jan '11

22 Jan '11

From: Dan McGee <dan(a)archlinux.org> This will make it a lot easier to use this stuff elsewhere. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- In addition to the query fileowner speed improvements patches I just sent, this one is part of the logical path to implementing https://bugs.archlinux.org/task/19103. -Dan src/pacman/package.c | 59 +++++++++++++++++++++++++++++-------------------- 1 files changed, 35 insertions(+), 24 deletions(-) diff --git a/src/pacman/package.c b/src/pacman/package.c index 7af3843..34eab22 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -157,6 +157,37 @@ void dump_pkg_sync(pmpkg_t *pkg, const char *treename, int level) dump_pkg_full(pkg, -level); } +static const char *get_backup_file_status(const char *root, + const char *filename, const char *expected_md5) +{ + char path[PATH_MAX]; + char *ret; + + snprintf(path, PATH_MAX, "%s%s", root, filename); + + /* if we find the file, calculate checksums, otherwise it is missing */ + if(access(path, R_OK) == 0) { + char *md5sum = alpm_compute_md5sum(path); + + if(md5sum == NULL) { + pm_fprintf(stderr, PM_LOG_ERROR, + _("could not calculate checksums for %s\n"), path); + return(NULL); + } + + /* if checksums don't match, file has been modified */ + if (strcmp(md5sum, expected_md5) != 0) { + ret = _("MODIFIED"); + } else { + ret = _("Not Modified"); + } + free(md5sum); + } else { + ret = _("MISSING"); + } + return(ret); +} + /* Display list of backup files and their modification states */ void dump_pkg_backups(pmpkg_t *pkg) @@ -167,37 +198,17 @@ void dump_pkg_backups(pmpkg_t *pkg) if(alpm_pkg_get_backup(pkg)) { /* package has backup files, so print them */ for(i = alpm_pkg_get_backup(pkg); i; i = alpm_list_next(i)) { - char path[PATH_MAX]; + const char *value; char *str = strdup(alpm_list_getdata(i)); - char *ptr = index(str, '\t'); + char *ptr = strchr(str, '\t'); if(ptr == NULL) { free(str); continue; } *ptr = '\0'; ptr++; - snprintf(path, PATH_MAX-1, "%s%s", root, str); - /* if we find the file, calculate checksums, otherwise it is missing */ - if(access(path, R_OK) == 0) { - char *md5sum = alpm_compute_md5sum(path); - - if(md5sum == NULL) { - pm_fprintf(stderr, PM_LOG_ERROR, - _("could not calculate checksums for %s\n"), path); - free(str); - continue; - } - - /* if checksums don't match, file has been modified */ - if (strcmp(md5sum, ptr) != 0) { - printf(_("MODIFIED\t%s\n"), path); - } else { - printf(_("Not Modified\t%s\n"), path); - } - free(md5sum); - } else { - printf(_("MISSING\t\t%s\n"), path); - } + value = get_backup_file_status(root, str, ptr); + printf("%s\t%s%s\n", value, root, str); free(str); } } else { -- 1.7.3.5

1 0

[pacman-dev] [PATCH 1/2] Improve mbasename performance
by Dan McGee 22 Jan '11

22 Jan '11

Rather than roll our own, use strrchr() instead, which glibc may have a better implementation than the simple iteration method we were using. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- src/pacman/query.c | 4 ++-- src/pacman/util.c | 18 +++++------------- src/pacman/util.h | 2 +- 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/src/pacman/query.c b/src/pacman/query.c index dea309a..f599360 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -109,8 +109,8 @@ static int query_fileowner(alpm_list_t *targets) for(t = targets; t; t = alpm_list_next(t)) { int found = 0; filename = strdup(alpm_list_getdata(t)); - char *bname, *dname, *rpath; - const char *root; + char *dname, *rpath; + const char *root, *bname; struct stat buf; alpm_list_t *i, *j; diff --git a/src/pacman/util.c b/src/pacman/util.c index d91d1d4..0377bf7 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -157,25 +157,17 @@ int rmrf(const char *path) } /** Parse the basename of a program from a path. -* Grabbed from the uClibc source. * @param path path to parse basename from * * @return everything following the final '/' */ -char *mbasename(const char *path) +const char *mbasename(const char *path) { - const char *s; - const char *p; - - p = s = path; - - while (*s) { - if (*s++ == '/') { - p = s; - } + const char *last = strrchr(path, '/'); + if(last) { + return(last + 1); } - - return (char *)p; + return(path); } /** Parse the dirname of a program from a path. diff --git a/src/pacman/util.h b/src/pacman/util.h index a5c382d..78fe5b5 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -44,7 +44,7 @@ int trans_release(void); int needs_root(void); int getcols(void); int rmrf(const char *path); -char *mbasename(const char *path); +const char *mbasename(const char *path); char *mdirname(const char *path); void indentprint(const char *str, int indent); char *strtoupper(char *str); -- 1.7.3.5

1 1

[pacman-dev] [GIT] The official pacman repository annotated tag, v3.4.3, created. v3.4.3
by dan＠archlinux.org 22 Jan '11

22 Jan '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 annotated tag, v3.4.3 has been created at 425131aa2aab964d43b4018f5939d2bbfa640aec (tag) tagging a97e28205a462a7433a8d0e7061cd911ea3d8c4c (commit) replaces v3.4.2 tagged by Dan McGee on Sat Jan 22 10:10:32 2011 -0600 - Log ----------------------------------------------------------------- Group ignores, unfix epoch, double remove issue -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iEYEABECAAYFAk07AcAACgkQXC5GoPU6du2/jQCbBpHgV/DQ9N2bPsm+J5HCdPl+ f8MAoK0lz5QtAZ3mxiwMyqZwfHnsXSjB =+Uzl -----END PGP SIGNATURE----- Dan McGee (9): Various documentation updates doc: add website zip to clean files Back out anticipated epoch changes Make debug config messages consistent in capitalization pactest: build the filelist using a set() Fix double read issue in maint releases 3.4.3 release preparation Copy new backend translation over from frontend translation Update 3.4.3 release date Jakob Gruber (3): Tests: Sync group which includes ignored pkgs Move group code to separate function Respect Ignore{Pkg,Group} for group members ----------------------------------------------------------------------- hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.4.2-12-ga97e282
by dan＠archlinux.org 22 Jan '11

22 Jan '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 a97e28205a462a7433a8d0e7061cd911ea3d8c4c (commit) via 76735e6519c9dd7a3efee2613070588b5a1b12ac (commit) from 85d0111da8413dc7879f6259afc0e5621c2d2634 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: doc/index.txt | 2 +- lib/libalpm/po/ca.po | 6 +++++- lib/libalpm/po/cs.po | 6 +++++- lib/libalpm/po/de.po | 6 +++++- lib/libalpm/po/el.po | 6 +++++- lib/libalpm/po/en_GB.po | 6 +++++- lib/libalpm/po/es.po | 6 +++++- lib/libalpm/po/fr.po | 6 +++++- lib/libalpm/po/hu.po | 6 +++++- lib/libalpm/po/it.po | 6 +++++- lib/libalpm/po/kk.po | 6 +++++- lib/libalpm/po/libalpm.pot | 6 +++++- lib/libalpm/po/nb.po | 6 +++++- lib/libalpm/po/pl.po | 6 +++++- lib/libalpm/po/pt.po | 6 +++++- lib/libalpm/po/pt_BR.po | 6 +++++- lib/libalpm/po/ro.po | 6 +++++- lib/libalpm/po/ru.po | 6 +++++- lib/libalpm/po/sk.po | 6 +++++- lib/libalpm/po/sv.po | 6 +++++- lib/libalpm/po/tr.po | 6 +++++- lib/libalpm/po/uk.po | 6 +++++- lib/libalpm/po/zh_CN.po | 6 +++++- 23 files changed, 111 insertions(+), 23 deletions(-) mode change 100755 => 100644 lib/libalpm/po/sk.po hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.2-281-g32727ef
by dan＠archlinux.org 22 Jan '11

22 Jan '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 32727efc38bf5376a402c4c4149cc4148ba2068b (commit) via 5699f2c94c39afec19810fc450b78dced86e7c5d (commit) via 2a3b5e40bc92bf3c4f32c27c4030d80f97a5dee1 (commit) via 8f711a7181e16dd8f2ab17946a48d131b58f4cf3 (commit) via ff96649eeb09e4bd8774bc72a8dd1a4fa5a6846b (commit) via d94346ede2b146a3eb9bfc263c049aa2783a032c (commit) via 946f4af7f376c22d33bb24ff997c99231a05c0e7 (commit) via 2c6be06bbab70a2433450290c66cc8b3af24e1d4 (commit) via 505ad87e67b629fd359d3a2ba3ae7f110942447f (commit) via 0de314205f9925c073566de109464b46737b0527 (commit) via 36ea02cc482f14b787f1c7c4999fc347d77be7e5 (commit) via c4332c8091dbba8bb9d9c56a3229843497b58670 (commit) via a97e28205a462a7433a8d0e7061cd911ea3d8c4c (commit) via 76735e6519c9dd7a3efee2613070588b5a1b12ac (commit) via 85d0111da8413dc7879f6259afc0e5621c2d2634 (commit) from 51175f31c4aac9df6ceeffc7855a0f842c580fdb (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 32727efc38bf5376a402c4c4149cc4148ba2068b Author: Dan McGee <dan(a)archlinux.org> Date: Tue Oct 26 22:55:31 2010 -0500 pactest: revamp modified logic Remove all logic dealing with PKG_MODIFIED as this rule no longer exists. This removes a bunch of unnecessary stat and checksum logic that most of the time we were never even using. Also update the file modified checks to mark every file created using mkfile() with an older time so any modified checks will just work without hacks. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5699f2c94c39afec19810fc450b78dced86e7c5d Author: Dan McGee <dan(a)archlinux.org> Date: Tue Oct 26 22:54:36 2010 -0500 Modify all pactests to not use PKG_MODIFIED All conditions that this particular rule tested are better served by using a more specific rule, whether that be checking a package version or whether files inside the package have changed or still exist. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 2a3b5e40bc92bf3c4f32c27c4030d80f97a5dee1 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Oct 26 22:08:52 2010 -0500 pactest: pylint changes for pmdb Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8f711a7181e16dd8f2ab17946a48d131b58f4cf3 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Oct 26 21:58:54 2010 -0500 pactest: pylint changes for util Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ff96649eeb09e4bd8774bc72a8dd1a4fa5a6846b Author: Dan McGee <dan(a)archlinux.org> Date: Tue Oct 26 21:46:04 2010 -0500 pactest: pylint changes for pmtest Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d94346ede2b146a3eb9bfc263c049aa2783a032c Author: Dan McGee <dan(a)archlinux.org> Date: Tue Oct 26 21:35:07 2010 -0500 pactest: pylint changes for pmpkg Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 946f4af7f376c22d33bb24ff997c99231a05c0e7 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Oct 26 21:30:22 2010 -0500 pactest: pylint changes for pmrule Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 2c6be06bbab70a2433450290c66cc8b3af24e1d4 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Oct 26 21:23:51 2010 -0500 pactest: pylint changes for pmenv Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 505ad87e67b629fd359d3a2ba3ae7f110942447f Author: Dan McGee <dan(a)archlinux.org> Date: Tue Oct 26 21:19:56 2010 -0500 pactest: pylint changes for pactest Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0de314205f9925c073566de109464b46737b0527 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Oct 26 21:16:52 2010 -0500 pactest: pylint changes for pmfile Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 36ea02cc482f14b787f1c7c4999fc347d77be7e5 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Oct 27 01:25:45 2010 -0500 Compute download size for sync packages only Neither packages from files nor packages from the local database will ever have a download size. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c4332c8091dbba8bb9d9c56a3229843497b58670 Merge: 51175f3 a97e282 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Jan 22 10:12:46 2011 -0600 Merge branch 'maint' ----------------------------------------------------------------------- Summary of changes: NEWS | 3 + configure.ac | 4 +- doc/index.txt | 1 + lib/libalpm/po/ca.po | 6 ++- lib/libalpm/po/cs.po | 6 ++- lib/libalpm/po/de.po | 6 ++- lib/libalpm/po/el.po | 6 ++- lib/libalpm/po/en_GB.po | 6 ++- lib/libalpm/po/es.po | 6 ++- lib/libalpm/po/fr.po | 6 ++- lib/libalpm/po/hu.po | 6 ++- lib/libalpm/po/it.po | 6 ++- lib/libalpm/po/kk.po | 6 ++- lib/libalpm/po/libalpm.pot | 6 ++- lib/libalpm/po/nb.po | 6 ++- lib/libalpm/po/pl.po | 6 ++- lib/libalpm/po/pt.po | 6 ++- lib/libalpm/po/pt_BR.po | 6 ++- lib/libalpm/po/ro.po | 6 ++- lib/libalpm/po/ru.po | 6 ++- lib/libalpm/po/sk.po | 6 ++- lib/libalpm/po/sv.po | 6 ++- lib/libalpm/po/tr.po | 6 ++- lib/libalpm/po/uk.po | 6 ++- lib/libalpm/po/zh_CN.po | 6 ++- lib/libalpm/sync.c | 2 +- test/pacman/README | 1 - test/pacman/pactest.py | 6 +- test/pacman/pmdb.py | 77 +++++++------------------------- test/pacman/pmenv.py | 8 --- test/pacman/pmfile.py | 39 +++++----------- test/pacman/pmpkg.py | 36 +++------------ test/pacman/pmrule.py | 25 +++++------ test/pacman/pmtest.py | 90 +++++++++++++++++++++---------------- test/pacman/tests/scriptlet001.py | 2 +- test/pacman/tests/scriptlet002.py | 2 +- test/pacman/tests/sync101.py | 5 ++- test/pacman/tests/sync102.py | 7 +++- test/pacman/tests/sync103.py | 2 +- test/pacman/tests/sync120.py | 2 +- test/pacman/tests/sync138.py | 2 +- test/pacman/tests/sync898.py | 2 +- test/pacman/tests/upgrade001.py | 1 - test/pacman/tests/upgrade002.py | 1 - test/pacman/tests/upgrade003.py | 1 - test/pacman/util.py | 42 ++++------------- 46 files changed, 242 insertions(+), 251 deletions(-) mode change 100755 => 100644 lib/libalpm/po/sk.po hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.2-266-g51175f3
by dan＠archlinux.org 22 Jan '11

22 Jan '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 51175f31c4aac9df6ceeffc7855a0f842c580fdb (commit) via e277e838d798c1463ae5df98dcf637df70e048ec (commit) via b947db040c2c586636fc290f0fadbe89e9802450 (commit) via 859bdb5b1d1b9ccb781c95026836283a005a96ce (commit) via 01403f423a9bace8b43d45a0dfcea5d4f1002cc8 (commit) via b8ab96a270caa5d589c44c62d5664db156d94af7 (commit) via bf46e04614b3740eea4a5e0d44767f57e1cffa4d (commit) via 5c46ba14f780474e2b04b54aa7b0c8bf60de2b5b (commit) via e068b58507ad58e2037aeb323a74d27377a0feac (commit) via 50f446886b8b09b9bcdb30494d7a0c4d93a8a37a (commit) from 3863e48788e2424c4f1469e72dabda6fba595c4c (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 51175f31c4aac9df6ceeffc7855a0f842c580fdb Merge: e277e83 859bdb5 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Jan 22 10:03:51 2011 -0600 Merge branch 'epoch-work' commit e277e838d798c1463ae5df98dcf637df70e048ec Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Sat Jan 22 15:15:16 2011 +0100 Makefile: Use git describe --dirty for GIT VERSION dirty indicates if the repo has uncommited changes or not when building, so dont hardcode this info. Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b947db040c2c586636fc290f0fadbe89e9802450 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jan 23 00:13:24 2011 +1000 repo-add: only attempt to create deltas when asked repo-add should only attempt to create the delta file when using the -d option. Also adjust a couple of tests to use the "double bracket" syntax. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 859bdb5b1d1b9ccb781c95026836283a005a96ce Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jan 20 18:29:41 2011 -0600 doc: update current list of authors Allan, I had no idea you were not listed here. I think you count as an active developer at the moment. Also, move Aaron to the past contributors section. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 01403f423a9bace8b43d45a0dfcea5d4f1002cc8 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jan 7 20:59:51 2011 -0600 doc: add a vercmp manpage This includes info on version comparison that is very similar to the stuff in the pacman manpage, but also a few vercmp examples, the return values, and other fun stuff. Also update the version comparison stuff in the pacman manpage. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b8ab96a270caa5d589c44c62d5664db156d94af7 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jan 20 18:16:06 2011 -0600 makepkg: encode epoch in version specifier if > 0 This makes things consistent with everywhere else we are incorporating the new optional epoch field. Add a helper function that forms the version string for you and use it in makepkg where I found 'pkgver.*-.*pkgrel'. This exposes a few shortcomings in a previous "Override pkgver" patch (2020e629) in the install package and check if built functions. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit bf46e04614b3740eea4a5e0d44767f57e1cffa4d Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jan 10 13:40:31 2011 -0600 Remove epoch as an independent field Instead, go the same route we have always taken with version-release in libalpm and treat it all as one piece of information. Makepkg is the only script that knows about epoch as a distinct value; from there on out we will parse out the components as necessary. This makes the code a lot simpler as far as epoch handling goes. The downside here is that we are tossing some compatibility to the wind; packages using force will have to be rebuilt with an incremented epoch to keep their special status. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5c46ba14f780474e2b04b54aa7b0c8bf60de2b5b Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jan 10 10:44:25 2011 -0600 Allow version comparison to contain epoch specifier Adapting from RPM, follow the [epoch:]version[-release] syntax. We can also borrow some of their parsing code for our purposes (thanks!). Add some new tests to our vercmp shell script tester for epoch comparisons, and then make the code work with these newfangled epoch specifiers. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e068b58507ad58e2037aeb323a74d27377a0feac Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jan 3 18:35:27 2011 -0600 pactest: add more testing for epoch Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 50f446886b8b09b9bcdb30494d7a0c4d93a8a37a Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jan 3 17:28:20 2011 -0600 pactest: Rename epoch pactests Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/bacman.in | 6 - doc/.gitignore | 1 + doc/Makefile.am | 6 +- doc/PKGBUILD.5.txt | 2 +- doc/footer.txt | 3 +- doc/index.txt | 1 + doc/pacman.8.txt | 6 +- doc/vercmp.8.txt | 71 +++++++++++ lib/libalpm/alpm.h | 1 - lib/libalpm/be_local.c | 16 --- lib/libalpm/be_package.c | 7 - lib/libalpm/be_sync.c | 9 -- lib/libalpm/package.c | 20 --- lib/libalpm/package.h | 2 - lib/libalpm/version.c | 157 ++++++++++++++++++------- scripts/Makefile.am | 2 +- scripts/makepkg.sh.in | 67 +++++++---- scripts/repo-add.sh.in | 28 ++--- src/pacman/Makefile.am | 2 +- src/util/vercmp.c | 4 +- test/pacman/pmdb.py | 14 --- test/pacman/pmpkg.py | 6 - test/pacman/pmrule.py | 3 - test/pacman/tests/{sync140.py => epoch001.py} | 5 +- test/pacman/tests/{sync141.py => epoch002.py} | 3 +- test/pacman/tests/{sync142.py => epoch003.py} | 8 +- test/pacman/tests/{sync143.py => epoch004.py} | 8 +- test/pacman/tests/epoch010.py | 12 ++ test/pacman/tests/epoch011.py | 12 ++ test/pacman/tests/epoch012.py | 13 ++ test/pacman/tests/sync136.py | 5 +- test/pacman/tests/sync137.py | 3 +- test/util/vercmptest.sh | 19 +++ 33 files changed, 332 insertions(+), 190 deletions(-) create mode 100644 doc/vercmp.8.txt rename test/pacman/tests/{sync140.py => epoch001.py} (72%) rename test/pacman/tests/{sync141.py => epoch002.py} (86%) rename test/pacman/tests/{sync142.py => epoch003.py} (60%) rename test/pacman/tests/{sync143.py => epoch004.py} (71%) create mode 100644 test/pacman/tests/epoch010.py create mode 100644 test/pacman/tests/epoch011.py create mode 100644 test/pacman/tests/epoch012.py hooks/post-receive -- The official pacman repository

1 0