bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix typos

Browse source
This commit is contained in:
Diego Viola 2025-05-04 11:42:34 +00:00 • committed by Allan McRae
parent 08070e9abe
commit 24fc50269d
13 changed files with 32 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
NEWS
View file

@ -1,6 +1,6 @@
VERSION DESCRIPTION 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. when downloading files.
- Download files to a temporary directory owned by DownloadUser - Download files to a temporary directory owned by DownloadUser
- On Linux systems, ensure the download process does not write - On Linux systems, ensure the download process does not write
@ -649,7 +649,7 @@ VERSION DESCRIPTION
file overwrites from malicious databases file overwrites from malicious databases
- makepkg: - makepkg:
- restrict package name from starting with a dot - 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 - Use LOGDEST for log pipe
- fix distcc disabling (FS#35741) - fix distcc disabling (FS#35741)
- correct stat usage on BSD/Darwin (FS#35469) - correct stat usage on BSD/Darwin (FS#35469)
@ -665,7 +665,7 @@ VERSION DESCRIPTION
FS#34716, FS#35097) FS#34716, FS#35097)
- makepkg: - makepkg:
- improve SVN VCS PKGBUILD handling (FS#34675, FS#34636) - 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) - prevent pkgver() capturing stderr (FS#34974)
- fix attempt to remove package twice on failure (FS#34672) - fix attempt to remove package twice on failure (FS#34672)
- contrib: - contrib:
@ -1338,7 +1338,7 @@ VERSION DESCRIPTION
- add source package creation option - add source package creation option
- rankmirrors- allow reading from stdin (FS#8043) - rankmirrors- allow reading from stdin (FS#8043)
- and many other updates: 198 bugs/FRs closed since 3.0.0 release - 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 3.0.6 - config files updated to reflect current -> core change
- fix symlink overwriting issue (FS#7484) - fix symlink overwriting issue (FS#7484)
- fix config parsing with tr_TR locale (FS#7235) - fix config parsing with tr_TR locale (FS#7235)
@ -1490,7 +1490,7 @@ VERSION DESCRIPTION
- Cleanup db_loadpkgs(), add list_add_sorted() - Cleanup db_loadpkgs(), add list_add_sorted()
- Fixed a memory leak in db_find_conflicts() - Fixed a memory leak in db_find_conflicts()
2.8.3 - Fixed a little makepkg bug with bash 3.0 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 --config option to specify an alternate config file
- Added "Include" directive to include repositories from - Added "Include" directive to include repositories from
config files (inspired by Michael Baehr's patch) config files (inspired by Michael Baehr's patch)

11
README
View file

@ -352,7 +352,7 @@ API CHANGES BETWEEN 3.4 AND 3.5
- alpm_db_get_pkg() for normal targets - alpm_db_get_pkg() for normal targets
- alpm_find_dbs_satisfier() for versioned provisions - alpm_find_dbs_satisfier() for versioned provisions
- alpm_find_grp_pkgs() for groups - 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 - size_t used for alpm_list_t sizes
- return type for alpm_list_count() - return type for alpm_list_count()
- parameter type in alpm_list_msort() and alpm_list_nth() - 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_set_cache_servers()
- alpm_db_add_cache_server() - alpm_db_add_cache_server()
API CHANGES BETWEEN 6.1 AND 7.0 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_sandboxuser()
- alpm_option_set_disable_sandbox() - alpm_option_set_disable_sandbox()
- alpm_sandbox_setup_child() - 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

2
TRANSLATORS
View file

@ -3,7 +3,7 @@ currently. Our translations are currently maintained in Transifex; please read
doc/translation-help.txt for more details. doc/translation-help.txt for more details.
Below is a list of past translators before we switched to Transifex; more can 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 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 it was, set up a team in Transifex for your language and we will be happy to

2
doc/asciidoc.conf
View file

@ -1,5 +1,5 @@
## linkman: macro ## 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] # Usage: linkman:command[manpage-section]
# #

4
doc/submitting-patches.asciidoc
View file

@ -11,9 +11,9 @@ NOTE: Some of this is paraphrased from the kernel documentation's
Getting the most recent source 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 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://www.kernel.org/pub/software/scm/git/docs/gittutorial.html
* https://wiki.archlinux.org/index.php/Super_Quick_Git_Guide * https://wiki.archlinux.org/index.php/Super_Quick_Git_Guide

6
lib/libalpm/be_sync.c
View file

@ -309,11 +309,11 @@ static int _sync_get_validation(alpm_pkg_t *pkg)
static const struct pkg_operations *get_sync_pkg_ops(void) static const struct pkg_operations *get_sync_pkg_ops(void)
{ {
static struct pkg_operations sync_pkg_ops; static struct pkg_operations sync_pkg_ops;
static int sync_pkg_ops_initalized = 0; static int sync_pkg_ops_initialized = 0;
if(!sync_pkg_ops_initalized) { if(!sync_pkg_ops_initialized) {
sync_pkg_ops = default_pkg_ops; sync_pkg_ops = default_pkg_ops;
sync_pkg_ops.get_validation = _sync_get_validation; sync_pkg_ops.get_validation = _sync_get_validation;
sync_pkg_ops_initalized = 1; sync_pkg_ops_initialized = 1;
} }
return &sync_pkg_ops; return &sync_pkg_ops;
} }

2
lib/libalpm/error.c
View file

@ -137,7 +137,7 @@ const char SYMEXPORT *alpm_strerror(alpm_errno_t err)
return _("conflicting dependencies"); return _("conflicting dependencies");
case ALPM_ERR_FILE_CONFLICTS: case ALPM_ERR_FILE_CONFLICTS:
return _("conflicting files"); return _("conflicting files");
/* Miscellaenous */ /* Miscellaneous */
case ALPM_ERR_RETRIEVE: case ALPM_ERR_RETRIEVE:
return _("failed to retrieve some files"); return _("failed to retrieve some files");
case ALPM_ERR_INVALID_REGEX: case ALPM_ERR_INVALID_REGEX:

6
lib/libalpm/trans.c
View file

@ -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); 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"); alpm_logaction(handle, ALPM_CALLER_PREFIX, "transaction started\n");
event.type = ALPM_EVENT_TRANSACTION_START; 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; return 0;
} }
@ -253,7 +253,7 @@ int SYMEXPORT alpm_trans_interrupt(alpm_handle_t *handle)
trans = handle->trans; trans = handle->trans;
ASSERT(trans != NULL, RET_ERR_ASYNC_SAFE(handle, ALPM_ERR_TRANS_NULL, -1)); 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)); RET_ERR_ASYNC_SAFE(handle, ALPM_ERR_TRANS_TYPE, -1));
trans->state = STATE_INTERRUPTED; trans->state = STATE_INTERRUPTED;

4
lib/libalpm/trans.h
View file

@ -30,8 +30,8 @@ typedef enum _alpm_transstate_t {
STATE_INITIALIZED, STATE_INITIALIZED,
STATE_PREPARED, STATE_PREPARED,
STATE_DOWNLOADING, STATE_DOWNLOADING,
STATE_COMMITING, STATE_COMMITTING,
STATE_COMMITED, STATE_COMMITTED,
STATE_INTERRUPTED STATE_INTERRUPTED
} alpm_transstate_t; } alpm_transstate_t;

