- Pacman-dev - lists.archlinux.org

[pacman-dev] Repo database(s) layout
by Allan McRae 05 Nov '13

05 Nov '13

Hi, We currently have a .db and .files databases, with .files being a superset of .db. An idea was formed on IRC to completely separate these. I.e. .db stays as it is and .files only includes the file lists. We would then add .source to include the source package information. I would set repo-add to automatically create all these files. We would then add something like "-S --refresh-files" and "-S --refresh-source" to download those files as a one off, printing a warning when using them if they are out of date compared to the repo. Another option is to use Usage as a flag for when to download them, but refreshing all those every update seems excessive. This would also allow us to have some basic pkgfile functionality in pacman (-So). So, there much to work out, but does the general idea sound good to people? Allan

2 2

[pacman-dev] [PATCH] Ignore makedepend and checkdepend entries when parsing .PKGINFO file
by Allan McRae 01 Nov '13

01 Nov '13

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/be_package.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 3f577ba..4e814f8 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -218,6 +218,10 @@ static int parse_descfile(alpm_handle_t *handle, struct archive *a, alpm_pkg_t * } else if(strcmp(key, "optdepend") == 0) { alpm_depend_t *optdep = _alpm_splitdep(ptr); newpkg->optdepends = alpm_list_add(newpkg->optdepends, optdep); + } else if(strcmp(key, "makedepend") == 0) { + /* not used atm */ + } else if(strcmp(key, "checkdepend") == 0) { + /* not used atm */ } else if(strcmp(key, "conflict") == 0) { alpm_depend_t *conflict = _alpm_splitdep(ptr); newpkg->conflicts = alpm_list_add(newpkg->conflicts, conflict); -- 1.8.4.2

1 0

[pacman-dev] [PATCH] Return zero from extract_file with local source file
by Allan McRae 01 Nov '13

01 Nov '13

The call to bsdtar to check if a file needs extracted returns 1 if it does not. We then propegate this return value accientally which can cause makepkg to report an error later on. Explicitly return 0 in this case. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- 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 0fc71c0..401d681 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -419,7 +419,7 @@ extract_file() { if bsdtar -tf "$file" -q '*' &>/dev/null; then cmd="bsdtar" else - return + return 0 fi ;; esac -- 1.8.4.2

1 1

[pacman-dev] [PATCH] alpm_handle: store lock file descriptor
by Andrew Gregory 01 Nov '13

01 Nov '13

There is a brief window between opening the file descriptor and creating a stream to it. If the process was interrupted during that window the lock file will not be removed correctly. Tracking the file descriptor allows us to remove the lock file regardless of whether or not the stream was ever created. Fixes FS#35603 Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/handle.c | 29 +++++++++++++++++------------ lib/libalpm/handle.h | 1 + 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 53c86c5..c9a70c9 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -91,11 +91,10 @@ void _alpm_handle_free(alpm_handle_t *handle) /** Lock the database */ int _alpm_handle_lock(alpm_handle_t *handle) { - int fd; char *dir, *ptr; ASSERT(handle->lockfile != NULL, return -1); - ASSERT(handle->lckstream == NULL, return 0); + ASSERT(handle->lockfd < 0, return 0); /* create the dir of the lockfile first */ dir = strdup(handle->lockfile); @@ -110,14 +109,13 @@ int _alpm_handle_lock(alpm_handle_t *handle) FREE(dir); do { - fd = open(handle->lockfile, O_WRONLY | O_CREAT | O_EXCL, 0000); - } while(fd == -1 && errno == EINTR); - if(fd >= 0) { - FILE *f = fdopen(fd, "w"); - fprintf(f, "%ld\n", (long)getpid()); - fflush(f); - fsync(fd); - handle->lckstream = f; + handle->lockfd = open(handle->lockfile, O_WRONLY | O_CREAT | O_EXCL, 0000); + } while(handle->lockfd == -1 && errno == EINTR); + if(handle->lockfd >= 0) { + handle->lckstream = fdopen(handle->lockfd, "w"); + fprintf(handle->lckstream, "%ld\n", (long)getpid()); + fflush(handle->lckstream); + fsync(handle->lockfd); return 0; } return -1; @@ -127,10 +125,17 @@ int _alpm_handle_lock(alpm_handle_t *handle) int _alpm_handle_unlock(alpm_handle_t *handle) { ASSERT(handle->lockfile != NULL, return -1); - ASSERT(handle->lckstream != NULL, return 0); + ASSERT(handle->lockfd >= 0, return 0); + + if(handle->lckstream) { + fclose(handle->lckstream); + } else { + /* no stream was opened, close the file descriptor directly */ + close(handle->lockfd); + } - fclose(handle->lckstream); handle->lckstream = NULL; + handle->lockfd = -1; if(unlink(handle->lockfile) && errno != ENOENT) { return -1; diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index 5e84d58..0395db9 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -55,6 +55,7 @@ struct __alpm_handle_t { alpm_db_t *db_local; /* local db pointer */ alpm_list_t *dbs_sync; /* List of (alpm_db_t *) */ FILE *logstream; /* log file stream pointer */ + int lockfd; /* lock file descriptor */ FILE *lckstream; /* lock file stream pointer if one exists */ alpm_trans_t *trans; -- 1.8.4.1

2 4

[pacman-dev] [PATCH 1/2] support ALPM_SIG_USE_DEFAULT for file siglevels
by Andrew Gregory 01 Nov '13

01 Nov '13

This brings file siglevels in line with how db siglevels are handled. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- As an aside, why is alpm storing these values at all? They're only used by the frontend. lib/libalpm/handle.c | 12 ++++++++++-- src/pacman/conf.c | 4 +--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 53c86c5..ea033b2 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -650,7 +650,11 @@ int SYMEXPORT alpm_option_set_local_file_siglevel(alpm_handle_t *handle, alpm_siglevel_t SYMEXPORT alpm_option_get_local_file_siglevel(alpm_handle_t *handle) { CHECK_HANDLE(handle, return -1); - return handle->localfilesiglevel; + if(handle->localfilesiglevel & ALPM_SIG_USE_DEFAULT) { + return handle->siglevel; + } else { + return handle->localfilesiglevel; + } } int SYMEXPORT alpm_option_set_remote_file_siglevel(alpm_handle_t *handle, @@ -670,7 +674,11 @@ int SYMEXPORT alpm_option_set_remote_file_siglevel(alpm_handle_t *handle, alpm_siglevel_t SYMEXPORT alpm_option_get_remote_file_siglevel(alpm_handle_t *handle) { CHECK_HANDLE(handle, return -1); - return handle->remotefilesiglevel; + if(handle->remotefilesiglevel & ALPM_SIG_USE_DEFAULT) { + return handle->siglevel; + } else { + return handle->remotefilesiglevel; + } } /* vim: set ts=2 sw=2 noet: */ diff --git a/src/pacman/conf.c b/src/pacman/conf.c index cd357ab..231fe2a 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -405,9 +405,7 @@ static int process_siglevel(alpm_list_t *values, alpm_siglevel_t *storage, static void merge_siglevel(alpm_siglevel_t *base, alpm_siglevel_t *over) { alpm_siglevel_t level = *over; - if(level & ALPM_SIG_USE_DEFAULT) { - level = *base; - } else { + if(!(level & ALPM_SIG_USE_DEFAULT)) { if(!(level & ALPM_SIG_PACKAGE_SET)) { level |= *base & ALPM_SIG_PACKAGE; level |= *base & ALPM_SIG_PACKAGE_OPTIONAL; -- 1.8.4.1

2 8

[pacman-dev] [PATCH] Fix whitespacing and other issues throughout the codebase
by Jason St. John 01 Nov '13

01 Nov '13

This commit: -- replaces space-based indents with tabs per the coding standards -- removes extraneous whitespace (e.g. extra spaces between function args) -- adds missing braces for a one-line if statement Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> --- contrib/paccache.sh.in | 4 +-- contrib/rankmirrors.sh.in | 2 +- lib/libalpm/add.c | 2 +- lib/libalpm/alpm.h | 14 ++++----- lib/libalpm/be_package.c | 2 +- lib/libalpm/deps.c | 4 +-- lib/libalpm/diskspace.c | 2 +- lib/libalpm/dload.c | 2 +- lib/libalpm/filelist.c | 2 +- lib/libalpm/handle.h | 8 +++--- lib/libalpm/remove.c | 4 +-- lib/libalpm/signing.c | 24 ++++++++-------- lib/libalpm/trans.c | 2 +- lib/libalpm/util.c | 2 +- lib/libalpm/version.c | 4 +-- scripts/makepkg.sh.in | 4 +-- scripts/pacman-optimize.sh.in | 4 +-- src/common/util-common.c | 19 +++++++------ src/pacman/callback.c | 6 ++-- src/pacman/conf.c | 2 +- src/pacman/package.c | 4 +-- src/pacman/pacman.c | 2 +- src/pacman/query.c | 2 +- src/pacman/util.c | 2 +- test/scripts/human_to_size_test.sh | 54 +++++++++++++++++------------------ test/scripts/parseopts_test.sh | 58 +++++++++++++++++++------------------- 26 files changed, 118 insertions(+), 117 deletions(-) diff --git a/contrib/paccache.sh.in b/contrib/paccache.sh.in index bcabaa4..069d0d7 100644 --- a/contrib/paccache.sh.in +++ b/contrib/paccache.sh.in @@ -300,8 +300,8 @@ pkgcount=${#candidates[*]} # copy the list, merging in any found sigs for cand in "${candidates[@]}"; do - candtemp+=("$cand") - [[ -f $cand.sig ]] && candtemp+=("$cand.sig") + candtemp+=("$cand") + [[ -f $cand.sig ]] && candtemp+=("$cand.sig") done candidates=("${candtemp[@]}") unset candtemp diff --git a/contrib/rankmirrors.sh.in b/contrib/rankmirrors.sh.in index f54369f..859e7af 100644 --- a/contrib/rankmirrors.sh.in +++ b/contrib/rankmirrors.sh.in @@ -189,7 +189,7 @@ elif [[ $FILE ]]; then fi timesarray=() -for line in "${linearray[@]}"; do +for line in "${linearray[@]}"; do if [[ $line =~ ^[[:space:]]*# ]]; then [[ $TIMESONLY ]] || echo $line elif [[ $line =~ ^[[:space:]]*Server ]]; then diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index ac4e36a..54e88a9 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -649,7 +649,7 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, PROGRESS(handle, event, newpkg->name, 100, pkg_count, pkg_current); - /* run the post-install script if it exists */ + /* run the post-install script if it exists */ if(alpm_pkg_has_scriptlet(newpkg) && !(trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) { char *scriptlet = _alpm_local_db_pkgpath(db, newpkg, "install"); diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 2c8c1e6..e9b0feb 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -79,17 +79,17 @@ typedef enum _alpm_pkgvalidation_t { /** Types of version constraints in dependency specs. */ typedef enum _alpm_depmod_t { - /** No version constraint */ + /** No version constraint */ ALPM_DEP_MOD_ANY = 1, - /** Test version equality (package=x.y.z) */ + /** Test version equality (package=x.y.z) */ ALPM_DEP_MOD_EQ, - /** Test for at least a version (package>=x.y.z) */ + /** Test for at least a version (package>=x.y.z) */ ALPM_DEP_MOD_GE, - /** Test for at most a version (package<=x.y.z) */ + /** Test for at most a version (package<=x.y.z) */ ALPM_DEP_MOD_LE, - /** Test for greater than some version (package>x.y.z) */ + /** Test for greater than some version (package>x.y.z) */ ALPM_DEP_MOD_GT, - /** Test for less than some version (package<x.y.z) */ + /** Test for less than some version (package<x.y.z) */ ALPM_DEP_MOD_LT } alpm_depmod_t; @@ -250,7 +250,7 @@ typedef struct _alpm_sigresult_t { /** * Signature list. Contains the number of signatures found and a pointer to an - * array of results. The array is of size count. + * array of results. The array is of size count. */ typedef struct _alpm_siglist_t { size_t count; diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 3f577ba..ce50683 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -419,7 +419,7 @@ alpm_pkg_t *_alpm_pkg_load_internal(alpm_handle_t *handle, } config = 1; continue; - } else if(strcmp(entry_name, ".INSTALL") == 0) { + } else if(strcmp(entry_name, ".INSTALL") == 0) { newpkg->scriptlet = 1; } else if(*entry_name == '.') { /* for now, ignore all files starting with '.' that haven't diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index dd85a01..e5a0404 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -381,8 +381,8 @@ alpm_list_t SYMEXPORT *alpm_checkdeps(alpm_handle_t *handle, /* 1. check upgrade list for satisfiers */ /* 2. check dblist for satisfiers */ if(causingpkg && - !find_dep_satisfier(upgrade, depend) && - !find_dep_satisfier(dblist, depend)) { + !find_dep_satisfier(upgrade, depend) && + !find_dep_satisfier(dblist, depend)) { alpm_depmissing_t *miss; char *missdepstring = alpm_dep_compute_string(depend); _alpm_log(handle, ALPM_LOG_DEBUG, "checkdeps: transaction would break '%s' dependency of '%s'\n", diff --git a/lib/libalpm/diskspace.c b/lib/libalpm/diskspace.c index 4526e89..dcab3b0 100644 --- a/lib/libalpm/diskspace.c +++ b/lib/libalpm/diskspace.c @@ -357,7 +357,7 @@ int _alpm_check_downloadspace(alpm_handle_t *handle, const char *cachedir, size_t j; int error = 0; - /* resolve the cachedir path to ensure we check the right mountpoint. We + /* resolve the cachedir path to ensure we check the right mountpoint. We * handle failures silently, and continue to use the possibly unresolved * path. */ if(realpath(cachedir, resolved_cachedir) != NULL) { diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 7782f8d..1032f7c 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -465,7 +465,7 @@ static int curl_download_internal(struct dload_payload *payload, payload->curlerr); /* disconnect relationships from the curl handle for things that might go out - * of scope, but could still be touched on connection teardown. This really + * of scope, but could still be touched on connection teardown. This really * only applies to FTP transfers. */ curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 1L); curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, (char *)NULL); diff --git a/lib/libalpm/filelist.c b/lib/libalpm/filelist.c index f8db9a3..e6da681 100644 --- a/lib/libalpm/filelist.c +++ b/lib/libalpm/filelist.c @@ -97,7 +97,7 @@ alpm_list_t *_alpm_filelist_intersection(alpm_filelist_t *filesA, } else { /* TODO: this creates conflicts between a symlink to a directory in * one package and a real directory in the other. For example, - * lib -> /usr/lib in pkg1 and /lib in pkg2. This would be allowed + * lib -> /usr/lib in pkg1 and /lib in pkg2. This would be allowed * when installing one package at a time _provided_ pkg1 is installed * first. This will need adjusted if the order of package install can * be guaranteed to install the symlink first */ diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index 5e84d58..e3f8055 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -52,7 +52,7 @@ do { \ struct __alpm_handle_t { /* internal usage */ - alpm_db_t *db_local; /* local db pointer */ + alpm_db_t *db_local; /* local db pointer */ alpm_list_t *dbs_sync; /* List of (alpm_db_t *) */ FILE *logstream; /* log file stream pointer */ FILE *lckstream; /* lock file stream pointer if one exists */ @@ -64,10 +64,10 @@ struct __alpm_handle_t { #endif /* callback functions */ - alpm_cb_log logcb; /* Log callback function */ - alpm_cb_download dlcb; /* Download callback function */ + alpm_cb_log logcb; /* Log callback function */ + alpm_cb_download dlcb; /* Download callback function */ alpm_cb_totaldl totaldlcb; /* Total download callback function */ - alpm_cb_fetch fetchcb; /* Download file callback function */ + alpm_cb_fetch fetchcb; /* Download file callback function */ alpm_cb_event eventcb; alpm_cb_question questioncb; alpm_cb_progress progresscb; diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 7237a56..9c3f9ef 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -672,7 +672,7 @@ int _alpm_remove_single_package(alpm_handle_t *handle, _alpm_log(handle, ALPM_LOG_DEBUG, "removing package %s-%s\n", pkgname, pkgver); - /* run the pre-remove scriptlet if it exists */ + /* run the pre-remove scriptlet if it exists */ if(alpm_pkg_has_scriptlet(oldpkg) && !(handle->trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) { char *scriptlet = _alpm_local_db_pkgpath(handle->db_local, @@ -687,7 +687,7 @@ int _alpm_remove_single_package(alpm_handle_t *handle, remove_package_files(handle, oldpkg, newpkg, targ_count, pkg_count); } - /* run the post-remove script if it exists */ + /* run the post-remove script if it exists */ if(!newpkg && alpm_pkg_has_scriptlet(oldpkg) && !(handle->trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) { char *scriptlet = _alpm_local_db_pkgpath(handle->db_local, diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index 7e4d41b..b594a9b 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -85,27 +85,27 @@ static alpm_list_t *list_sigsum(gpgme_sigsum_t sigsum) /* The docs say this can be a bitmask...not sure I believe it, but we'll code * for it anyway and show all possible flags in the returned string. */ - /* The signature is fully valid. */ + /* The signature is fully valid. */ sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_VALID, "valid"); - /* The signature is good. */ + /* The signature is good. */ sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_GREEN, "green"); - /* The signature is bad. */ + /* The signature is bad. */ sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_RED, "red"); - /* One key has been revoked. */ + /* One key has been revoked. */ sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_KEY_REVOKED, "key revoked"); - /* One key has expired. */ + /* One key has expired. */ sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_KEY_EXPIRED, "key expired"); - /* The signature has expired. */ + /* The signature has expired. */ sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_SIG_EXPIRED, "sig expired"); - /* Can't verify: key missing. */ + /* Can't verify: key missing. */ sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_KEY_MISSING, "key missing"); - /* CRL not available. */ + /* CRL not available. */ sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_CRL_MISSING, "crl missing"); - /* Available CRL is too old. */ + /* Available CRL is too old. */ sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_CRL_TOO_OLD, "crl too old"); - /* A policy was not met. */ + /* A policy was not met. */ sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_BAD_POLICY, "bad policy"); - /* A system error occurred. */ + /* A system error occurred. */ sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_SYS_ERROR, "sys error"); /* Fallback case */ if(!sigsum) { @@ -679,7 +679,7 @@ error: return ret; } -#else /* HAVE_LIBGPGME */ +#else /* HAVE_LIBGPGME */ int _alpm_key_in_keychain(alpm_handle_t UNUSED *handle, const char UNUSED *fpr) { return -1; diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index 8d4e0e7..a795a1f 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -289,7 +289,7 @@ int _alpm_runscriptlet(alpm_handle_t *handle, const char *filepath, if(!is_archive && !grep(filepath, script)) { /* script not found in scriptlet file; we can only short-circuit this early - * if it is an actual scriptlet file and not an archive. */ + * if it is an actual scriptlet file and not an archive. */ return 0; } diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 19a8612..f6493dc 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -920,7 +920,7 @@ char SYMEXPORT *alpm_compute_sha256sum(const char *filename) return hex_representation(output, 32); } -/** Calculates a file's MD5 or SHA2 digest and compares it to an expected value. +/** Calculates a file's MD5 or SHA-2 digest and compares it to an expected value. * @param filepath path of the file to check * @param expected hash value to compare against * @param type digest type to use diff --git a/lib/libalpm/version.c b/lib/libalpm/version.c index f25b279..f7e17db 100644 --- a/lib/libalpm/version.c +++ b/lib/libalpm/version.c @@ -153,7 +153,7 @@ static int rpmvercmp(const char *a, const char *b) if(isnum) { /* this used to be done by converting the digit segments */ - /* to ints using atoi() - it's changed because long */ + /* to ints using atoi() - it's changed because long */ /* digit segments can overflow an int - this should fix that. */ /* throw away any leading zeros - it's a number, right? */ @@ -172,7 +172,7 @@ static int rpmvercmp(const char *a, const char *b) } /* strcmp will return which one is greater - even if the two */ - /* segments are alpha or if they are numeric. don't return */ + /* segments are alpha or if they are numeric. don't return */ /* if they are equal because there might be more segments to */ /* compare */ rc = strcmp(one, two); diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 82f9d4a..de9310f 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1336,8 +1336,8 @@ extract_sources() { for netfile in "${source[@]}"; do local file=$(get_filename "$netfile") if in_array "$file" "${noextract[@]}"; then - #skip source files in the noextract=() array - # these are marked explicitly to NOT be extracted + # skip source files in the noextract=() array + # these are marked explicitly to NOT be extracted continue fi local proto=$(get_protocol "$netfile") diff --git a/scripts/pacman-optimize.sh.in b/scripts/pacman-optimize.sh.in index e0caf4d..9aed19d 100644 --- a/scripts/pacman-optimize.sh.in +++ b/scripts/pacman-optimize.sh.in @@ -142,8 +142,8 @@ msg "$(gettext "Making and MD5sum'ing the new database...")" mkdir "$localdb.new" bsdtar -xpf "$workdir/pacman-db.tar.gz" -C "$localdb.new" if (( $? )); then - rm -rf "$workdir" - die_r "$(gettext "Untar'ing %s failed.")" "$localdb" + rm -rf "$workdir" + die_r "$(gettext "Untar'ing %s failed.")" "$localdb" fi # immediate sync following extraction should get it written continuously on HDD msg "$(gettext "Syncing database to disk...")" diff --git a/src/common/util-common.c b/src/common/util-common.c index 40623b9..e4a9de9 100644 --- a/src/common/util-common.c +++ b/src/common/util-common.c @@ -82,9 +82,9 @@ char *mdirname(const char *path) */ static size_t strnlen(const char *s, size_t max) { - register const char *p; - for(p = s; *p && max--; ++p); - return (p - s); + register const char *p; + for(p = s; *p && max--; ++p); + return (p - s); } /** Copies a string. @@ -95,14 +95,15 @@ static size_t strnlen(const char *s, size_t max) */ char *strndup(const char *s, size_t n) { - size_t len = strnlen(s, n); - char *new = (char *) malloc(len + 1); + size_t len = strnlen(s, n); + char *new = (char *) malloc(len + 1); - if(new == NULL) - return NULL; + if(new == NULL) { + return NULL; + } - new[len] = '\0'; - return (char *)memcpy(new, s, len); + new[len] = '\0'; + return (char *)memcpy(new, s, len); } #endif diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 36531a2..1d18ac3 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -158,7 +158,7 @@ void cb_event(alpm_event_t event, void *data1, void *data2) } switch(event) { case ALPM_EVENT_CHECKDEPS_START: - printf(_("checking dependencies...\n")); + printf(_("checking dependencies...\n")); break; case ALPM_EVENT_FILECONFLICTS_START: if(config->noprogressbar) { @@ -320,7 +320,7 @@ void cb_question(alpm_question_t event, void *data1, void *data2, case ALPM_QUESTION_INSTALL_IGNOREPKG: if(!config->op_s_downloadonly) { *response = yesno(_("%s is in IgnorePkg/IgnoreGroup. Install anyway?"), - alpm_pkg_get_name(data1)); + alpm_pkg_get_name(data1)); } else { *response = 1; } @@ -724,7 +724,7 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total) fname[len] = '\0'; /* 1 space + filenamelen + 1 space + 6 for size + 1 space + 3 for label + - * + 2 spaces + 4 for rate + 1 for label + 2 for /s + 1 space + + * + 2 spaces + 4 for rate + 1 for label + 2 for /s + 1 space + * 8 for eta, gives us the magic 30 */ filenamelen = infolen - 30; /* see printf() code, we omit 'HH:' in these conditions */ diff --git a/src/pacman/conf.c b/src/pacman/conf.c index cd357ab..5b20209 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -691,7 +691,7 @@ static int setup_libalpm(void) return ret; } - /* Set GnuPG's home directory. This is not relative to rootdir, even if + /* Set GnuPG's home directory. This is not relative to rootdir, even if * rootdir is defined. Reasoning: gpgdir contains configuration data. */ config->gpgdir = config->gpgdir ? config->gpgdir : strdup(GPGDIR); ret = alpm_option_set_gpgdir(handle, config->gpgdir); diff --git a/src/pacman/package.c b/src/pacman/package.c index 78bfb50..52219ff 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -189,7 +189,7 @@ void dump_pkg_full(alpm_pkg_t *pkg, int extra) } if(from == ALPM_PKG_FROM_FILE || from == ALPM_PKG_FROM_LOCALDB) { string_display(_("Install Script :"), - alpm_pkg_has_scriptlet(pkg) ? _("Yes") : _("No"), cols); + alpm_pkg_has_scriptlet(pkg) ? _("Yes") : _("No"), cols); } if(from == ALPM_PKG_FROM_SYNCDB && extra) { @@ -206,7 +206,7 @@ void dump_pkg_full(alpm_pkg_t *pkg, int extra) } string_display(_("MD5 Sum :"), alpm_pkg_get_md5sum(pkg), cols); - string_display(_("SHA256 Sum :"), alpm_pkg_get_sha256sum(pkg), cols); + string_display(_("SHA-256 Sum :"), alpm_pkg_get_sha256sum(pkg), cols); list_display(_("Signatures :"), keys, cols); } else { list_display(_("Validated By :"), validation, cols); diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index e5d16fc..df73bcf 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -601,7 +601,7 @@ static void checkargs_query(void) invalid_opt(config->op_q_deps && config->op_q_explicit, "--deps", "--explicit"); invalid_opt((config->op_q_locality & PKG_LOCALITY_NATIVE) && - (config->op_q_locality & PKG_LOCALITY_FOREIGN), + (config->op_q_locality & PKG_LOCALITY_FOREIGN), "--native", "--foreign"); } diff --git a/src/pacman/query.c b/src/pacman/query.c index 8814307..e62272a 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -170,7 +170,7 @@ static int query_fileowner(alpm_list_t *targets) } if(lstat(filename, &buf) == -1) { - /* if it is not a path but a program name, then check in PATH */ + /* if it is not a path but a program name, then check in PATH */ if(strchr(filename, '/') == NULL) { if(search_path(&filename, &buf) == -1) { pm_printf(ALPM_LOG_ERROR, _("failed to find '%s' in PATH: %s\n"), diff --git a/src/pacman/util.c b/src/pacman/util.c index 0e9a420..5960573 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1569,7 +1569,7 @@ int pm_asprintf(char **string, const char *format, ...) /* print the message using va_arg list */ va_start(args, format); if(vasprintf(string, format, args) == -1) { - pm_printf(ALPM_LOG_ERROR, _("failed to allocate string\n")); + pm_printf(ALPM_LOG_ERROR, _("failed to allocate string\n")); ret = -1; } va_end(args); diff --git a/test/scripts/human_to_size_test.sh b/test/scripts/human_to_size_test.sh index 6306137..659d78c 100755 --- a/test/scripts/human_to_size_test.sh +++ b/test/scripts/human_to_size_test.sh @@ -5,43 +5,43 @@ declare -i testcount=0 fail=0 pass=0 total=15 # source the library function lib=${1:-${PMTEST_SCRIPTLIB_DIR}human_to_size.sh} if [[ -z $lib || ! -f $lib ]]; then - echo "Bail out! human_to_size library ($lib) could not be located\n" - exit 1 + echo "Bail out! human_to_size library ($lib) could not be located\n" + exit 1 fi . "$lib" if ! type -t human_to_size >/dev/null; then - printf 'Bail out! human_to_size function not found\n' - exit 1 + printf "Bail out! human_to_size function not found\n" + exit 1 fi parse_hts() { - local input=$1 expected=$2 result - - (( ++testcount )) - - result=$(human_to_size "$1") - if [[ $result = "$expected" ]]; then - (( ++pass )) - printf "ok %d - %s\n" "$testcount" "$input" - else - (( ++fail )) - printf "not ok %d - %s\n" "$testcount" "$input" - printf '# [TEST %3s]: FAIL\n' "$testcount" - printf '# input: %s\n' "$input" - printf '# output: %s\n' "$result" - printf '# expected: %s\n' "$expected" - fi + local input=$1 expected=$2 result + + (( ++testcount )) + + result=$(human_to_size "$1") + if [[ $result = "$expected" ]]; then + (( ++pass )) + printf "ok %d - %s\n" "$testcount" "$input" + else + (( ++fail )) + printf "not ok %d - %s\n" "$testcount" "$input" + printf '# [TEST %3s]: FAIL\n' "$testcount" + printf '# input: %s\n' "$input" + printf '# output: %s\n' "$result" + printf '# expected: %s\n' "$expected" + fi } summarize() { - if (( !fail )); then - printf '# All %s tests successful\n\n' "$testcount" - exit 0 - else - printf '# %s of %s tests failed\n\n' "$fail" "$testcount" - exit 1 - fi + if (( !fail )); then + printf '# All %s tests successful\n\n' "$testcount" + exit 0 + else + printf '# %s of %s tests failed\n\n' "$fail" "$testcount" + exit 1 + fi } trap 'summarize' EXIT diff --git a/test/scripts/parseopts_test.sh b/test/scripts/parseopts_test.sh index 5ff4bc5..4a21351 100755 --- a/test/scripts/parseopts_test.sh +++ b/test/scripts/parseopts_test.sh @@ -5,14 +5,14 @@ declare -i testcount=0 pass=0 fail=0 total=25 # source the library function lib=${1:-${PMTEST_SCRIPTLIB_DIR}parseopts.sh} if [[ -z $lib || ! -f $lib ]]; then - printf "Bail out! parseopts library ($lib) could not be located\n" - exit 1 + printf "Bail out! parseopts library ($lib) could not be located\n" + exit 1 fi . "$lib" if ! type -t parseopts >/dev/null; then - printf 'Bail out! parseopts function not found\n' - exit 1 + printf 'Bail out! parseopts function not found\n' + exit 1 fi # borrow opts from makepkg @@ -24,38 +24,38 @@ OPT_LONG=('allsource' 'asroot' 'ignorearch' 'check' 'clean:' 'cleanall' 'nodeps' 'noconfirm' 'noprogressbar') parse() { - local result=$1 tokencount=$2; shift 2 + local result=$1 tokencount=$2; shift 2 - (( ++testcount )) - parseopts "$OPT_SHORT" "${OPT_LONG[@]}" -- "$@" 2>/dev/null - test_result "$result" "$tokencount" "$*" "${OPTRET[@]}" - unset OPTRET + (( ++testcount )) + parseopts "$OPT_SHORT" "${OPT_LONG[@]}" -- "$@" 2>/dev/null + test_result "$result" "$tokencount" "$*" "${OPTRET[@]}" + unset OPTRET } test_result() { - local result=$1 tokencount=$2 input=$3; shift 3 - - if [[ $result = "$*" ]] && (( tokencount == $# )); then - (( ++pass )) - printf 'ok %d - %s\n' "$testcount" "$input" - else - printf 'not ok %d - %s\n' "$testcount" "$input" - printf '# [TEST %3s]: FAIL\n' "$testcount" - printf '# input: %s\n' "$input" - printf '# output: %s (%s tokens)\n' "$*" "$#" - printf '# expected: %s (%s tokens)\n' "$result" "$tokencount" - (( ++fail )) - fi + local result=$1 tokencount=$2 input=$3; shift 3 + + if [[ $result = "$*" ]] && (( tokencount == $# )); then + (( ++pass )) + printf 'ok %d - %s\n' "$testcount" "$input" + else + printf 'not ok %d - %s\n' "$testcount" "$input" + printf '# [TEST %3s]: FAIL\n' "$testcount" + printf '# input: %s\n' "$input" + printf '# output: %s (%s tokens)\n' "$*" "$#" + printf '# expected: %s (%s tokens)\n' "$result" "$tokencount" + (( ++fail )) + fi } summarize() { - if (( !fail )); then - printf '# All %s tests successful\n\n' "$testcount" - exit 0 - else - printf '# %s of %s tests failed\n\n' "$fail" "$testcount" - exit 1 - fi + if (( !fail )); then + printf '# All %s tests successful\n\n' "$testcount" + exit 0 + else + printf '# %s of %s tests failed\n\n' "$fail" "$testcount" + exit 1 + fi } trap 'summarize' EXIT -- 1.8.4.2

2 1

[pacman-dev] [PATCH] Improve --help switch output for pacman contrib and pacman scripts
by Jason St. John 01 Nov '13

01 Nov '13

Unify the formatting of the --help switch for pacman utils, if it exists. All of the pacman utils will now output help text using the following format: util-name (pacman) v<pacman version> one line description of util's purpose Usage: util-name [options] -b, --bar whatever --bar does -f, --foo whatever --foo does -h, --help display this help message Reported-by: Karol Błażewicz <karol.blazewicz at gmail.com> Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> --- This patch is analogous to commit a86015f except this one deals with pacman contrib and pacman scripts instead of pacman utils. contrib/bacman.sh.in | 7 ++++--- contrib/checkupdates.sh.in | 10 +++++++--- contrib/paccache.sh.in | 16 +++++++++------- contrib/pacdiff.sh.in | 8 +++++--- contrib/paclist.sh.in | 7 ++++--- contrib/paclog-pkglist.sh.in | 8 +++++--- contrib/pacscripts.sh.in | 9 +++++---- contrib/pacsearch.in | 5 +++-- contrib/pacsysclean.sh.in | 6 ++++-- contrib/rankmirrors.sh.in | 13 +++++++++---- contrib/updpkgsums.sh.in | 13 +++++++------ scripts/makepkg.sh.in | 2 ++ scripts/pacman-db-upgrade.sh.in | 1 + scripts/pkgdelta.sh.in | 4 ++-- 14 files changed, 67 insertions(+), 42 deletions(-) diff --git a/contrib/bacman.sh.in b/contrib/bacman.sh.in index 74a83bc..94487b8 100644 --- a/contrib/bacman.sh.in +++ b/contrib/bacman.sh.in @@ -37,9 +37,10 @@ m4_include(../scripts/library/output_format.sh) # User Friendliness # usage() { - echo "This program recreates a package using pacman's db and system files" - echo "Usage: $myname [--nocolor] [--pacnew] <installed package name>" - echo "Example: $myname kernel26" + echo "${myname} (pacman) v${myver}\n\n" + echo "Recreate a package using pacman's database and system files\n\n" + echo "Usage: ${myname} [--nocolor] [--pacnew] <installed package name>\n\n" + echo "Example: ${myname} linux-headers" } version() { diff --git a/contrib/checkupdates.sh.in b/contrib/checkupdates.sh.in index 48ceff9..ce6bc30 100644 --- a/contrib/checkupdates.sh.in +++ b/contrib/checkupdates.sh.in @@ -18,10 +18,14 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # +declare -r myname='checkupdates' +declare -r myver='@PACKAGE_VERSION@' + if (( $# > 0 )); then - echo "checkupdates: Safely print a list of pending updates." - echo "Use: checkupdates" - echo "Export the 'CHECKUPDATES_DB' variable to change the path of the temporary database." + echo "${myname} (pacman) v${myver}\n\n" + echo "Safely print a list of pending updates\n\n" + echo "Usage: ${myname}\n\n" + echo 'Note: Export the "CHECKUPDATES_DB" variable to change the path of the temporary database.' exit 0 fi diff --git a/contrib/paccache.sh.in b/contrib/paccache.sh.in index 2bbe726..bcabaa4 100644 --- a/contrib/paccache.sh.in +++ b/contrib/paccache.sh.in @@ -152,27 +152,29 @@ summarize() { usage() { cat <<EOF -usage: $myname <operation> [options] [targets...] +${myname} (pacman) v${myver} $myname is a flexible pacman cache cleaning utility, which has numerous options to help control how much, and what, is deleted from any directory containing pacman package tarballs. +Usage: ${myname} <operation> [options] [targets...] + Operations: -d, --dryrun perform a dry run, only finding candidate packages. - -m, --move <dir> move candidate packages to 'movedir'. + -m, --move <dir> move candidate packages to "movedir". -r, --remove remove candidate packages. Options: - -a, --arch <arch> scan for 'arch' (default: all architectures). - -c, --cachedir <dir> scan 'cachedir' for packages. + -a, --arch <arch> scan for "arch" (default: all architectures). + -c, --cachedir <dir> scan "cachedir" for packages. (default: @localstatedir@/cache/pacman/pkg). -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 - '-' to read package names from stdin, newline + -i, --ignore <pkgs> ignore "pkgs", comma-separated. Alternatively, specify + "-" to read package names from stdin, newline- delimited. - -k, --keep <num> keep 'num' of each package in 'cachedir' (default: 3). + -k, --keep <num> keep "num" of each package in "cachedir" (default: 3). --nocolor remove color from output. -u, --uninstalled target uninstalled packages. -v, --verbose increase verbosity. specify up to 3 times. diff --git a/contrib/pacdiff.sh.in b/contrib/pacdiff.sh.in index 6e70fee..4628e83 100644 --- a/contrib/pacdiff.sh.in +++ b/contrib/pacdiff.sh.in @@ -33,20 +33,22 @@ m4_include(../scripts/library/output_format.sh) usage() { cat <<EOF -$myname is a simple pacnew/pacorig/pacsave updater. +${myname} (pacman) v${myver} + +A simple pacnew/pacorig/pacsave updater. Usage: $myname [-l | -f | -p] [--nocolor] Search Options: select one, default: pacmandb -l/--locate scan using locate -f/--find scan using find - -p/--pacmandb scan active config files from pacman db + -p/--pacmandb scan active config files from pacman database General Options: -o/--output print files instead of merging them --nocolor remove colors from output -Enviroment Variables: +Environment Variables: DIFFPROG override the merge program: (default: vimdiff) DIFFSEARCHPATH override the search path. (only when using find) (default: /etc) diff --git a/contrib/paclist.sh.in b/contrib/paclist.sh.in index 7883e21..dc90b06 100644 --- a/contrib/paclist.sh.in +++ b/contrib/paclist.sh.in @@ -31,9 +31,10 @@ if ! type gettext &>/dev/null; then fi usage() { - printf '%s - List all packages installed from a given repo\n' "$myname" - printf 'Usage: %s <repo>\n' "$myname" - printf 'Example: %s testing\n' "$myname" + printf "%s (pacman) v%s\n\n" "${myname}" "${myver}" + printf "List all packages installed from a given repository\n\n" "${myname}" + printf "Usage: %s <repository>\n\n" "${myname}" + printf "Example: %s testing\n" "${myname}" } version() { diff --git a/contrib/paclog-pkglist.sh.in b/contrib/paclog-pkglist.sh.in index 9b3abad..6adfbbe 100644 --- a/contrib/paclog-pkglist.sh.in +++ b/contrib/paclog-pkglist.sh.in @@ -25,9 +25,11 @@ export TEXTDOMAINDIR='/usr/share/locale' declare logfile=${1:-@localstatedir@/log/pacman.log} usage() { - printf 'usage: %s [pacman log]\n' "$myname" - printf 'example: %s @localstatedir@/log/pacman.log\n' "$myname" - printf '\ndefaults to: @localstatedir@/log/pacman.log\n' + printf "%s (pacman) v%s\n\n" "${myname}" "${myver}" + printf "Parse a log file into a list of currently installed packages\n\n" + printf "Usage: %s [path to pacman log]\n\n" "${myname}" + printf "Example: %s @localstatedir@/log/pacman.log\n\n" "${myname}" + printf 'Defaults to: @localstatedir@/log/pacman.log' } version() { diff --git a/contrib/pacscripts.sh.in b/contrib/pacscripts.sh.in index 62c4e35..17fbe29 100644 --- a/contrib/pacscripts.sh.in +++ b/contrib/pacscripts.sh.in @@ -46,11 +46,12 @@ error() { } usage() { + echo "${myname} (pacman) v${myver}\n" echo "This program prints out the {pre,post}_{install,remove,upgrade} scripts" - echo "of a given package." - echo "Usage: $myname pkgname|pkgfile" + echo "of a given package.\n" + echo "Usage: ${myname} <pkgname|pkgfile>" echo - echo " OPTIONS:" + echo " Options:" echo " -h, --help Print this help message" echo " -v, --version Print program name and version" echo @@ -70,7 +71,7 @@ spacman() { else if ! type -p sudo; then error "Cannot find the sudo binary! Is sudo installed?" - error "Otherwise try to run the program as root" + error "Otherwise, try to run the program as root" exit 1 else sudo pacman "$@" diff --git a/contrib/pacsearch.in b/contrib/pacsearch.in index b1db8ab..624f201 100644 --- a/contrib/pacsearch.in +++ b/contrib/pacsearch.in @@ -28,8 +28,9 @@ my $myname = 'pacsearch'; my $myver = '@PACKAGE_VERSION@'; sub usage { - print "$myname - Add color and install information to a pacman -Ss search\n"; - print "Usage: $myname <pattern>\n"; + print "${myname} (pacman) v${myver}\n\n"; + print "Add color and install information to a 'pacman -Ss' search\n\n"; + print "Usage: ${myname} <pattern>\n\n"; print "Example: $myname ^gnome\n"; } diff --git a/contrib/pacsysclean.sh.in b/contrib/pacsysclean.sh.in index 37219ab..9ec428c 100644 --- a/contrib/pacsysclean.sh.in +++ b/contrib/pacsysclean.sh.in @@ -8,7 +8,10 @@ declare -r myver='@PACKAGE_VERSION@' PACMAN_OPTS= usage() { - echo "$myname - Sort installed packages by increasing installed size." + echo "${myname} (pacman) v${myver}" + echo + echo "Sort installed packages by increasing installed size. Useful for" + echo "system clean-up." echo echo "Usage: $myname [options]" echo @@ -22,7 +25,6 @@ version() { echo 'Copyright (C) 2011 Eric Bélanger <snowmaniscool(a)gmail.com>' } - if [ -n "$1" ]; then case "$1" in -o) PACMAN_OPTS="${2}" ;; diff --git a/contrib/rankmirrors.sh.in b/contrib/rankmirrors.sh.in index 5555edf..f54369f 100644 --- a/contrib/rankmirrors.sh.in +++ b/contrib/rankmirrors.sh.in @@ -21,26 +21,31 @@ # traps interrupt key to spit out pre-interrupt info trap finaloutput INT +declare -r myname='rankmirrors' +declare -r myver='@PACKAGE_VERSION@' + usage() { - echo "Usage: rankmirrors [options] MIRRORFILE | URL" + echo "${myname} (pacman) v${myver}" echo echo "Ranks pacman mirrors by their connection and opening speed. Pacman mirror" echo "files are located in @sysconfdir@/pacman.d/. It can also rank one mirror if the URL is" echo "provided." echo + echo "Usage: ${myname} [options] MIRRORFILE | URL" + echo echo "Options:" echo " --version show program's version number and exit" echo " -h, --help show this help message and exit" echo " -n NUM number of servers to output, 0 for all" echo " -t, --times only output mirrors and their response times" - echo " -u, --url test a specific url" + echo " -u, --url test a specific URL" echo " -v, --verbose be verbose in ouptut" - echo " -r, --repo specify a specific repo name instead of guessing" + echo " -r, --repo specify a specific repository name instead of guessing" exit 0 } version() { - echo "rankmirrors (pacman) @PACKAGE_VERSION@" + echo "${myname} (pacman) ${myver}" echo "Copyright (c) 2009 Matthew Bruenig <matthewbruenig(a)gmail.com>." echo echo "This is free software; see the source for copying conditions." diff --git a/contrib/updpkgsums.sh.in b/contrib/updpkgsums.sh.in index 4d35357..130cd3f 100644 --- a/contrib/updpkgsums.sh.in +++ b/contrib/updpkgsums.sh.in @@ -23,12 +23,13 @@ declare -r myname='updpkgsums' declare -r myver='@PACKAGE_VERSION@' usage() { - printf 'usage: %s [buildfile]\n\n' "$myname" - printf ' -h, --help display this help message and exit\n' - printf ' -V, --version display version information and exit\n\n' - printf '%s will perform an in place update the checksums in the\n' "$myname" - printf 'path specified by [buildfile], defaulting to PKGBUILD in the current\n' - printf 'working directory.\n' + printf "%s (pacman) v%s\n\n" "${myname}" "${myver}" + printf "%s will perform an in place update of the checksums in the\n" "${myname}" + printf "path specified by [build file], defaulting to PKGBUILD in the current\n" + printf "working directory.\n\n" + printf "Usage: %s [build file]\n\n" "${myname}" + printf " -h, --help display this help message and exit\n" + printf " -V, --version display version information and exit\n\n" } version() { diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 4cb8173..126b5c5 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2483,6 +2483,8 @@ m4_include(library/parseopts.sh) usage() { printf "makepkg (pacman) %s\n" "$makepkg_version" echo + printf -- "$(gettext "Make packages compatible for use with pacman")\n" + echo printf -- "$(gettext "Usage: %s [options]")\n" "$0" echo printf -- "$(gettext "Options:")\n" diff --git a/scripts/pacman-db-upgrade.sh.in b/scripts/pacman-db-upgrade.sh.in index a1630c5..739e5f3 100644 --- a/scripts/pacman-db-upgrade.sh.in +++ b/scripts/pacman-db-upgrade.sh.in @@ -34,6 +34,7 @@ m4_include(library/output_format.sh) usage() { printf "pacman-db-upgrade (pacman) %s\n\n" "$myver" + printf -- "$(gettext "Upgrade the local pacman database to a newer format")\n\n" printf -- "$(gettext "Usage: %s [--nocolor] [pacman_db_root]")\n\n" "$0" } diff --git a/scripts/pkgdelta.sh.in b/scripts/pkgdelta.sh.in index 39046b8..7e2fd02 100644 --- a/scripts/pkgdelta.sh.in +++ b/scripts/pkgdelta.sh.in @@ -47,9 +47,9 @@ m4_include(library/output_format.sh) # print usage instructions usage() { printf "pkgdelta (pacman) %s\n\n" "$myver" - printf -- "$(gettext "Usage: pkgdelta [options] <package1> <package2>\n")" + printf -- "$(gettext "Usage: pkgdelta [options] <package1> <package2>\n\n")" printf -- "$(gettext "\ - pkgdelta will create a delta file between two packages.\n\ +pkgdelta will create a delta file between two packages.\n\ This delta file can then be added to a database using repo-add.\n\n")" printf -- "$(gettext "Example: pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz")\n" echo -- 1.8.4.2

2 1

[pacman-dev] [PATCH] Fix minor grammatical issues in doc/index.txt
by Jason St. John 01 Nov '13

01 Nov '13

Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> --- doc/index.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/index.txt b/doc/index.txt index 9916eab..02da213 100644 --- a/doc/index.txt +++ b/doc/index.txt @@ -21,22 +21,22 @@ option) with a master server through the use of package databases. Prior to this, packages would have to be installed manually using the '\--add' and '\--upgrade' operations. -Version 3.0 was the switch to a two-part pacman- a backend named libalpm -(library for Arch Linux Package Management), and the familiar pacman frontend. +Version 3.0 was the switch to a two-part pacman- a back-end named libalpm +(library for Arch Linux Package Management), and the familiar pacman front-end. Speed in many cases was improved, along with dependency and conflict resolution being able to handle a much wider variety of cases. The switch to a library-based program should also make it easier in the future to develop alternative front ends. Version 4.0 added package signing and verification capabilities to the entire -makepkg/repo-add/pacman toolchain via GNUPG and GPGME. +makepkg/repo-add/pacman toolchain via GnuPG and GPGME. Documentation ------------- -Manpages +Man Pages ~~~~~~~~ -There are several manpages available for the programs, utilities, and +There are several man pages available for the programs, utilities, and configuration files dealing with pacman. * linkman:PKGBUILD[5] @@ -50,7 +50,7 @@ configuration files dealing with pacman. * linkman:repo-add[8] * linkman:vercmp[8] -Changelog +Change Log ~~~~~~~~~ For a good idea of what is going on in pacman development, take a look at the link:https://projects.archlinux.org/pacman.git/[Git summary page] for the @@ -194,7 +194,7 @@ link:https://mailman.archlinux.org/pipermail/pacman-dev/[view the archives]. Source Code ~~~~~~~~~~~ -Development of pacman is currently done in GIT. The central repository is +Development of pacman is currently done in Git. The central repository is hosted by Arch Linux, although some of the developers have their own trees (ask on the above mailing lists if you are interested in finding the locations of these trees). @@ -238,7 +238,7 @@ Bugs ---- If you find bugs (which is quite likely), please email them to the pacman-dev mailing last at mailto:pacman-dev@archlinux.org[] with specific information -such as your commandline, the nature of the bug, and even the package database +such as your command-line, the nature of the bug, and even the package database if it helps. You can also post a bug to the Arch Linux bug tracker -- 1.8.4.2

2 1

[pacman-dev] [PATCH] Fix leading whitespace in makepkg; fix typo in pacman-optimize
by Jason St. John 01 Nov '13

01 Nov '13

Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> --- "cannot" is the preferred spelling. Only 1 instance of "can not" exists in pacman. scripts/makepkg.sh.in | 2 +- scripts/pacman-optimize.sh.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 126b5c5..82f9d4a 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2490,7 +2490,7 @@ usage() { printf -- "$(gettext "Options:")\n" printf -- "$(gettext " -A, --ignorearch Ignore incomplete %s field in %s")\n" "arch" "$BUILDSCRIPT" printf -- "$(gettext " -c, --clean Clean up work files after build")\n" - printf -- "$(gettext " -C, --cleanbuild Remove %s dir before building the package")\n" "\$srcdir/" + printf -- "$(gettext " -C, --cleanbuild Remove %s dir before building the package")\n" "\$srcdir/" printf -- "$(gettext " -d, --nodeps Skip all dependency checks")\n" printf -- "$(gettext " -e, --noextract Do not extract source files (use existing %s dir)")\n" "\$srcdir/" printf -- "$(gettext " -f, --force Overwrite existing package")\n" diff --git a/scripts/pacman-optimize.sh.in b/scripts/pacman-optimize.sh.in index 47fbb49..e0caf4d 100644 --- a/scripts/pacman-optimize.sh.in +++ b/scripts/pacman-optimize.sh.in @@ -122,7 +122,7 @@ fi touch "$lockfile" workdir=$(mktemp -d "${TMPDIR:-/tmp}/pacman-optimize.XXXXXXXXXX") || - die_r "$(gettext "Can not create temp directory for database building.")\n" >&2 + die_r "$(gettext "Cannot create temp directory for database building.")\n" >&2 # step 1: sum the old db msg "$(gettext "MD5sum'ing the old database...")" -- 1.8.4.2

2 1

[pacman-dev] [PATCH] version: fix formatting in file to RPM upstream
by Dave Reisner 01 Nov '13

01 Nov '13

This reverts a portion of 86eefc1a3a341. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- This is a meaningful whitespace patch. lib/libalpm/version.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/lib/libalpm/version.c b/lib/libalpm/version.c index f25b279..59a7a4e 100644 --- a/lib/libalpm/version.c +++ b/lib/libalpm/version.c @@ -46,7 +46,7 @@ static void parseEVR(char *evr, const char **ep, const char **vp, s = evr; /* s points to epoch terminator */ - while(*s && isdigit(*s)) s++; + while (*s && isdigit(*s)) s++; /* se points to version terminator */ se = strrchr(s, '-'); @@ -100,15 +100,15 @@ static int rpmvercmp(const char *a, const char *b) two = ptr2 = str2; /* loop through each version segment of str1 and str2 and compare them */ - while(*one && *two) { - while(*one && !isalnum((int)*one)) one++; - while(*two && !isalnum((int)*two)) two++; + while (*one && *two) { + while (*one && !isalnum((int)*one)) one++; + while (*two && !isalnum((int)*two)) two++; /* If we ran to the end of either, we are finished with the loop */ - if(!(*one && *two)) break; + if (!(*one && *two)) break; /* If the separator lengths were different, we are also finished */ - if((one - ptr1) != (two - ptr2)) { + if ((one - ptr1) != (two - ptr2)) { return (one - ptr1) < (two - ptr2) ? -1 : 1; } @@ -118,13 +118,13 @@ static int rpmvercmp(const char *a, const char *b) /* grab first completely alpha or completely numeric segment */ /* leave one and two pointing to the start of the alpha or numeric */ /* segment and walk ptr1 and ptr2 to end of segment */ - if(isdigit((int)*ptr1)) { - while(*ptr1 && isdigit((int)*ptr1)) ptr1++; - while(*ptr2 && isdigit((int)*ptr2)) ptr2++; + if (isdigit((int)*ptr1)) { + while (*ptr1 && isdigit((int)*ptr1)) ptr1++; + while (*ptr2 && isdigit((int)*ptr2)) ptr2++; isnum = 1; } else { - while(*ptr1 && isalpha((int)*ptr1)) ptr1++; - while(*ptr2 && isalpha((int)*ptr2)) ptr2++; + while (*ptr1 && isalpha((int)*ptr1)) ptr1++; + while (*ptr2 && isalpha((int)*ptr2)) ptr2++; isnum = 0; } @@ -137,7 +137,7 @@ static int rpmvercmp(const char *a, const char *b) /* this cannot happen, as we previously tested to make sure that */ /* the first string has a non-null segment */ - if(one == ptr1) { + if (one == ptr1) { ret = -1; /* arbitrary */ goto cleanup; } @@ -146,26 +146,26 @@ static int rpmvercmp(const char *a, const char *b) /* different types: one numeric, the other alpha (i.e. empty) */ /* numeric segments are always newer than alpha segments */ /* XXX See patch #60884 (and details) from bugzilla #50977. */ - if(two == ptr2) { + if (two == ptr2) { ret = isnum ? 1 : -1; goto cleanup; } - if(isnum) { + if (isnum) { /* this used to be done by converting the digit segments */ /* to ints using atoi() - it's changed because long */ /* digit segments can overflow an int - this should fix that. */ /* throw away any leading zeros - it's a number, right? */ - while(*one == '0') one++; - while(*two == '0') two++; + while (*one == '0') one++; + while (*two == '0') two++; /* whichever number has more digits wins */ - if(strlen(one) > strlen(two)) { + if (strlen(one) > strlen(two)) { ret = 1; goto cleanup; } - if(strlen(two) > strlen(one)) { + if (strlen(two) > strlen(one)) { ret = -1; goto cleanup; } @@ -176,7 +176,7 @@ static int rpmvercmp(const char *a, const char *b) /* if they are equal because there might be more segments to */ /* compare */ rc = strcmp(one, two); - if(rc) { + if (rc) { ret = rc < 1 ? -1 : 1; goto cleanup; } @@ -191,7 +191,7 @@ static int rpmvercmp(const char *a, const char *b) /* this catches the case where all numeric and alpha segments have */ /* compared identically but the segment separating characters were */ /* different */ - if((!*one) && (!*two)) { + if ((!*one) && (!*two)) { ret = 0; goto cleanup; } @@ -202,7 +202,7 @@ static int rpmvercmp(const char *a, const char *b) * - if one is an alpha, two is newer. * - otherwise one is newer. * */ - if( (!*one && !isalpha((int)*two)) + if ( (!*one && !isalpha((int)*two)) || isalpha((int)*one) ) { ret = -1; } else { -- 1.8.4.2

2 1