From 24fc50269d3c76192a12819db6b48c8057f32378 Mon Sep 17 00:00:00 2001 From: Diego Viola Date: Sun, 4 May 2025 11:42:34 +0000 Subject: [PATCH] Fix typos --- NEWS | 10 +++++----- README | 11 ++++++++++- TRANSLATORS | 2 +- doc/asciidoc.conf | 2 +- doc/submitting-patches.asciidoc | 4 ++-- lib/libalpm/be_sync.c | 6 +++--- lib/libalpm/error.c | 2 +- lib/libalpm/trans.c | 6 +++--- lib/libalpm/trans.h | 4 ++-- proto/PKGBUILD-vcs.proto | 2 +- scripts/repo-add.sh.in | 2 +- src/pacman/pacman.c | 2 +- test/pacman/tests/sync1105.py | 2 +- 13 files changed, 32 insertions(+), 23 deletions(-) diff --git a/NEWS b/NEWS index 3570340e..2908348d 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,6 @@ VERSION DESCRIPTION ----------------------------------------------------------------------------- -7.0.0 - Add DownloadUser configuation option used to drop-privileges +7.0.0 - Add DownloadUser configuration option used to drop-privileges when downloading files. - Download files to a temporary directory owned by DownloadUser - On Linux systems, ensure the download process does not write @@ -649,7 +649,7 @@ VERSION DESCRIPTION file overwrites from malicious databases - makepkg: - restrict package name from starting with a dot - - fix BZR source revision support (FS#35281) + - fix Bazaar source revision support (FS#35281) - Use LOGDEST for log pipe - fix distcc disabling (FS#35741) - correct stat usage on BSD/Darwin (FS#35469) @@ -665,7 +665,7 @@ VERSION DESCRIPTION FS#34716, FS#35097) - makepkg: - improve SVN VCS PKGBUILD handling (FS#34675, FS#34636) - - allow "lp:" URLs for BZR sources (FS#34650) + - allow "lp:" URLs for Bazaar sources (FS#34650) - prevent pkgver() capturing stderr (FS#34974) - fix attempt to remove package twice on failure (FS#34672) - contrib: @@ -1338,7 +1338,7 @@ VERSION DESCRIPTION - add source package creation option - rankmirrors- allow reading from stdin (FS#8043) - and many other updates: 198 bugs/FRs closed since 3.0.0 release - - switch to GIT for source code management + - switch to Git for source code management 3.0.6 - config files updated to reflect current -> core change - fix symlink overwriting issue (FS#7484) - fix config parsing with tr_TR locale (FS#7235) @@ -1490,7 +1490,7 @@ VERSION DESCRIPTION - Cleanup db_loadpkgs(), add list_add_sorted() - Fixed a memory leak in db_find_conflicts() 2.8.3 - Fixed a little makepkg bug with bash 3.0 - - Fixed resolvedeps to always prefer literals over provisios + - Fixed resolvedeps to always prefer literals over providers - Added --config option to specify an alternate config file - Added "Include" directive to include repositories from config files (inspired by Michael Baehr's patch) diff --git a/README b/README index b77dba4a..af11eeaf 100644 --- a/README +++ b/README @@ -352,7 +352,7 @@ API CHANGES BETWEEN 3.4 AND 3.5 - alpm_db_get_pkg() for normal targets - alpm_find_dbs_satisfier() for versioned provisions - alpm_find_grp_pkgs() for groups -- alpm_deptest() is replaced by the more flexibile alpm_find_satisfier() +- alpm_deptest() is replaced by the more flexible alpm_find_satisfier() - size_t used for alpm_list_t sizes - return type for alpm_list_count() - parameter type in alpm_list_msort() and alpm_list_nth() @@ -724,6 +724,7 @@ API CHANGES BETWEEN 6.0 AND 6.1 - alpm_db_set_cache_servers() - alpm_db_add_cache_server() + API CHANGES BETWEEN 6.1 AND 7.0 =============================== @@ -733,3 +734,11 @@ API CHANGES BETWEEN 6.1 AND 7.0 - alpm_option_set_sandboxuser() - alpm_option_set_disable_sandbox() - alpm_sandbox_setup_child() + + +API CHANGES BETWEEN 7.0 AND 7.1 +=============================== + +[CHANGED] +- error codes: + PM_ERR_TRANS_COMMITING renamed to PM_ERR_TRANS_COMMITTING diff --git a/TRANSLATORS b/TRANSLATORS index 4648263a..9b930f64 100644 --- a/TRANSLATORS +++ b/TRANSLATORS @@ -3,7 +3,7 @@ currently. Our translations are currently maintained in Transifex; please read doc/translation-help.txt for more details. Below is a list of past translators before we switched to Transifex; more can -be found by looking in the GIT history. +be found by looking in the Git history. If your language is not already in the various po/ subdirectories and you wish it was, set up a team in Transifex for your language and we will be happy to diff --git a/doc/asciidoc.conf b/doc/asciidoc.conf index 830cc908..27f996d3 100644 --- a/doc/asciidoc.conf +++ b/doc/asciidoc.conf @@ -1,5 +1,5 @@ ## linkman: macro -# Inspired by/borrowed from the GIT source tree at Documentation/asciidoc.conf +# Inspired by/borrowed from the Git source tree at Documentation/asciidoc.conf # # Usage: linkman:command[manpage-section] # diff --git a/doc/submitting-patches.asciidoc b/doc/submitting-patches.asciidoc index d042ca5f..aeb5a019 100644 --- a/doc/submitting-patches.asciidoc +++ b/doc/submitting-patches.asciidoc @@ -11,9 +11,9 @@ NOTE: Some of this is paraphrased from the kernel documentation's Getting the most recent source ------------------------------ -Patches need to be submitted in GIT format and are best if they are against the +Patches need to be submitted in Git format and are best if they are against the latest version of the code. There are several helpful tutorials for getting -started with GIT if you have not worked with it before. +started with Git if you have not worked with it before. * https://www.kernel.org/pub/software/scm/git/docs/gittutorial.html * https://wiki.archlinux.org/index.php/Super_Quick_Git_Guide diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 5e702f27..240f07be 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -309,11 +309,11 @@ static int _sync_get_validation(alpm_pkg_t *pkg) static const struct pkg_operations *get_sync_pkg_ops(void) { static struct pkg_operations sync_pkg_ops; - static int sync_pkg_ops_initalized = 0; - if(!sync_pkg_ops_initalized) { + static int sync_pkg_ops_initialized = 0; + if(!sync_pkg_ops_initialized) { sync_pkg_ops = default_pkg_ops; sync_pkg_ops.get_validation = _sync_get_validation; - sync_pkg_ops_initalized = 1; + sync_pkg_ops_initialized = 1; } return &sync_pkg_ops; } diff --git a/lib/libalpm/error.c b/lib/libalpm/error.c index 967cfe1e..58842eac 100644 --- a/lib/libalpm/error.c +++ b/lib/libalpm/error.c @@ -137,7 +137,7 @@ const char SYMEXPORT *alpm_strerror(alpm_errno_t err) return _("conflicting dependencies"); case ALPM_ERR_FILE_CONFLICTS: return _("conflicting files"); - /* Miscellaenous */ + /* Miscellaneous */ case ALPM_ERR_RETRIEVE: return _("failed to retrieve some files"); case ALPM_ERR_INVALID_REGEX: diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index de56c254..a545a032 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -203,7 +203,7 @@ int SYMEXPORT alpm_trans_commit(alpm_handle_t *handle, alpm_list_t **data) RET_ERR(handle, ALPM_ERR_TRANS_HOOK_FAILED, -1); } - trans->state = STATE_COMMITING; + trans->state = STATE_COMMITTING; alpm_logaction(handle, ALPM_CALLER_PREFIX, "transaction started\n"); event.type = ALPM_EVENT_TRANSACTION_START; @@ -239,7 +239,7 @@ int SYMEXPORT alpm_trans_commit(alpm_handle_t *handle, alpm_list_t **data) } } - trans->state = STATE_COMMITED; + trans->state = STATE_COMMITTED; return 0; } @@ -253,7 +253,7 @@ int SYMEXPORT alpm_trans_interrupt(alpm_handle_t *handle) trans = handle->trans; ASSERT(trans != NULL, RET_ERR_ASYNC_SAFE(handle, ALPM_ERR_TRANS_NULL, -1)); - ASSERT(trans->state == STATE_COMMITING || trans->state == STATE_INTERRUPTED, + ASSERT(trans->state == STATE_COMMITTING || trans->state == STATE_INTERRUPTED, RET_ERR_ASYNC_SAFE(handle, ALPM_ERR_TRANS_TYPE, -1)); trans->state = STATE_INTERRUPTED; diff --git a/lib/libalpm/trans.h b/lib/libalpm/trans.h index 67ece774..5f110907 100644 --- a/lib/libalpm/trans.h +++ b/lib/libalpm/trans.h @@ -30,8 +30,8 @@ typedef enum _alpm_transstate_t { STATE_INITIALIZED, STATE_PREPARED, STATE_DOWNLOADING, - STATE_COMMITING, - STATE_COMMITED, + STATE_COMMITTING, + STATE_COMMITTED, STATE_INTERRUPTED } alpm_transstate_t; diff --git a/proto/PKGBUILD-vcs.proto b/proto/PKGBUILD-vcs.proto index 49c6759f..250e032f 100644 --- a/proto/PKGBUILD-vcs.proto +++ b/proto/PKGBUILD-vcs.proto @@ -3,7 +3,7 @@ # NOTE: Please fill out the license field for your package! If it is unknown, # then please put 'unknown'. -# The following guidelines are specific to BZR, GIT, HG and SVN packages. +# Guidelines specific to Bazaar, Git, Mercurial and Subversion packages. # Other VCS sources are not natively supported by makepkg yet. # Maintainer: Your Name diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index ee4cf2e5..7c3cf1d4 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -530,7 +530,7 @@ create_db() { pushd "$tmpdir/$repo" >/dev/null local files=(*) if [[ ${files[*]} = '*' ]]; then - # we have no packages remaining? zip up some emptyness + # we have no packages remaining? zip up some emptiness warning "$(gettext "No packages remain, creating empty database.")" files=(-T /dev/null) fi diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index e5ae5711..2866fc98 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -18,7 +18,7 @@ * along with this program. If not, see . */ -/* special handling of package version for GIT */ +/* special handling of package version for Git */ #if defined(GIT_VERSION) #undef PACKAGE_VERSION #define PACKAGE_VERSION GIT_VERSION diff --git a/test/pacman/tests/sync1105.py b/test/pacman/tests/sync1105.py index cc43c8ca..e25de1cb 100644 --- a/test/pacman/tests/sync1105.py +++ b/test/pacman/tests/sync1105.py @@ -1,4 +1,4 @@ -self.description = "Upgrade with a replacement in a repo with lower prioriy" +self.description = "Upgrade with a replacement in a repo with lower priority" sp1 = pmpkg("pkg2") self.addpkg2db("sync1", sp1)