- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] pacdiff: allow DIFFPROG to contain commandline options
by Allan McRae 29 Jun '14

29 Jun '14

Also use 'vim -d' as default diff viewer. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- In FS#40758, someone pointed out that vimdiff was not installed in their vim package and suggested using 'vim -d' as the default DIFFPROG. I was tempted to say use the DIFFPROG environmental variable to deal with that, but you are unable to pass command line options using that. The drawback is DIFFPROG can not genuinely contain spaces in the command. Is anyone actually concerned about that? contrib/pacdiff.sh.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/pacdiff.sh.in b/contrib/pacdiff.sh.in index c8fbe74..ecb6ae2 100644 --- a/contrib/pacdiff.sh.in +++ b/contrib/pacdiff.sh.in @@ -23,7 +23,7 @@ shopt -s extglob declare -r myname='pacdiff' declare -r myver='@PACKAGE_VERSION@' -diffprog=${DIFFPROG:-vimdiff} +diffprog=${DIFFPROG:-'vim -d'} diffsearchpath=${DIFFSEARCHPATH:-/etc} USE_COLOR='y' declare -a oldsaves @@ -49,7 +49,7 @@ General Options: --nocolor remove colors from output Environment Variables: - DIFFPROG override the merge program: (default: vimdiff) + DIFFPROG override the merge program: (default: 'vim -d') DIFFSEARCHPATH override the search path. (only when using find) (default: /etc) @@ -118,7 +118,7 @@ done m4_include(../scripts/library/term_colors.sh) -if ! type -p $diffprog >/dev/null; then +if ! type -p ${diffprog%% *} >/dev/null; then error "Cannot find the $diffprog binary required for viewing differences." exit 1 fi -- 2.0.1

1 0

[pacman-dev] [PATCH] makepkg: handle "epoch=" in PKGBUILD with pkgver function
by Allan McRae 29 Jun '14

29 Jun '14

After resourcing the PKGBUILD in update_pkgver(), set the epoch to 0 if it is empty. Also adjust the get_full_version function to be more robust if epoch somehow still is empty. Fixes FS#41022. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index e20b707..779ebcb 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -824,6 +824,7 @@ update_pkgver() { fi @SEDINPLACE@ "s:^pkgrel=[^ ]*:pkgrel=1:" "$BUILDFILE" source_safe "$BUILDFILE" + epoch=${epoch:-0} local fullver=$(get_full_version) msg "$(gettext "Updated version: %s")" "$pkgbase $fullver" else @@ -846,10 +847,10 @@ missing_source_file() { ## get_full_version() { if [[ -z $1 ]]; then - if [[ $epoch ]] && (( ! $epoch )); then - printf "%s\n" "$pkgver-$pkgrel" - else + if [[ -n $epoch ]] && (( $epoch )); then printf "%s\n" "$epoch:$pkgver-$pkgrel" + else + printf "%s\n" "$pkgver-$pkgrel" fi else for i in pkgver pkgrel epoch; do @@ -857,10 +858,10 @@ get_full_version() { eval $(declare -f package_$1 | sed -n "s/$^[[:space:]]*$i=$/${i}_override=/p") [[ -z ${!indirect} ]] && eval ${indirect}=\"${!i}\" done - if (( ! $epoch_override )); then - printf "%s\n" "$pkgver_override-$pkgrel_override" - else + if [[ -n $epoch_override ]] && (( $epoch_override )); then printf "%s\n" "$epoch_override:$pkgver_override-$pkgrel_override" + else + printf "%s\n" "$pkgver_override-$pkgrel_override" fi fi } -- 2.0.1

1 0

[pacman-dev] [PATCH 1/5] add test for file type check with -Qk
by Andrew Gregory 29 Jun '14

29 Jun '14