2
proto/PKGBUILD-vcs.proto
View file

@ -3,7 +3,7 @@
# NOTE: Please fill out the license field for your package! If it is unknown, # NOTE: Please fill out the license field for your package! If it is unknown,
# then please put '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. # Other VCS sources are not natively supported by makepkg yet.
# Maintainer: Your Name <youremail@domain.com> # Maintainer: Your Name <youremail@domain.com>

2
scripts/repo-add.sh.in
View file

@ -530,7 +530,7 @@ create_db() {
pushd "$tmpdir/$repo" >/dev/null pushd "$tmpdir/$repo" >/dev/null
local files=(*) local files=(*)
if [[ ${files[*]} = '*' ]]; then 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.")" warning "$(gettext "No packages remain, creating empty database.")"
files=(-T /dev/null) files=(-T /dev/null)
fi fi

2
src/pacman/pacman.c
View file

@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
/* special handling of package version for GIT */ /* special handling of package version for Git */
#if defined(GIT_VERSION) #if defined(GIT_VERSION)
#undef PACKAGE_VERSION #undef PACKAGE_VERSION
#define PACKAGE_VERSION GIT_VERSION #define PACKAGE_VERSION GIT_VERSION

2
test/pacman/tests/sync1105.py
View file

@ -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") sp1 = pmpkg("pkg2")
self.addpkg2db("sync1", sp1) self.addpkg2db("sync1", sp1)