- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Revert "libalpm: compare pkgname with strcoll"
by Dan McGee 28 Sep '11

28 Sep '11

This commit was made with the intent of displaying "correctly" sorted package lists to users. Here are some reasons I think this is incorrect: * It is done in the wrong place. If a frontend application wants to show a different order of packages dependent on locale, it should do that on its own. * Even if one wants a locale-specific order, almost all package names are all ASCII and language agnostic, so this different comparison makes little sense and may serve only to confuse people. * _alpm_pkg_cmp was unlike any other comparator function. None of the rest had any dependency on anything but the content of the structs being compared (e.g., they only used strcmp() or other basic comparison operators). This reverts commit 3e4d2c3aa65416487939148828afb385de2ee146. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/package.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 11bf01a..a5ff238 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -641,7 +641,7 @@ int _alpm_pkg_cmp(const void *p1, const void *p2) { const alpm_pkg_t *pkg1 = p1; const alpm_pkg_t *pkg2 = p2; - return strcoll(pkg1->name, pkg2->name); + return strcmp(pkg1->name, pkg2->name); } /* Test for existence of a package in a alpm_list_t* -- 1.7.6.4

1 0

[pacman-dev] [PATCH 1/3] alpm_list: use malloc instead of calloc
by Dan McGee 27 Sep '11

27 Sep '11

In every case we were calling calloc, the struct we allocated (or the memory to be used) is fully specified later in the method. For alpm_list_t allocations, we always set all of data, next, and prev. For list copying and transforming to an array, we always copy the entire data element, so no need to zero it first. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/alpm_list.c | 8 ++++---- lib/libalpm/pkghash.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/libalpm/alpm_list.c b/lib/libalpm/alpm_list.c index 274d3af..15286aa 100644 --- a/lib/libalpm/alpm_list.c +++ b/lib/libalpm/alpm_list.c @@ -89,7 +89,7 @@ alpm_list_t SYMEXPORT *alpm_list_add(alpm_list_t *list, void *data) { alpm_list_t *ptr, *lp; - ptr = calloc(1, sizeof(alpm_list_t)); + ptr = malloc(sizeof(alpm_list_t)); if(ptr == NULL) { return list; } @@ -127,7 +127,7 @@ alpm_list_t SYMEXPORT *alpm_list_add_sorted(alpm_list_t *list, void *data, alpm_ } else { alpm_list_t *add = NULL, *prev = NULL, *next = list; - add = calloc(1, sizeof(alpm_list_t)); + add = malloc(sizeof(alpm_list_t)); if(add == NULL) { return list; } @@ -470,7 +470,7 @@ alpm_list_t SYMEXPORT *alpm_list_copy_data(const alpm_list_t *list, const alpm_list_t *lp = list; alpm_list_t *newlist = NULL; while(lp) { - void *newdata = calloc(1, size); + void *newdata = malloc(size); if(newdata) { memcpy(newdata, lp->data, size); newlist = alpm_list_add(newlist, newdata); @@ -775,7 +775,7 @@ void SYMEXPORT *alpm_list_to_array(const alpm_list_t *list, size_t n, return NULL; } - array = calloc(n, size); + array = malloc(n * size); if(array == NULL) { return NULL; } diff --git a/lib/libalpm/pkghash.c b/lib/libalpm/pkghash.c index f6207ad..963ba25 100644 --- a/lib/libalpm/pkghash.c +++ b/lib/libalpm/pkghash.c @@ -159,19 +159,19 @@ static alpm_pkghash_t *pkghash_add_pkg(alpm_pkghash_t *hash, alpm_pkg_t *pkg, in position = get_hash_position(pkg->name_hash, hash); - ptr = calloc(1, sizeof(alpm_list_t)); + ptr = malloc(sizeof(alpm_list_t)); if(ptr == NULL) { return hash; } ptr->data = pkg; - ptr->next = NULL; ptr->prev = ptr; + ptr->next = NULL; hash->hash_table[position] = ptr; - if(!sorted){ + if(!sorted) { hash->list = alpm_list_join(hash->list, ptr); - }else{ + } else { hash->list = alpm_list_mmerge(hash->list, ptr, _alpm_pkg_cmp); } -- 1.7.6.4

1 2

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.0rc2-17-ge70d540
by dan＠archlinux.org 27 Sep '11

27 Sep '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 e70d540501d718583a8e4b91ca5989af3f3db77d (commit) via fa929e8258c8022f15dac79dc507fa0e53190656 (commit) via b242b2d0508a94cdc4c1a68e54ef90e941cbc6d7 (commit) via 47657107af6bcfd2ef583b3014e9faffbb5d300e (commit) via 5e13b2b6af7d0cb2cbb22d6090f731e74a64afa5 (commit) from 80b0f271254f965db4d94d6bb165c64ef3553588 (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 e70d540501d718583a8e4b91ca5989af3f3db77d Author: Dan McGee <dan(a)archlinux.org> Date: Mon Sep 26 13:23:00 2011 -0500 pacman-key: use consistent punctuation in error messages Signed-off-by: Dan McGee <dan(a)archlinux.org> commit fa929e8258c8022f15dac79dc507fa0e53190656 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Sep 27 09:15:36 2011 -0500 Fix compilation using --without-gpgme I'm really good at breaking this on a regular basis. If only we had some sort of automated testing for this... Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b242b2d0508a94cdc4c1a68e54ef90e941cbc6d7 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Sep 26 13:34:39 2011 -0500 Remove unnecessary logger This is just a wrapper function; the real function we call logs an almost identical line. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 47657107af6bcfd2ef583b3014e9faffbb5d300e Author: Dan McGee <dan(a)archlinux.org> Date: Tue Sep 27 07:53:38 2011 -0500 Delay check for repository servers until we need them In the sync download code, we added an early check in 6731d0a9407e for sync download server existence so we wouldn't show the same error over and over for each file to be downloaded. Move this check into the download block so we only run it if there are actually files that need to be downloaded for this repository. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5e13b2b6af7d0cb2cbb22d6090f731e74a64afa5 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Sep 27 09:18:42 2011 +1000 Avoid comparison between signed and unsigned types Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/signing.c | 14 ++++++++++---- lib/libalpm/sync.c | 16 ++++++++-------- scripts/pacman-key.sh.in | 10 +++++----- src/pacman/pacman.c | 3 ++- 4 files changed, 25 insertions(+), 18 deletions(-) hooks/post-receive -- The official pacman repository

1 0

Re: [pacman-dev] [arch-projects] [mkinitcpio][PATCH 21/26] lsinitcpio: disable color when stdout isn't a tty
by Dan McGee 27 Sep '11

27 Sep '11

On Mon, Sep 26, 2011 at 9:01 PM, Dave Reisner <d(a)falconindy.com> wrote: > On Mon, Sep 26, 2011 at 08:57:40PM -0500, Dan McGee wrote: >> On Mon, Sep 26, 2011 at 8:22 PM, Dave Reisner <d(a)falconindy.com> wrote: >> > Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> >> Why were we using stderr before? Did something else change? > > You really wanna know? Copy/paste job from makepkg. We should fix this > over in makepkg as well. I'm not sure why it's used there either. makepkg -g >> PKGBUILD. Now whether that is a good reason is up for some debate, but you asked. :) -Dan

1 0

[pacman-dev] [PATCH] Aviod comparison between signed and unsigned types
by Allan McRae 26 Sep '11

26 Sep '11

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/pacman.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 40aa444..326664d 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -760,7 +760,8 @@ static void cl_to_log(int argc, char* argv[]) */ int main(int argc, char *argv[]) { - int i, ret = 0; + int ret = 0; + size_t i; struct sigaction new_action, old_action; const int signals[] = { SIGHUP, SIGINT, SIGTERM, SIGSEGV }; #if defined(HAVE_GETEUID) && !defined(CYGWIN) -- 1.7.6.4

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.0rc2-12-g80b0f27
by dan＠archlinux.org 26 Sep '11

26 Sep '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 80b0f271254f965db4d94d6bb165c64ef3553588 (commit) via d1fc3aec4c7f7bab30f8ad7dabd7832c7c8570e6 (commit) via 507b01b912d77f0cc5422e689623f1b19c208525 (commit) via b6ccae2d182899eaf199e868963646b3a14f7e8b (commit) via dd82b8d09f554d709f92fcdc7f873cb551b2d205 (commit) via 6adf502f0d0e684c67d7498057083958becf8b19 (commit) via d26d50e664665905d79a3d5fa589b2ca0bec4ba0 (commit) from 2517ba3303489ed35512cdaf2493ec81efd145e7 (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 80b0f271254f965db4d94d6bb165c64ef3553588 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Sep 26 17:31:34 2011 -0500 Ensure fileconflict value is actually a string When we switched to a file object and not just a simple string, we missed an update along the way here in target-target conflicts. This patch looks large, but it really comes down to one errant (char *) cast before that has been reworked to explicitly point to the alpm_file_t object. The rest is simply code cleanup. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d1fc3aec4c7f7bab30f8ad7dabd7832c7c8570e6 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Sep 25 14:32:15 2011 -0400 bash_completion: add completion for pacman-key Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 507b01b912d77f0cc5422e689623f1b19c208525 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Sep 25 15:24:53 2011 -0400 pacman-key: allow get_from to return a default value Keep the non-zero return val to let the caller know that the key wasn't found. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b6ccae2d182899eaf199e868963646b3a14f7e8b Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Sep 25 14:34:36 2011 -0400 pacman-key: simplify writing to config file Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit dd82b8d09f554d709f92fcdc7f873cb551b2d205 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Sep 24 15:08:21 2011 +1000 makepkg: normalize whitespace for optdepends in .PKGINFO Many PKGBUILDs use formatting whitespace when specifying optdepends. This is removed when adding a package to a repo-database so the output of "pacman -Si <package>" and "pacman -Qip <package file>" becomes inconsistent. Instead, do the adjustment when creating the .PKGINFO file. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6adf502f0d0e684c67d7498057083958becf8b19 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Sep 24 14:53:20 2011 +1000 makepkg: allow versioned optdepends with epoch Allow the specification of versioned optdepends with an epoch. This also (partially) enforces a whitespace between ":" and the description which is required for the future optdepends parsing code. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d26d50e664665905d79a3d5fa589b2ca0bec4ba0 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Sep 26 15:22:13 2011 -0500 Revamp pacman signal handler * All errors now go to stderr, so do the same here and simplify the writing of the error message. * Add SIGHUP to the handled signal list, and don't repeat code. * Attempt to release the transaction (e.g. remove the lock file) for all of HUP, INT, and TERM. Signals HUP and INT respects transaction state, TERM will immediately terminate the process. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/bash_completion.in | 16 +++++++++++++++ lib/libalpm/conflict.c | 30 +++++++++++++--------------- scripts/makepkg.sh.in | 6 ++-- scripts/pacman-key.sh.in | 14 ++++++------ src/pacman/pacman.c | 46 ++++++++++++++++++++++---------------------- 5 files changed, 63 insertions(+), 49 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Ensure fileconflict value is actually a string
by Dan McGee 26 Sep '11

26 Sep '11

When we switched to a file object and not just a simple string, we missed an update along the way here in target-target conflicts. This patch looks large, but it really comes down to one errant (char *) cast before that has been reworked to explicitly point to the alpm_file_t object. The rest is simply code cleanup. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- Should we take this opportunity to rework the file conflict struct type to be well typed instead of using strings everywhere? struct new_fileconflict_t { alpm_fileconflict_t *type; alpm_file_t *file; (frontend would be responsible for root path prepend) alpm_pkg_t *target; alpm_pkg_t *ctarget; }; could change package1 and package2 in _alpm_conflict_t also to be actual packages as well instead of strings. Thoughts? -Dan lib/libalpm/conflict.c | 30 ++++++++++++++---------------- 1 files changed, 14 insertions(+), 16 deletions(-) diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 1c02f18..14c23f4 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -276,30 +276,29 @@ static alpm_list_t *filelist_operation(alpm_filelist_t *filesA, return ret; } -/* Adds alpm_fileconflict_t to a conflicts list. Pass the conflicts list, type - * (either ALPM_FILECONFLICT_TARGET or ALPM_FILECONFLICT_FILESYSTEM), a file - * string, and either two package names or one package name and NULL. This is - * a wrapper for former functionality that was done inline. +/* Adds alpm_fileconflict_t to a conflicts list. Pass the conflicts list, the + * conflicting file path, and either two packages or one package and NULL. */ static alpm_list_t *add_fileconflict(alpm_handle_t *handle, - alpm_list_t *conflicts, alpm_fileconflicttype_t type, const char *filestr, - const char *name1, const char *name2) + alpm_list_t *conflicts, const char *filestr, + alpm_pkg_t *pkg1, alpm_pkg_t *pkg2) { alpm_fileconflict_t *conflict; MALLOC(conflict, sizeof(alpm_fileconflict_t), goto error); - conflict->type = type; - STRDUP(conflict->target, name1, goto error); + STRDUP(conflict->target, pkg1->name, goto error); STRDUP(conflict->file, filestr, goto error); - if(name2) { - STRDUP(conflict->ctarget, name2, goto error); + if(pkg2) { + conflict->type = ALPM_FILECONFLICT_TARGET; + STRDUP(conflict->ctarget, pkg2->name, goto error); } else { + conflict->type = ALPM_FILECONFLICT_FILESYSTEM; STRDUP(conflict->ctarget, "", goto error); } conflicts = alpm_list_add(conflicts, conflict); _alpm_log(handle, ALPM_LOG_DEBUG, "found file conflict %s, packages %s and %s\n", - filestr, name1, name2 ? name2 : "(filesystem)"); + filestr, pkg1->name, pkg2 ? pkg2->name : "(filesystem)"); return conflicts; @@ -416,9 +415,9 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, alpm_list_t *k; char path[PATH_MAX]; for(k = common_files; k; k = k->next) { - snprintf(path, PATH_MAX, "%s%s", handle->root, (char *)k->data); - conflicts = add_fileconflict(handle, conflicts, - ALPM_FILECONFLICT_TARGET, path, p1->name, p2->name); + alpm_file_t *file = k->data; + snprintf(path, PATH_MAX, "%s%s", handle->root, file->name); + conflicts = add_fileconflict(handle, conflicts, path, p1, p2); if(handle->pm_errno == ALPM_ERR_MEMORY) { FREELIST(conflicts); FREELIST(common_files); @@ -567,8 +566,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, } if(!resolved_conflict) { - conflicts = add_fileconflict(handle, conflicts, - ALPM_FILECONFLICT_FILESYSTEM, path, p1->name, NULL); + conflicts = add_fileconflict(handle, conflicts, path, p1, NULL); if(handle->pm_errno == ALPM_ERR_MEMORY) { FREELIST(conflicts); if(dbpkg) { -- 1.7.6.4

1 1

[pacman-dev] [PATCH] Revamp pacman signal handler
by Dan McGee 26 Sep '11

26 Sep '11

* All errors now go to stdout, so do the same here and simplify the writing of the error message. * Add SIGHUP to the handled signal list, and don't repeat code. * Attempt to release the transaction (e.g. remove the lock file) for all of HUP, INT, and TERM. Signals HUP and INT respects transaction state, TERM will immediately terminate the process. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- src/pacman/pacman.c | 46 +++++++++++++++++++++++----------------------- 1 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 061d593..40aa444 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -299,26 +299,29 @@ static void handler(int signum) { int out = fileno(stdout); int err = fileno(stderr); + const char *msg; if(signum == SIGSEGV) { - const char *msg1 = "error: segmentation fault\n"; - const char *msg2 = "Internal pacman error: Segmentation fault.\n" + msg = "\nerror: segmentation fault\n" "Please submit a full bug report with --debug if appropriate.\n"; - /* write a error message to out, the rest to err */ - xwrite(out, msg1, strlen(msg1)); - xwrite(err, msg2, strlen(msg2)); + xwrite(err, msg, strlen(msg)); exit(signum); - } else if(signum == SIGINT) { - const char *msg = "\nInterrupt signal received\n"; + } else if(signum == SIGINT || signum == SIGHUP) { + if(signum == SIGINT) { + msg = "\nInterrupt signal received\n"; + } else { + msg = "\nHangup signal received\n"; + } xwrite(err, msg, strlen(msg)); if(alpm_trans_interrupt(config->handle) == 0) { /* a transaction is being interrupted, don't exit pacman yet. */ return; } - /* no commiting transaction, we can release it now and then exit pacman */ - alpm_trans_release(config->handle); - /* output a newline to be sure we clear any line we may be on */ - xwrite(out, "\n", 1); } + /* SIGINT: no commiting transaction, release it now and then exit pacman + * SIGHUP, SIGTERM: release no matter what */ + alpm_trans_release(config->handle); + /* output a newline to be sure we clear any line we may be on */ + xwrite(out, "\n", 1); cleanup(128 + signum); } @@ -757,8 +760,9 @@ static void cl_to_log(int argc, char* argv[]) */ int main(int argc, char *argv[]) { - int ret = 0; + int i, ret = 0; struct sigaction new_action, old_action; + const int signals[] = { SIGHUP, SIGINT, SIGTERM, SIGSEGV }; #if defined(HAVE_GETEUID) && !defined(CYGWIN) /* geteuid undefined in CYGWIN */ uid_t myuid = geteuid(); @@ -775,17 +779,13 @@ int main(int argc, char *argv[]) sigemptyset(&new_action.sa_mask); new_action.sa_flags = 0; - sigaction(SIGINT, NULL, &old_action); - if(old_action.sa_handler != SIG_IGN) { - sigaction(SIGINT, &new_action, NULL); - } - sigaction(SIGTERM, NULL, &old_action); - if(old_action.sa_handler != SIG_IGN) { - sigaction(SIGTERM, &new_action, NULL); - } - sigaction(SIGSEGV, NULL, &old_action); - if(old_action.sa_handler != SIG_IGN) { - sigaction(SIGSEGV, &new_action, NULL); + /* assign our handler to any signals we care about */ + for(i = 0; i < sizeof(signals) / sizeof(signals[0]); i++) { + int signal = signals[i]; + sigaction(signal, NULL, &old_action); + if(old_action.sa_handler != SIG_IGN) { + sigaction(signal, &new_action, NULL); + } } /* i18n init */ -- 1.7.6.3

3 2

[pacman-dev] [PATCH] makepkg: normalize whitespace for optdepends in .PKGINFO
by Allan McRae 24 Sep '11

24 Sep '11

Many PKGBUILDs use formatting whitespace when specifying optdepends. This is removed when adding a package to a repo-database so the output of "pacman -Si <package>" and "pacman -Qip <package file>" becomes inconsistent. Instead, do the adjustment when creating the .PKGINFO file. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index a0b0375..2703177 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1134,7 +1134,7 @@ write_pkginfo() { [[ $license ]] && printf "license = %s\n" "${license[@]}" [[ $replaces ]] && printf "replaces = %s\n" "${replaces[@]}" [[ $groups ]] && printf "group = %s\n" "${groups[@]}" - [[ $optdepends ]] && printf "optdepend = %s\n" "${optdepends[@]}" + [[ $optdepends ]] && printf "optdepend = %s\n" "${optdepends[@]//+([[:space:]])/ }" [[ $conflicts ]] && printf "conflict = %s\n" "${conflicts[@]}" [[ $backup ]] && printf "backup = %s\n" "${backup[@]}" -- 1.7.6.3

1 0

[pacman-dev] [PATCH] makepkg: allow versioned optdepends with epoch
by Allan McRae 24 Sep '11

24 Sep '11

Allow the specification of versioned optdepends with an epoch. This also (partially) enforces a whitespace between ":" and the description which is required for the future optdepends parsing code. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- There are only four packages in the Arch repos that do not use a ":" followed by some whitespace before the description in their optdepends. This catches 3/4 of them, with the following is incorrectly seen as valid: optdepends=('pyglet:plotting') It is probably possible to separate a single word description from a version with epoch with a much more complicated regex... scripts/makepkg.sh.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 6304a25..a0b0375 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1529,8 +1529,8 @@ check_sanity() { eval $(awk '/^[[:space:]]*optdepends=$/,/$[[:space:]]*(#.*)?$/' "$BUILDFILE" | \ sed -e "s/optdepends=/optdepends_list+=/" -e "s/#.*//" -e 's/\\$//') for i in "${optdepends_list[@]}"; do - local pkg=${i%%:*} - if [[ $pkg != +([[:alnum:]><=.+_-]) ]]; then + local pkg=${i%%:[[:space:]]*} + if [[ $pkg != +([[:alnum:]><=.+_-:]) ]]; then error "$(gettext "Invalid syntax for %s : '%s'")" "optdepend" "$i" ret=1 fi -- 1.7.6.3

1 0