If a directory has been replaced by a symlink, -Qk currently stats the symlink target rather than the symlink itself and doesn't check that the actual file type matches the package file list. This will make it difficult to discover errors once 4.2 is released and replacing directories with symlinks is no longer supported. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- test/pacman/tests/TESTS | 1 + test/pacman/tests/querycheck_fast_file_type.py | 14 ++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 test/pacman/tests/querycheck_fast_file_type.py diff --git a/test/pacman/tests/TESTS b/test/pacman/tests/TESTS index dc47294..1b5a81f 100644 --- a/test/pacman/tests/TESTS +++ b/test/pacman/tests/TESTS @@ -90,6 +90,7 @@ TESTS += test/pacman/tests/query011.py TESTS += test/pacman/tests/query012.py TESTS += test/pacman/tests/querycheck001.py TESTS += test/pacman/tests/querycheck002.py +TESTS += test/pacman/tests/querycheck_fast_file_type.py TESTS += test/pacman/tests/reason001.py TESTS += test/pacman/tests/remove001.py TESTS += test/pacman/tests/remove002.py diff --git a/test/pacman/tests/querycheck_fast_file_type.py b/test/pacman/tests/querycheck_fast_file_type.py new file mode 100644 index 0000000..a19fcee --- /dev/null +++ b/test/pacman/tests/querycheck_fast_file_type.py @@ -0,0 +1,14 @@ +self.description = "check file type without mtree" + +self.filesystem = [ "bar/", "foo -> bar/" ] + +pkg = pmpkg("dummy") +pkg.files = [ "foo/" ] +self.addpkg2db("local",pkg) + +self.args = "-Qk" + +self.addrule("PACMAN_RETCODE=1") +self.addrule("PACMAN_OUTPUT=warning.*(File type mismatch)") + +self.expectfailure = True -- 2.0.0

2 7

[pacman-dev] [PATCH 1/2] read cachedir from config file
by Dave Reisner 29 Jun '14

29 Jun '14

--- contrib/paccache.sh.in | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/contrib/paccache.sh.in b/contrib/paccache.sh.in index 039ac8a..57c0458 100644 --- a/contrib/paccache.sh.in +++ b/contrib/paccache.sh.in @@ -25,7 +25,7 @@ declare -r myver='@PACKAGE_VERSION@' declare -a candidates=() cmdopts=() whitelist=() blacklist=() declare -i delete=0 dryrun=0 filecount=0 move=0 needsroot=0 totalsaved=0 verbose=0 -declare cachedir=@localstatedir@/cache/pacman/pkg delim=$'\n' keep=3 movedir= scanarch= +declare cachedir= delim=$'\n' keep=3 movedir= scanarch= USE_COLOR='y' @@ -37,6 +37,19 @@ die() { exit 1 } +get_cachedir_from_config() { + local key value + + while IFS=$'= \t' read -r key value _; do + if [[ $key = CacheDir ]]; then + echo "$value" + return 0 + fi + done <"$1" + + return 1 +} + # reads a list of files on stdin and prints out deletion candidates pkgfilter() { # there's whitelist and blacklist parameters passed to this @@ -165,8 +178,7 @@ Usage: ${myname} <operation> [options] [targets...] Options: -a, --arch <arch> scan for "arch" (default: all architectures). - -c, --cachedir <dir> scan "dir" for packages. - (default: @localstatedir@/cache/pacman/pkg). + -c, --cachedir <dir> scan "dir" for packages. (default: $cachedir). -f, --force apply force to mv(1) and rm(1) operations. -h, --help display this help message and exit. -i, --ignore <pkgs> ignore "pkgs", comma-separated. Alternatively, specify @@ -191,6 +203,8 @@ OPT_SHORT=':a:c:dfhi:k:m:rsuVvz' OPT_LONG=('arch:' 'cachedir:' 'dryrun' 'force' 'help' 'ignore:' 'keep:' 'move' 'nocolor' 'remove' 'uninstalled' 'version' 'verbose' 'null') +cachedir=$(get_cachedir_from_config "@sysconfdir@/pacman.conf") + if ! parseopts "$OPT_SHORT" "${OPT_LONG[@]}" -- "$@"; then exit 1 fi -- 2.0.0

