[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.2.0-102-g5167160
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 5167160c0cd6007c0ed77534f02f78e5ad04e719 (commit) via ba0d225d93d4254e08e48b97ca6b55861cc8e54f (commit) via 926280cfc7da5aa6d8a4e7dc60f9831176758e7e (commit) via a82a5cf3f71e38c54a5ac1b5eaf3c83374d0e515 (commit) via 4ba0561fe722aa5e68b8e4d68eb368cba5a9a0cb (commit) via f917a4a55a30c7e4e38e5efc8401519677794617 (commit) via 63660afbc78102c704aba093a735bd82fabcfdcb (commit) via 3b20561748ff6b36ae99ff4fc1829035240cba33 (commit) via ea96b567221e1426c6f6ab2b31891d1301fd00f4 (commit) via e7d8e2b5acfbe9169c809e1e8fd31d22b7c365c5 (commit) via 4ccafc484d43710d66d2622210cf33461b1b1c49 (commit) via 09cfe2a4c061a4b2c08d93c1d99f60c8879f5cf2 (commit) via 9eb07a81fa359f323bfa540f8fbefa4c11e2260c (commit) via 7ed0d60a0db26e8ac2224196b3a629676a0b9c21 (commit) via 95121cc4f1b63fccaa27dfb567e5a2dfa628671e (commit) via 2aa85c3bfdb17a11213495558c493bc68408efe7 (commit) via 92febc847cf60b12706c64e4786dae909a9396ac (commit) via c6263da168f7d612ea221e868fe42ad2ed706fa9 (commit) via 21281e9b69fa061bb64b6fb4e25f04bd0e530554 (commit) from 018fa2b48c95492312ff3830b368a1f6036d6cf6 (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 5167160c0cd6007c0ed77534f02f78e5ad04e719 Author: Andrew Gregory <andrew.gregory.8@gmail.com> Date: Wed Oct 1 02:26:14 2014 -0400 extract_single_file: consolidate extraction logic Also adds checks that the filename does not exceed PATH_MAX. Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com> commit ba0d225d93d4254e08e48b97ca6b55861cc8e54f Author: Andrew Gregory <andrew.gregory.8@gmail.com> Date: Wed Oct 1 02:06:49 2014 -0400 extract_single_file: use .pacnew for check files Prevents the need to rename the file if we end up keeping it and ensures that pacnew files always reflect the most recent version by overwriting stale copies. Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com> commit 926280cfc7da5aa6d8a4e7dc60f9831176758e7e Author: Andrew Gregory <andrew.gregory.8@gmail.com> Date: Wed Oct 1 01:57:44 2014 -0400 remove support for .pacorig files Leave user files in place and save new config files with a .pacnew extension. This reduces the complexity of file extraction and respects the principle that pacman shouldn't modify files it didn't create. Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com> commit a82a5cf3f71e38c54a5ac1b5eaf3c83374d0e515 Author: Andrew Gregory <andrew.gregory.8@gmail.com> Date: Wed Oct 1 01:45:40 2014 -0400 extract_single_file: use full path in messages If an error occurs the actual path being extracted is more useful than the original path from the package file list. The original path is still used for checks that use it directly. Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com> commit 4ba0561fe722aa5e68b8e4d68eb368cba5a9a0cb Author: Andrew Gregory <andrew.gregory.8@gmail.com> Date: Wed Oct 1 01:35:31 2014 -0400 extract_single_file: factor out db file extraction alpm's database files (.INSTALL, .MTREE, etc.) should be extracted no matter what; skip mtree/needbackup/noextract/noupgrade checks for them. Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com> commit f917a4a55a30c7e4e38e5efc8401519677794617 Author: Andrew Gregory <andrew.gregory.8@gmail.com> Date: Wed Oct 1 01:26:33 2014 -0400 extract_single_file: reduce indentation Puts all of the conflict cases at the same level. Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com> commit 63660afbc78102c704aba093a735bd82fabcfdcb Author: Andrew Gregory <andrew.gregory.8@gmail.com> Date: Wed Oct 1 01:14:57 2014 -0400 extract_single_file: consolidate needbackup checks We need to know if a file needs to be backed up for all extracted files. Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com> commit 3b20561748ff6b36ae99ff4fc1829035240cba33 Author: Andrew Gregory <andrew.gregory.8@gmail.com> Date: Sat Apr 26 12:40:40 2014 -0400 ini.c: move error output into conf.c Move the remaining output into conf.c by notifying the callback of read errors. Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com> commit ea96b567221e1426c6f6ab2b31891d1301fd00f4 Author: Andrew Gregory <andrew.gregory.8@gmail.com> Date: Sat Apr 26 12:34:27 2014 -0400 ini.c: remove useless key check key points to a statically allocated string so it can't be NULL and empty keys are rejected by the callback. Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com> commit e7d8e2b5acfbe9169c809e1e8fd31d22b7c365c5 Author: Andrew Gregory <andrew.gregory.8@gmail.com> Date: Sat Apr 26 12:34:11 2014 -0400 ini.c: remove empty section name restriction alpm will reject empty database names already. Reduces error handling in the ini parser. Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com> commit 4ccafc484d43710d66d2622210cf33461b1b1c49 Author: Andrew Gregory <andrew.gregory.8@gmail.com> Date: Sat Apr 26 12:32:58 2014 -0400 ini.c: remove unnecessary helper function Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com> commit 09cfe2a4c061a4b2c08d93c1d99f60c8879f5cf2 Author: Andrew Gregory <andrew.gregory.8@gmail.com> Date: Sat Apr 26 12:31:33 2014 -0400 ini.c: move Include parsing to conf.c Reduces the number of errors the ini parser must handle to make it more suitable for sharing with the backend. Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com> commit 9eb07a81fa359f323bfa540f8fbefa4c11e2260c Author: Andrew Gregory <andrew.gregory.8@gmail.com> Date: Sat Apr 26 12:21:21 2014 -0400 ini.c: remove final callback call Storing repo information removes the need for the final callback. This allows the call signature to be re-purposed for indicating read errors. Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com> commit 7ed0d60a0db26e8ac2224196b3a629676a0b9c21 Author: Andrew Gregory <andrew.gregory.8@gmail.com> Date: Sat Apr 26 12:19:03 2014 -0400 conf.c: parse config in a single pass Fixes FS#28255 Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com> commit 95121cc4f1b63fccaa27dfb567e5a2dfa628671e Author: Andrew Gregory <andrew.gregory.8@gmail.com> Date: Sat Apr 26 11:53:47 2014 -0400 conf.c: use masks for siglevel inheritance This will allow pacman to parse its config file in a single pass and removes the need for the *_SET siglevels in alpm that were only required for pacman's siglevel inheritance. Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com> commit 2aa85c3bfdb17a11213495558c493bc68408efe7 Author: Andrew Gregory <andrew.gregory.8@gmail.com> Date: Sat Apr 26 11:24:13 2014 -0400 conf.c: store repo settings in dedicated struct Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com> commit 92febc847cf60b12706c64e4786dae909a9396ac Merge: 018fa2b c6263da Author: Allan McRae <allan@archlinux.org> Date: Wed Jan 21 14:27:25 2015 +1000 Merge branch 'maint' ----------------------------------------------------------------------- Summary of changes: README | 7 + contrib/README | 2 +- contrib/pacdiff.sh.in | 4 +- doc/pacman.8.txt | 5 +- lib/libalpm/add.c | 413 +++++++++++++++------------------------- lib/libalpm/alpm.h | 18 +- lib/libalpm/be_local.c | 2 +- lib/libalpm/be_sync.c | 2 +- lib/libalpm/util.c | 2 +- src/pacman/callback.c | 16 -- src/pacman/conf.c | 303 ++++++++++++++++------------- src/pacman/conf.h | 16 ++ src/pacman/ini.c | 147 +++----------- test/pacman/README | 1 - test/pacman/pmrule.py | 3 - test/pacman/tests/upgrade015.py | 1 - test/pacman/tests/upgrade016.py | 5 +- test/pacman/tests/upgrade027.py | 1 - test/pacman/tests/upgrade028.py | 1 - test/pacman/tests/upgrade029.py | 1 - 20 files changed, 390 insertions(+), 560 deletions(-) hooks/post-receive -- The official pacman repository
participants (1)
-
allan@archlinux.org