- Pacman-dev - lists.archlinux.org

[pacman-dev] Question about the '-h' switch of pacman utils
by Karol Blazewicz 24 Jun '13

24 Jun '13

I've noticed some commands provided by the pacman package have help messages that could be improved. Is it something that already is on some todo list? What kind of suggestions are welcome and which ones draw ire of the developers? Anyone cares about colons, dashes and capital letters? There is a significant variability in style, in which the '-h' output is presented and I'd appreciate standardizing this. I think '$command_name -h' should provide s brief description of what the command does and methods of use. At least in some cases an example is very helpful. For example, compare $ pacsort -h pacsort v4.1.1 Usage: pacsort [options] [files...] <options listed here> to $ makepkg -h makepkg (pacman) 4.1.1 Usage: /usr/bin/makepkg [options] Options: <listed here> Hey, '$command_name ($package_name) $package_version' is a neat idea, I like it much more than '$command_name v$package_version' style of pacsort. But ... what does makepkg do? I think it should explicitly say this. It's a text file, so let's see what's inside: $ head -3 /usr/bin/makepkg #!/usr/bin/bash # # makepkg - make packages compatible for use with pacman OK, I think I get it. pacsort is a binary, so what it does remains a secret ;P What about the empty line between the command name and 'Usage' line? Can we decide whether to add it to other pacman utilities' -h' output or remove it from the ones that have it now? Is writing 'Options:' necessary or can we just list them? Some more examples can be found in the thread I opened on the forum: https://bbs.archlinux.org/viewtopic.php?id=164943 I don't know if there's any interest among the developers in making the -h' output (and later the man pages) better and if the ideas I presented above do make it better in the eyes of those who matter or it just nitpicking and fluff. If you prefer less chatty and more formal style of writing, please tell me.

3 4

[pacman-dev] [translations] can't push to Transifex
by Jente Hidskes 23 Jun '13

23 Jun '13

Hey all, First of, please excuse me if I'm not doing this correctly. It's my first translation project. Some days ago I noticed that Pacman was half translated in Dutch but what I saw disturbed me; it was poorly done (I mean no disrespect towards the translator). I looked into translating, so I made an account at Transifex and send a request to join the Dutch translation group. I waited a day (impatient?) but am still not accepted. Regardless, I had a go at translating and I just finished translating all of Pacman itself in a couple of hours work. I would like to push this to Transifex, but when I try to I get "Error 401: UNAUTHORIZED". I guess I have to be accepted into the team first to push translations? However, the maintainer seems to have been active last over a year ago so now I'm in doubt on what to do. Should I wait a bit longer, or can I contact the maintainer some how? For what it's worth, the maintainer is "swilkens". Thanks in advance for your replies, Jente

2 2

[pacman-dev] [PATCH] [makepkg] Respect paths with spaces on --install
by Andrea Scarpino 23 Jun '13

23 Jun '13

makepkg --install doesn't quote the absolute path, so if the path contains spaces pacman -U fails. --- scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index f8bf8e6..2a39157 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2089,7 +2089,7 @@ install_package() { fi done - if ! run_pacman -U ${pkglist[@]}; then + if ! run_pacman -U "${pkglist[@]}"; then warning "$(gettext "Failed to install built package(s).")" return 0 fi -- 1.8.3.1

2 1

[pacman-dev] [PATCH] makepkg: Put script sourcing before var validation
by William Giokas 20 Jun '13

20 Jun '13