3 4

[pacman-dev] Fwd: [PATCH 1/1] libalpm: check for valid public key algorithm
by Allan McRae 29 Jun '14

29 Jun '14

Forwarding to list. -------- Original Message -------- Subject: [PATCH 1/1] libalpm: check for valid public key algorithm Date: Tue, 24 Jun 2014 09:38:19 +0200 From: Christian Hesse <mail(a)eworm.de> To: Allan McRae <allan(a)archlinux.org> CC: Christian Hesse <mail(a)eworm.de> --- lib/libalpm/signing.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index c6b748e..e46fa2e 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -327,6 +327,10 @@ static int key_search(alpm_handle_t *handle, const char *fpr, pgpkey->length = key->subkeys->length; pgpkey->revoked = key->subkeys->revoked; + /* Initialize with '?', this is overwritten unless public key + * algorithm is unknown. */ + pgpkey->pubkey_algo = '?'; + switch(key->subkeys->pubkey_algo) { case GPGME_PK_RSA: case GPGME_PK_RSA_E: @@ -352,6 +356,14 @@ static int key_search(alpm_handle_t *handle, const char *fpr, ret = 1; + /* We do not want to add a default switch case above to receive + * compiler error on new public key algorithm in gpgme. So check + * here if we have a valid pubkey_algo. */ + if (pgpkey->pubkey_algo == '?') { + _alpm_log(handle, ALPM_LOG_DEBUG, + "unknown public key algorithm: %d\n", key->subkeys->pubkey_algo); + } + gpg_error: if(ret != 1) { _alpm_log(handle, ALPM_LOG_DEBUG, "gpg error: %s\n", gpgme_strerror(gpg_err)); -- 2.0.0

1 0

[pacman-dev] [PATCH] handle time changes during progress display
by Andrew Gregory 28 Jun '14

28 Jun '14

Previously, if the system time was adjusted backwards during a progress display, get_update_timediff return negative values prevent the progress bar from updating. Instead, on negative values, the saved time is reset. Additionally, the download callback ignores the amount downloaded to avoid skewing the rate. Fixes FS#36983 Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/pacman/callback.c | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index a181fa5..0ffb2ef 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -73,8 +73,8 @@ static long get_update_timediff(int first_call) retval = (diff_sec * 1000) + (diff_usec / 1000); - /* do not update last_time if interval was too short */ - if(retval >= UPDATE_SPEED_MS) { + /* update last_time if it is in the future or interval was long enough */ + if(retval < 0 || retval >= UPDATE_SPEED_MS) { last_time = this_time; } } @@ -554,7 +554,7 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total) { static double rate_last; static off_t xfered_last; - static struct timeval initial_time; + static long elapsed_time = 0; int infolen; int filenamelen; char *fname, *p; @@ -616,25 +616,23 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total) /* set default starting values, ensure we only call this once * if TotalDownload is enabled */ if(!totaldownload || (totaldownload && list_xfered == 0)) { - gettimeofday(&initial_time, NULL); + elapsed_time = 0; xfered_last = (off_t)0; rate_last = 0.0; get_update_timediff(1); } } else if(file_xfered == file_total) { /* compute final values */ - struct timeval current_time; - time_t diff_sec; - suseconds_t diff_usec; + timediff = get_update_timediff(0); - gettimeofday(&current_time, NULL); - diff_sec = current_time.tv_sec - initial_time.tv_sec; - diff_usec = current_time.tv_usec - initial_time.tv_usec; - timediff = (diff_sec * 1000) + (diff_usec / 1000); if(timediff > 0) { - rate = (double)xfered / (timediff / 1000.0); + elapsed_time += timediff; + } + + if(elapsed_time > 0) { + rate = (double)xfered / (elapsed_time / 1000.0); /* round elapsed time (in ms) to the nearest second */ - eta_s = (unsigned int)(timediff + 500) / 1000; + eta_s = (unsigned int)(elapsed_time + 500) / 1000; } else { eta_s = 0; } @@ -642,10 +640,17 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total) /* compute current average values */ timediff = get_update_timediff(0); - if(timediff < UPDATE_SPEED_MS) { + if(timediff < 0) { + /* we lost a chunk of time due to a clock change, including the amount + * xfered during that period in the next update would skew the rate */ + xfered_last = xfered; + return; + } else if(timediff < UPDATE_SPEED_MS) { /* return if the calling interval was too short */ return; } + + elapsed_time += timediff; rate = (double)(xfered - xfered_last) / (timediff / 1000.0); /* average rate to reduce jumpiness */ rate = (rate + 2 * rate_last) / 3; -- 1.8.4.2

4 6

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.1.2-360-gfa0c1e1
by allan＠archlinux.org 24 Jun '14

24 Jun '14

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 fa0c1e1419b4a73b4a522bc6f4117b8bf337eabe (commit) via 8dbb80cfe9e80a5b70ada4e0b58c97a28a9fc7f7 (commit) via f1fadecfb34555cfac1c47f217253a535d64a28b (commit) via d06d993d56bda499be31042bd39aaea9b8b11e3d (commit) via 7b41952bfc812becdaba45f7823ec653ed905752 (commit) via 537a335cc724a5c7c97824d33a2406b5dcea162d (commit) via 9ff6dc93afd2c09a0ca79d3d43c2d496c1416ef8 (commit) via d920e7053c5be3325e40f504f56a37ac8c779ad2 (commit) via b9f98ae97c9419a55b609988fefc6d4fc357d350 (commit) via 4d65332ccdbb462e9fa522b3a4cb59fd4e3f44d3 (commit) via 235ce32563031ef5c01d27a4f67cadba37597921 (commit) via 2401468f5104fa6794589381cef9e970692d95e8 (commit) from ec01a22f7d13147a52ac8c0c1ee1b5fc2426de39 (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 fa0c1e1419b4a73b4a522bc6f4117b8bf337eabe Author: Silvan Jegen <s.jegen(a)gmail.com> Date: Mon Jun 23 17:51:05 2014 +0200 pacman: Correct signal handler comment and refactor One of the comments for this function is out of sync with the code. Since the code exhibits the more sane behavior of treating SIGINT and SIGHUB the same way (by not exiting pacman when there is a commit in flight) we adjust the comment. Given this code flow, the if/else statements can be simplified somewhat as well. Signed-off-by: Silvan Jegen <s.jegen(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8dbb80cfe9e80a5b70ada4e0b58c97a28a9fc7f7 Author: Olivier Brunel <jjk(a)jjacky.com> Date: Sun Jun 15 19:43:07 2014 +0200 events: Make alpm_event_t an union of all event-specific struct Signed-off-by: Olivier Brunel <jjk(a)jjacky.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f1fadecfb34555cfac1c47f217253a535d64a28b Author: Olivier Brunel <jjk(a)jjacky.com> Date: Sun Jun 15 19:42:40 2014 +0200 Update the question callback Much like with events, instead of using a bunch of void* arguments for all questions, we now send one pointer to an alpm_question_t union. This contains the type of question that was triggered. With this information, a question-specific struct can be accessed in order to get additional arguments. Signed-off-by: Olivier Brunel <jjk(a)jjacky.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d06d993d56bda499be31042bd39aaea9b8b11e3d Author: Olivier Brunel <jjk(a)jjacky.com> Date: Sun Mar 16 13:40:54 2014 +0100 alpm.h: Move alpm_errno_t definition up Because for the new question types, we'll need to use alpm_errno_t let's move its definition up. Of course to do so, we also need to move that of alpm_handle_t as well, so move all opaque structures on top. Signed-off-by: Olivier Brunel <jjk(a)jjacky.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7b41952bfc812becdaba45f7823ec653ed905752 Author: Hong Shick Pak <hong(a)hspak.com> Date: Sat Jun 14 22:37:31 2014 -0400 Move break to a new line for consistency This was the only break that didn't have its own line in the function parsearg_query. Signed-off-by: Hong Shick Pak <hong(a)hspak.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 537a335cc724a5c7c97824d33a2406b5dcea162d Author: Allan McRae <allan(a)archlinux.org> Date: Thu Jun 12 12:50:15 2014 +1000 Use C locale for bsdtar calls during package creation This ensures packages build on a UTF-8 locale system with non-ASCII character names can be installed on non-UTF-8 systems. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9ff6dc93afd2c09a0ca79d3d43c2d496c1416ef8 Author: Johannes Löthberg <johannes(a)kyriasis.com> Date: Mon Jun 2 06:49:10 2014 +0200 makepkg: Remove redundant sig generation comment Remove the comment above the signature generation command as the command is self explanatory and no longer does what the comment says. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d920e7053c5be3325e40f504f56a37ac8c779ad2 Author: Florian Pritz <bluewind(a)xinu.at> Date: Mon Jun 9 14:21:04 2014 +0200 Add test case for the perl 5.20 dependency breakage This test currently fails. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b9f98ae97c9419a55b609988fefc6d4fc357d350 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jun 2 09:43:57 2014 +1000 Add compatibility with gpgme-1.5.0 Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4d65332ccdbb462e9fa522b3a4cb59fd4e3f44d3 Author: Allan McRae <allan(a)archlinux.org> Date: Sun May 25 14:37:01 2014 +1000 Clarify that -Ql prints a file list FS#40234 Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 235ce32563031ef5c01d27a4f67cadba37597921 Author: Andrew DeMaria <lostonamountain(a)gmail.com> Date: Sun May 25 13:59:26 2014 +1000 makepkg: pass "--nocolor" to pacman FS#39982. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2401468f5104fa6794589381cef9e970692d95e8 Author: Allan McRae <allan(a)archlinux.org> Date: Sun May 25 13:53:19 2014 +1000 makepkg: Force buildscripts to be in startdir We expect all source file to lie in $startdir. However, using "makepkg -p <buildscript>" can currently allows people to specify buildscripts in other directories. This results in confusion about where other sources should lie (in startdir or in the directory that the buildscript is in). Explicitly disable using -p for files in other directories to avoid this issue. Fixes FS#40293. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/makepkg.8.txt | 3 +- lib/libalpm/alpm.h | 304 ++++++++++++++------- lib/libalpm/deps.c | 38 ++- lib/libalpm/handle.h | 4 +- lib/libalpm/signing.c | 16 +- lib/libalpm/sync.c | 60 ++-- scripts/makepkg.sh.in | 15 +- src/pacman/callback.c | 135 ++++----- src/pacman/callback.h | 3 +- src/pacman/pacman.c | 11 +- test/pacman/tests/TESTS | 1 + ...nc-update-package-removing-required-provides.py | 23 ++ 12 files changed, 401 insertions(+), 212 deletions(-) create mode 100644 test/pacman/tests/sync-update-package-removing-required-provides.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] pacman: Correct signal handler behavior
by Silvan Jegen 23 Jun '14

23 Jun '14

One of the comments for this function is out of sync with the code. If a SIGHUP is received the code calls the release function only if there is no transaction in flight (contrary to the comments). This change brings the code in line with the comment (and moves the comment for readability). Additionally, it changes the exit message to reflect the fact that the signal received was either a SIGHUP or a SIGTERM. Signed-off-by: Silvan Jegen <s.jegen(a)gmail.com> --- src/pacman/pacman.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index ef86d39..599a141 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -301,20 +301,20 @@ static void handler(int signum) "Please submit a full bug report with --debug if appropriate.\n"; xwrite(err, msg, strlen(msg)); exit(signum); - } 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)); + } + /* SIGINT: no committing transaction, release it now and then exit pacman + * SIGHUP, SIGTERM: release no matter what */ + if(signum == SIGINT) { + msg = "\nInterrupt signal received\n"; if(alpm_trans_interrupt(config->handle) == 0) { /* a transaction is being interrupted, don't exit pacman yet. */ return; } + } else { + msg = "\nHangup/Termination signal received\n"; } - /* SIGINT: no committing transaction, release it now and then exit pacman - * SIGHUP, SIGTERM: release no matter what */ + + xwrite(err, msg, strlen(msg)); alpm_trans_release(config->handle); /* output a newline to be sure we clear any line we may be on */ xwrite(out, "\n", 1); -- 2.0.0

3 7

[pacman-dev] [PATCH] events: Make alpm_event_t an union of all event-specific struct
by Olivier Brunel 23 Jun '14

23 Jun '14

Signed-off-by: Olivier Brunel <jjk(a)jjacky.com> --- Similar as changes done re: questions. lib/libalpm/alpm.h | 29 ++++++++++++++++++++++------- src/pacman/callback.c | 25 ++++++++++++------------- 2 files changed, 34 insertions(+), 20 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index b0adb95..ffd71c6 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -361,15 +361,10 @@ typedef enum _alpm_event_type_t { ALPM_EVENT_PACORIG_CREATED } alpm_event_type_t; -/** Events. - * This is a generic struct this is passed to the callback, that allows the - * frontend to know which type of event was triggered. It is then possible to - * typecast the pointer to the right structure, in order to access - * event-specific data. */ -typedef struct _alpm_event_t { +typedef struct _alpm_event_any_t { /** Type of event. */ alpm_event_type_t type; -} alpm_event_t; +} alpm_event_any_t; typedef enum _alpm_package_operation_t { /** Package (to be) installed. (No oldpkg) */ @@ -481,6 +476,26 @@ typedef struct _alpm_event_pacorig_created_t { const char *file; } alpm_event_pacorig_created_t; +/** Events. + * This is an union passed to the callback, that allows the frontend to know + * which type of event was triggered (via type). It is then possible to + * typecast the pointer to the right structure, or use the union field, in order + * to access event-specific data. */ +typedef union _alpm_event_t { + alpm_event_type_t type; + alpm_event_any_t any; + alpm_event_package_operation_t package_operation; + alpm_event_optdep_removal_t optdep_removal; + alpm_event_delta_patch_t delta_patch; + alpm_event_scriptlet_info_t scriptlet_info; + alpm_event_database_missing_t database_missing; + alpm_event_log_t log; + alpm_event_pkgdownload_t pkgdownload; + alpm_event_pacnew_created_t pacnew_created; + alpm_event_pacsave_created_t pacsave_created; + alpm_event_pacorig_created_t pacorig_created; +} alpm_event_t; + /** Event callback. */ typedef void (*alpm_cb_event)(alpm_event_t *); diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 340a3a1..88f5313 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -171,7 +171,7 @@ void cb_event(alpm_event_t *event) break; case ALPM_EVENT_PACKAGE_OPERATION_START: if(config->noprogressbar) { - alpm_event_package_operation_t *e = (alpm_event_package_operation_t *) event; + alpm_event_package_operation_t *e = &event->package_operation; switch(e->operation) { case ALPM_PACKAGE_INSTALL: printf(_("installing %s...\n"), alpm_pkg_get_name(e->newpkg)); @@ -193,7 +193,7 @@ void cb_event(alpm_event_t *event) break; case ALPM_EVENT_PACKAGE_OPERATION_DONE: { - alpm_event_package_operation_t *e = (alpm_event_package_operation_t *) event; + alpm_event_package_operation_t *e = &event->package_operation; switch(e->operation) { case ALPM_PACKAGE_INSTALL: display_optdepends(e->newpkg); @@ -233,10 +233,9 @@ void cb_event(alpm_event_t *event) printf(_("applying deltas...\n")); break; case ALPM_EVENT_DELTA_PATCH_START: - { - alpm_event_delta_patch_t *e = (alpm_event_delta_patch_t *) event; - printf(_("generating %s with %s... "), e->delta->to, e->delta->delta); - } + printf(_("generating %s with %s... "), + event->delta_patch.delta->to, + event->delta_patch.delta->delta); break; case ALPM_EVENT_DELTA_PATCH_DONE: printf(_("success!\n")); @@ -245,7 +244,7 @@ void cb_event(alpm_event_t *event) printf(_("failed.\n")); break; case ALPM_EVENT_SCRIPTLET_INFO: - fputs(((alpm_event_scriptlet_info_t *) event)->line, stdout); + fputs(event->scriptlet_info.line, stdout); break; case ALPM_EVENT_RETRIEVE_START: colon_printf(_("Retrieving packages ...\n")); @@ -257,7 +256,7 @@ void cb_event(alpm_event_t *event) break; case ALPM_EVENT_OPTDEP_REMOVAL: { - alpm_event_optdep_removal_t *e = (alpm_event_optdep_removal_t *) event; + alpm_event_optdep_removal_t *e = &event->optdep_removal; colon_printf(_("%s optionally requires %s\n"), alpm_pkg_get_name(e->pkg), alpm_dep_compute_string(e->optdep)); @@ -267,12 +266,12 @@ void cb_event(alpm_event_t *event) if(!config->op_s_sync) { pm_printf(ALPM_LOG_WARNING, "database file for '%s' does not exist\n", - ((alpm_event_database_missing_t *) event)->dbname); + event->database_missing.dbname); } break; case ALPM_EVENT_LOG: { - alpm_event_log_t *e = (alpm_event_log_t *) event; + alpm_event_log_t *e = &event->log; if(!e->fmt || strlen(e->fmt) == 0) { break; } @@ -290,7 +289,7 @@ void cb_event(alpm_event_t *event) break; case ALPM_EVENT_PACNEW_CREATED: { - alpm_event_pacnew_created_t *e = (alpm_event_pacnew_created_t *) event; + alpm_event_pacnew_created_t *e = &event->pacnew_created; if(on_progress) { char *string = NULL; pm_sprintf(&string, ALPM_LOG_WARNING, _("%s installed as %s.pacnew\n"), @@ -306,7 +305,7 @@ void cb_event(alpm_event_t *event) break; case ALPM_EVENT_PACSAVE_CREATED: { - alpm_event_pacsave_created_t *e = (alpm_event_pacsave_created_t *) event; + alpm_event_pacsave_created_t *e = &event->pacsave_created; if(on_progress) { char *string = NULL; pm_sprintf(&string, ALPM_LOG_WARNING, _("%s saved as %s.pacsave\n"), @@ -322,7 +321,7 @@ void cb_event(alpm_event_t *event) break; case ALPM_EVENT_PACORIG_CREATED: { - alpm_event_pacorig_created_t *e = (alpm_event_pacorig_created_t *) event; + alpm_event_pacorig_created_t *e = &event->pacorig_created; if(on_progress) { char *string = NULL; pm_sprintf(&string, ALPM_LOG_WARNING, _("%s saved as %s.pacorig\n"), -- 2.0.0

2 2

[pacman-dev] [PATCH] Move break to a new line for consistency
by Hong Shick Pak 23 Jun '14

23 Jun '14

This was the only break that didn't have its own line in the function parsearg_query. Signed-off-by: Hong Shick Pak <hong(a)hspak.com> --- src/pacman/pacman.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index ef86d39..af43656 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -549,7 +549,8 @@ static int parsearg_query(int opt) break; case OP_UPGRADES: case 'u': - config->op_q_upgrade = 1; break; + config->op_q_upgrade = 1; + break; default: return 1; } -- 2.0.0

2 1