As it is possible to set things like LOGDEST and PKGDEST in a PKGBUILD, we should probably make sure that we can write to said directories before just assuming we can and breaking functions when we can't. Signed-off-by: William Giokas <1007380(a)gmail.com> --- I don't think this should cause any issues, but packages that expect $srcdir, $pkgdir, etc. to be set when assigning variables will not work as intended anymore, but I have never come across any scrip that does that, so not really too concerned. scripts/makepkg.sh.in | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index f8bf8e6..1fe7709 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2689,6 +2689,26 @@ if [[ -t 2 && ! $USE_COLOR = "n" ]] && check_buildenv "color" "y"; then fi readonly ALL_OFF BOLD BLUE GREEN RED YELLOW +unset pkgname pkgbase pkgver pkgrel epoch pkgdesc url license groups provides +unset md5sums replaces depends conflicts backup source install changelog build +unset makedepends optdepends options noextract + +BUILDFILE=${BUILDFILE:-$BUILDSCRIPT} +if [[ ! -f $BUILDFILE ]]; then + error "$(gettext "%s does not exist.")" "$BUILDFILE" + exit 1 +else + if [[ $(<"$BUILDFILE") = *$'\r'* ]]; then + error "$(gettext "%s contains %s characters and cannot be sourced.")" "$BUILDFILE" "CRLF" + exit 1 + fi + + if [[ ${BUILDFILE:0:1} != "/" ]]; then + BUILDFILE="$startdir/$BUILDFILE" + fi + source_safe "$BUILDFILE" +fi + # override settings with an environment variable for batch processing BUILDDIR=${_BUILDDIR:-$BUILDDIR} BUILDDIR=${BUILDDIR:-$startdir} #default to $startdir if undefined @@ -2769,26 +2789,6 @@ else fi fi -unset pkgname pkgbase pkgver pkgrel epoch pkgdesc url license groups provides -unset md5sums replaces depends conflicts backup source install changelog build -unset makedepends optdepends options noextract - -BUILDFILE=${BUILDFILE:-$BUILDSCRIPT} -if [[ ! -f $BUILDFILE ]]; then - error "$(gettext "%s does not exist.")" "$BUILDFILE" - exit 1 -else - if [[ $(<"$BUILDFILE") = *$'\r'* ]]; then - error "$(gettext "%s contains %s characters and cannot be sourced.")" "$BUILDFILE" "CRLF" - exit 1 - fi - - if [[ ${BUILDFILE:0:1} != "/" ]]; then - BUILDFILE="$startdir/$BUILDFILE" - fi - source_safe "$BUILDFILE" -fi - # set defaults if they weren't specified in buildfile pkgbase=${pkgbase:-${pkgname[0]}} epoch=${epoch:-0} -- 1.8.3.1.448.gfb7dfaa

2 2

[pacman-dev] [PATCH] query_group: allow package filters
by Andrew Gregory 19 Jun '13

19 Jun '13

Relocated query_group() to allow calling filter(). Fixes FS#19716 Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- The only actual changes are the two added: if(!filter(...)) { continue; } src/pacman/query.c | 88 +++++++++++++++++++++++++++++------------------------- 1 file changed, 47 insertions(+), 41 deletions(-) diff --git a/src/pacman/query.c b/src/pacman/query.c index f5862a2..4f5d80e 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -257,47 +257,6 @@ static int query_search(alpm_list_t *targets) return dump_pkg_search(db_local, targets, 0); } -static int query_group(alpm_list_t *targets) -{ - alpm_list_t *i, *j; - const char *grpname = NULL; - int ret = 0; - alpm_db_t *db_local = alpm_get_localdb(config->handle); - - if(targets == NULL) { - for(j = alpm_db_get_groupcache(db_local); j; j = alpm_list_next(j)) { - alpm_group_t *grp = j->data; - const alpm_list_t *p; - - for(p = grp->packages; p; p = alpm_list_next(p)) { - alpm_pkg_t *pkg = p->data; - printf("%s %s\n", grp->name, alpm_pkg_get_name(pkg)); - } - } - } else { - for(i = targets; i; i = alpm_list_next(i)) { - alpm_group_t *grp; - grpname = i->data; - grp = alpm_db_get_group(db_local, grpname); - if(grp) { - const alpm_list_t *p; - for(p = grp->packages; p; p = alpm_list_next(p)) { - if(!config->quiet) { - printf("%s %s\n", grpname, - alpm_pkg_get_name(p->data)); - } else { - printf("%s\n", alpm_pkg_get_name(p->data)); - } - } - } else { - pm_printf(ALPM_LOG_ERROR, _("group '%s' was not found\n"), grpname); - ret++; - } - } - } - return ret; -} - static unsigned short pkg_get_locality(alpm_pkg_t *pkg) { const char *pkgname = alpm_pkg_get_name(pkg); @@ -387,6 +346,53 @@ static int display(alpm_pkg_t *pkg) return ret; } +static int query_group(alpm_list_t *targets) +{ + alpm_list_t *i, *j; + const char *grpname = NULL; + int ret = 0; + alpm_db_t *db_local = alpm_get_localdb(config->handle); + + if(targets == NULL) { + for(j = alpm_db_get_groupcache(db_local); j; j = alpm_list_next(j)) { + alpm_group_t *grp = j->data; + const alpm_list_t *p; + + for(p = grp->packages; p; p = alpm_list_next(p)) { + alpm_pkg_t *pkg = p->data; + if(!filter(pkg)) { + continue; + } + printf("%s %s\n", grp->name, alpm_pkg_get_name(pkg)); + } + } + } else { + for(i = targets; i; i = alpm_list_next(i)) { + alpm_group_t *grp; + grpname = i->data; + grp = alpm_db_get_group(db_local, grpname); + if(grp) { + const alpm_list_t *p; + for(p = grp->packages; p; p = alpm_list_next(p)) { + if(!filter(p->data)) { + continue; + } + if(!config->quiet) { + printf("%s %s\n", grpname, + alpm_pkg_get_name(p->data)); + } else { + printf("%s\n", alpm_pkg_get_name(p->data)); + } + } + } else { + pm_printf(ALPM_LOG_ERROR, _("group '%s' was not found\n"), grpname); + ret++; + } + } + } + return ret; +} + int pacman_query(alpm_list_t *targets) { int ret = 0; -- 1.8.3.1

3 2

[pacman-dev] [PATCH] query_fileowner: resolve trailing . or .. in paths
by Andrew Gregory 19 Jun '13

19 Jun '13

The full path needs to resolved any time it ends with "." or "..", not just when those are the entire path. This allows strange-but-valid paths such as: "/home/." to be queried. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/pacman/query.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pacman/query.c b/src/pacman/query.c index 1b6e14c..819a571 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -102,7 +102,7 @@ static char *lrealpath(const char *path, char *resolved_path) char *rpath = NULL, *dname = NULL; int success = 0; - if(strcmp(path, ".") == 0 || strcmp(path, "..") == 0) { + if(strcmp(bname, ".") == 0 || strcmp(bname, "..") == 0) { /* the entire path needs to be resolved */ return realpath(path, resolved_path); } -- 1.8.3.1

1 0

[pacman-dev] [PATCH] query_fileowner: remove useless path variable
by Andrew Gregory 19 Jun '13

19 Jun '13

We no longer need it for resolving package files and using it to resolve root is unnecessary as alpm does that for us. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/pacman/query.c | 30 +++--------------------------- 1 file changed, 3 insertions(+), 27 deletions(-) diff --git a/src/pacman/query.c b/src/pacman/query.c index 4f5d80e..1b6e14c 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -136,8 +136,8 @@ cleanup: static int query_fileowner(alpm_list_t *targets) { int ret = 0; - char path[PATH_MAX]; - size_t rootlen; + const char *root = alpm_option_get_root(config->handle); + size_t rootlen = strlen(root); alpm_list_t *t; alpm_db_t *db_local; alpm_list_t *packages; @@ -148,30 +148,6 @@ static int query_fileowner(alpm_list_t *targets) return 1; } - /* Set up our root path buffer. We only need to copy the location of root in - * once, then we can just overwrite whatever file was there on the previous - * iteration. */ - - /* resolve root now so any symlinks in it will only have to be resolved once */ - if(!realpath(alpm_option_get_root(config->handle), path)) { - pm_printf(ALPM_LOG_ERROR, _("cannot determine real path for '%s': %s\n"), - path, strerror(errno)); - return 1; - } - - /* make sure there's enough room to append the package file to path */ - rootlen = strlen(path); - if(rootlen + 2 > PATH_MAX) { - pm_printf(ALPM_LOG_ERROR, _("path too long: %s%s\n"), path, ""); - return 1; - } - - /* append trailing '/' removed by realpath */ - if(path[rootlen - 1] != '/') { - path[rootlen++] = '/'; - path[rootlen] = '\0'; - } - db_local = alpm_get_localdb(config->handle); packages = alpm_db_get_pkgcache(db_local); @@ -214,7 +190,7 @@ static int query_fileowner(alpm_list_t *targets) goto targcleanup; } - if(strncmp(rpath, path, rootlen) != 0) { + if(strncmp(rpath, root, rootlen) != 0) { /* file is outside root, we know nothing can own it */ pm_printf(ALPM_LOG_ERROR, _("No package owns %s\n"), filename); goto targcleanup; -- 1.8.3.1

1 0

[pacman-dev] [PATCH] skip unknown repo names for pacman -Sl
by Andrew Gregory 19 Jun '13

19 Jun '13

Brings pacman -Sl behavior in line with other listing operations. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/pacman/sync.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 2093029..f8af176 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -503,12 +503,15 @@ static int sync_list(alpm_list_t *syncs, alpm_list_t *targets) if(db == NULL) { pm_printf(ALPM_LOG_ERROR, _("repository \"%s\" was not found.\n"), repo); - alpm_list_free(ls); - return 1; } ls = alpm_list_add(ls, db); } + + if(!ls) { + /* all of our targets were invalid */ + return 1; + } } else { ls = syncs; } -- 1.8.3

2 2

[pacman-dev] [PATCH] Enable inverted patterns in NoExtract.
by Patrick Steinhardt 18 Jun '13

18 Jun '13

It is now possible to invert patterns in NoExtract. This feature allows users to whitelist certain files that were previously blacklisted by another entry in NoExtract. --- This patch is another approach to my use case with blacklisting all but some files in /usr/share/locale by being able to invert patterns. An inverted pattern will result in a previously blacklisted file to be whitelisted again. Subsequent matches will always override previous ones. The following NoExtract clause will thus result in all files in /usr/share/locale except en_US/* and locale.alias being skipped: NoExtract = usr/share/locale/* NoExtract = !usr/share/locale/en_US/* NoExtract = !usr/share/locale/locale.alias lib/libalpm/add.c | 2 +- lib/libalpm/util.c | 32 ++++++++++++++++++++++++++++++++ lib/libalpm/util.h | 1 + 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index c20e7c6..78f1ae2 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -183,7 +183,7 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive, } /* if a file is in NoExtract then we never extract it */ - if(alpm_list_find(handle->noextract, entryname, _alpm_fnmatch)) { + if(_alpm_fnmatch_patterns(handle->noextract, entryname) == 0) { _alpm_log(handle, ALPM_LOG_DEBUG, "%s is in NoExtract," " skipping extraction of %s\n", entryname, filename); diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index f84fb66..1382889 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -1249,6 +1249,38 @@ int _alpm_access(alpm_handle_t *handle, const char *dir, const char *file, int a return ret; } +/** Checks whether a string matches at least one shell wildcard pattern. + * Checks for matches with fnmatch. Matches are inverted by prepending + * patterns with an exclamation mark. Preceding exclamation marks may be + * escaped. Subsequent matches override previous ones. + * @param patterns patterns to match against + * @param string string to check against pattern + * @return 0 if string matches pattern, negative if they don't match and + * positive if the last match was inverted + */ +int _alpm_fnmatch_patterns(alpm_list_t *patterns, const char *string) +{ + int result = -1; + alpm_list_t *i; + char *pattern; + short inverted; + + for(i = patterns; i; i = i->next) { + pattern = i->data; + + inverted = pattern[0] == '!'; + if(inverted || pattern[0] == '\\') { + pattern++; + } + + if(_alpm_fnmatch(pattern, string) == 0) { + result = inverted; + } + } + + return result; +} + /** Checks whether a string matches a shell wildcard pattern. * Wrapper around fnmatch. * @param pattern pattern to match against diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index 56031f3..24b7c22 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -140,6 +140,7 @@ alpm_time_t _alpm_parsedate(const char *line); int _alpm_raw_cmp(const char *first, const char *second); int _alpm_raw_ncmp(const char *first, const char *second, size_t max); int _alpm_access(alpm_handle_t *handle, const char *dir, const char *file, int amode); +int _alpm_fnmatch_patterns(alpm_list_t *patterns, const char *string); int _alpm_fnmatch(const void *pattern, const void *string); #ifndef HAVE_STRSEP -- 1.8.3.1

3 6

[pacman-dev] [PATCH] Add support for passing --unrequired twice (for optdep)
by Olivier Brunel 18 Jun '13

18 Jun '13

Passing two -t will restrict or filter output to packages also not set as optional dependency by any installed package. Makes it easy to spot potentially useless packages using -Qdttq Signed-off-by: Olivier Brunel <i.am.jack.mail(a)gmail.com> --- doc/pacman.8.txt | 4 +++- src/pacman/pacman.c | 2 +- src/pacman/query.c | 11 ++++++++--- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 1cc1eaa..6abd491 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -314,7 +314,9 @@ Query Options[[QO]] *-t, \--unrequired*:: Restrict or filter output to packages not required by any currently - installed package. + installed package. Passing two '--unrequired' or '-t' flags will restrict or + filter output to packages also not set as optional dependency by any + currently installed package. *-u, \--upgrades*:: Restrict or filter output to packages that are out-of-date on the local diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 7aa0271..4a94d32 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -483,7 +483,7 @@ static int parsearg_query(int opt) case 'p': config->op_q_isfile = 1; break; case 'q': config->quiet = 1; break; case 's': config->op_q_search = 1; break; - case 't': config->op_q_unrequired = 1; break; + case 't': (config->op_q_unrequired)++; break; case 'u': config->op_q_upgrade = 1; break; default: return 1; } diff --git a/src/pacman/query.c b/src/pacman/query.c index f5862a2..f15555a 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -312,11 +312,16 @@ static unsigned short pkg_get_locality(alpm_pkg_t *pkg) return PKG_LOCALITY_FOREIGN; } -static int is_unrequired(alpm_pkg_t *pkg) +static int is_unrequired(alpm_pkg_t *pkg, unsigned short level) { alpm_list_t *requiredby = alpm_pkg_compute_requiredby(pkg); if(requiredby == NULL) { - return 1; + if(level > 1) { + requiredby = alpm_pkg_compute_optionalfor(pkg); + } + if(requiredby == NULL) { + return 1; + } } FREELIST(requiredby); return 0; @@ -339,7 +344,7 @@ static int filter(alpm_pkg_t *pkg) return 0; } /* check if this pkg is unrequired */ - if(config->op_q_unrequired && !is_unrequired(pkg)) { + if(config->op_q_unrequired && !is_unrequired(pkg, config->op_q_unrequired)) { return 0; } /* check if this pkg is outdated */ -- 1.8.3.1

3 5