- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Rename mount point struct
by Allan McRae 28 Jun '11

28 Jun '11

Rename alpm_mountpoint_t to pmmountpoint_t to keep naming consistent with every other struct we have. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/diskspace.c | 26 +++++++++++++------------- lib/libalpm/diskspace.h | 4 ++-- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/lib/libalpm/diskspace.c b/lib/libalpm/diskspace.c index 51aa47f..8824654 100644 --- a/lib/libalpm/diskspace.c +++ b/lib/libalpm/diskspace.c @@ -53,8 +53,8 @@ static int mount_point_cmp(const void *p1, const void *p2) { - const alpm_mountpoint_t *mp1 = p1; - const alpm_mountpoint_t *mp2 = p2; + const pmmountpoint_t *mp1 = p1; + const pmmountpoint_t *mp2 = p2; /* the negation will sort all mountpoints before their parent */ return -strcmp(mp1->mount_dir, mp2->mount_dir); } @@ -62,7 +62,7 @@ static int mount_point_cmp(const void *p1, const void *p2) static alpm_list_t *mount_point_list(pmhandle_t *handle) { alpm_list_t *mount_points = NULL, *ptr; - alpm_mountpoint_t *mp; + pmmountpoint_t *mp; #if defined HAVE_GETMNTENT struct mntent *mnt; @@ -87,7 +87,7 @@ static alpm_list_t *mount_point_list(pmhandle_t *handle) continue; } - CALLOC(mp, 1, sizeof(alpm_mountpoint_t), RET_ERR(handle, PM_ERR_MEMORY, NULL)); + CALLOC(mp, 1, sizeof(pmmountpoint_t), RET_ERR(handle, PM_ERR_MEMORY, NULL)); mp->mount_dir = strdup(mnt->mnt_dir); mp->mount_dir_len = strlen(mp->mount_dir); memcpy(&(mp->fsp), &fsp, sizeof(struct statvfs)); @@ -108,7 +108,7 @@ static alpm_list_t *mount_point_list(pmhandle_t *handle) } for(; entries-- > 0; fsp++) { - CALLOC(mp, 1, sizeof(alpm_mountpoint_t), RET_ERR(PM_ERR_MEMORY, NULL)); + CALLOC(mp, 1, sizeof(pmmountpoint_t), RET_ERR(PM_ERR_MEMORY, NULL)); mp->mount_dir = strdup(fsp->f_mntonname); mp->mount_dir_len = strlen(mp->mount_dir); memcpy(&(mp->fsp), fsp, sizeof(FSSTATSTYPE)); @@ -131,13 +131,13 @@ static alpm_list_t *mount_point_list(pmhandle_t *handle) return mount_points; } -static alpm_mountpoint_t *match_mount_point(const alpm_list_t *mount_points, +static pmmountpoint_t *match_mount_point(const alpm_list_t *mount_points, const char *real_path) { const alpm_list_t *mp; for(mp = mount_points; mp != NULL; mp = mp->next) { - alpm_mountpoint_t *data = mp->data; + pmmountpoint_t *data = mp->data; if(strncmp(data->mount_dir, real_path, data->mount_dir_len) == 0) { return data; @@ -155,7 +155,7 @@ static int calculate_removed_size(pmhandle_t *handle, alpm_list_t *files = alpm_pkg_get_files(pkg); for(file = files; file; file = file->next) { - alpm_mountpoint_t *mp; + pmmountpoint_t *mp; struct stat st; char path[PATH_MAX]; const char *filename = file->data; @@ -209,7 +209,7 @@ static int calculate_installed_size(pmhandle_t *handle, } while(archive_read_next_header(archive, &entry) == ARCHIVE_OK) { - alpm_mountpoint_t *mp; + pmmountpoint_t *mp; const char *filename; mode_t mode; char path[PATH_MAX]; @@ -260,7 +260,7 @@ cleanup: int _alpm_check_diskspace(pmhandle_t *handle) { alpm_list_t *mount_points, *i; - alpm_mountpoint_t *root_mp; + pmmountpoint_t *root_mp; size_t replaces = 0, current = 0, numtargs; int error = 0; alpm_list_t *targ; @@ -308,7 +308,7 @@ int _alpm_check_diskspace(pmhandle_t *handle) calculate_installed_size(handle, mount_points, pkg); for(i = mount_points; i; i = alpm_list_next(i)) { - alpm_mountpoint_t *data = i->data; + pmmountpoint_t *data = i->data; if(data->blocks_needed > data->max_blocks_needed) { data->max_blocks_needed = data->blocks_needed; } @@ -319,7 +319,7 @@ int _alpm_check_diskspace(pmhandle_t *handle) numtargs, current); for(i = mount_points; i; i = alpm_list_next(i)) { - alpm_mountpoint_t *data = i->data; + pmmountpoint_t *data = i->data; if(data->used && data->read_only) { _alpm_log(handle, PM_LOG_ERROR, _("Partition %s is mounted read only\n"), data->mount_dir); @@ -344,7 +344,7 @@ int _alpm_check_diskspace(pmhandle_t *handle) } for(i = mount_points; i; i = alpm_list_next(i)) { - alpm_mountpoint_t *data = i->data; + pmmountpoint_t *data = i->data; FREE(data->mount_dir); } FREELIST(mount_points); diff --git a/lib/libalpm/diskspace.h b/lib/libalpm/diskspace.h index 28aca7e..d2aa8a8 100644 --- a/lib/libalpm/diskspace.h +++ b/lib/libalpm/diskspace.h @@ -34,7 +34,7 @@ enum mount_used_level { USED_INSTALL = (1 << 1), }; -typedef struct __alpm_mountpoint_t { +typedef struct __pmmountpoint_t { /* mount point information */ char *mount_dir; size_t mount_dir_len; @@ -44,7 +44,7 @@ typedef struct __alpm_mountpoint_t { enum mount_used_level used; int read_only; FSSTATSTYPE fsp; -} alpm_mountpoint_t; +} pmmountpoint_t; int _alpm_check_diskspace(pmhandle_t *handle); -- 1.7.6

2 2

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.3-351-g9aab144
by dan＠archlinux.org 28 Jun '11

28 Jun '11

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 9aab1440cacf143b62f05ccfac0e7917ef9d4c45 (commit) via 97e1dd9318389cf9424d06b78f5b9f5b9d452f7d (commit) from 09c803783d0b5e2403bff46af929875701d3791f (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 9aab1440cacf143b62f05ccfac0e7917ef9d4c45 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jun 27 21:42:22 2011 -0500 Revert "Merge branch 'master' of git://projects.archlinux.org/pacman" This reverts the merge of 2d32a9a3a348d25d6d0f3d12752399bf7fdf6570, which reverts the commit 8581694ceb63f4ed2854206b38574599c3d9df28. Thanks Dave for the dirty branch and non-clean rebase! :) Dave broke it. commit 97e1dd9318389cf9424d06b78f5b9f5b9d452f7d Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jun 27 15:08:14 2011 -0500 repo-add: remove extra exit call Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: scripts/makepkg.sh.in | 2 +- scripts/repo-add.sh.in | 1 - 2 files changed, 1 insertions(+), 2 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/4] Add an alpm_db_validity() public function
by Dan McGee 28 Jun '11

28 Jun '11

This allows one to check if a database is valid or invalid. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/alpm.h | 8 ++++++++ lib/libalpm/be_local.c | 1 + lib/libalpm/be_sync.c | 1 + lib/libalpm/db.c | 8 ++++++++ lib/libalpm/db.h | 1 + 5 files changed, 19 insertions(+), 0 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index ac35213..11ebfc1 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -382,6 +382,14 @@ int alpm_db_unregister_all(pmhandle_t *handle); */ const char *alpm_db_get_name(const pmdb_t *db); +/** Check the validity of a database. + * This is most useful for sync databases and verifying signature status. + * If invalid, the handle error code will be set accordingly. + * @param db pointer to the package database + * @return 0 if valid, -1 if invalid (pm_errno is set accordingly) + */ +int alpm_db_validity(pmdb_t *db); + /** @name Accessors to the list of servers for a database. * @{ */ diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index 5006688..f273db7 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -926,6 +926,7 @@ int _alpm_local_db_remove(pmdb_t *db, pmpkg_t *info) } struct db_operations local_db_ops = { + .validate = local_db_validate, .populate = local_db_populate, .unregister = _alpm_db_unregister, }; diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 2bf37da..057891d 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -580,6 +580,7 @@ error: } struct db_operations sync_db_ops = { + .validate = sync_db_validate, .populate = sync_db_populate, .unregister = _alpm_db_unregister, }; diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 9f37f80..a00edcc 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -219,6 +219,14 @@ const char SYMEXPORT *alpm_db_get_name(const pmdb_t *db) return db->treename; } +/** Check the validity of a database. */ +int SYMEXPORT alpm_db_validity(pmdb_t *db) +{ + ASSERT(db != NULL, return -1); + db->handle->pm_errno = 0; + return db->ops->validate(db); +} + /** Get a package entry from a package database. */ pmpkg_t SYMEXPORT *alpm_db_get_pkg(pmdb_t *db, const char *name) { diff --git a/lib/libalpm/db.h b/lib/libalpm/db.h index 0318734..5da28bf 100644 --- a/lib/libalpm/db.h +++ b/lib/libalpm/db.h @@ -51,6 +51,7 @@ enum _pmdbstatus_t { }; struct db_operations { + int (*validate) (pmdb_t *); int (*populate) (pmdb_t *); void (*unregister) (pmdb_t *); }; -- 1.7.5.4

4 6

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.5.3-7-ge378170
by dan＠archlinux.org 27 Jun '11

27 Jun '11

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, maint has been updated via e378170c2555b656ef87715d8284d038037ced5f (commit) via f8f4c2a6f301ab423f3ca702ebc24854cc701683 (commit) from 6eee3f6781b62f3a80697fbc7e3eeac0544e49e8 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: lib/libalpm/conflict.c | 48 ++++++++++++++++++++------------- test/pacman/tests/fileconflict008.py | 21 +++++++++++++++ 2 files changed, 50 insertions(+), 19 deletions(-) create mode 100644 test/pacman/tests/fileconflict008.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.3-349-g09c8037
by dan＠archlinux.org 27 Jun '11

27 Jun '11

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 09c803783d0b5e2403bff46af929875701d3791f (commit) via a12acbc2ffa8fab9e17168ed10e429c6f47434a6 (commit) via db172b09c55fd4f110717e1e5586e9ba5e29607e (commit) via 399184d68f23e124e386a340abf5bcec968b322b (commit) via 122b4c218785a89dcf6e1a335f6083aa166d4cdb (commit) via 6f5a90edb39cdd7e5e3faa7acdbaad288876f9da (commit) via 865ac0f0557560216b42ea14efb4487a236c0b2b (commit) via f01c6f814a278a3d024d34fed0c219c8cb1e1e33 (commit) via 77a09c92c66bd06440be0ccb75daf07c620acbee (commit) via 51ed7dff0d30a5dcb73ce271e5d02bdb0d119cb9 (commit) via f5dc5c46e0cf212c32ed149e22331f99764355c4 (commit) via bdd8ebd631bc305d1a15f4a873b550c9438ac0af (commit) via 6a413fe72f610f0ec11aa2aee78b248c51727e93 (commit) via 93c77565f65b9784701eea7953eefb0643c053e5 (commit) via e378170c2555b656ef87715d8284d038037ced5f (commit) via f8f4c2a6f301ab423f3ca702ebc24854cc701683 (commit) via 3725998cbc418187a90e86212941d18f7cbfda78 (commit) via 777bdc6c508a1a94dfa0854a34c7964ba0af02c9 (commit) via 719e0d3ddb300a8f0f8367b516c0e3c9579c4448 (commit) via 1187edb38c5ba42d27fd1de8e97aab658049367f (commit) via 112858ae615e4b7b84a2f3617277824d3145a6d8 (commit) via 7d8e9b8ed65343031284b891d713529aecbff659 (commit) via 5246fdecf6ab6a3f847d02967250f100ef440242 (commit) via 522c94f16842d4fe307cc72069b16a94c927c6ea (commit) via 2d32a9a3a348d25d6d0f3d12752399bf7fdf6570 (commit) via 8581694ceb63f4ed2854206b38574599c3d9df28 (commit) from e06586ceb49a0dc7e59996ae3a1483337d2ada05 (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 09c803783d0b5e2403bff46af929875701d3791f Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jun 27 13:29:13 2011 -0500 pacman-optimize: use output library We already use msg() and error() in here, might as well just use the standard functions. In addition, fix one translated message that would have printed ERROR twice if anyone ever saw it. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a12acbc2ffa8fab9e17168ed10e429c6f47434a6 Merge: 865ac0f db172b0 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jun 27 13:30:37 2011 -0500 Merge remote-tracking branch 'dave/repo-add' commit db172b09c55fd4f110717e1e5586e9ba5e29607e Author: Dave Reisner <d(a)falconindy.com> Date: Fri Jun 24 15:19:36 2011 -0400 repo-add: add new command, repo-elephant _ _ / \__/ \_____ / / \ \ `\ ) \''/ ( |\ `\__)/__/'_\ / ` //_|_|~|_|_| ^""'"' ""'"' Signed-off-by: Dave Reisner <d(a)falconindy.com> commit 399184d68f23e124e386a340abf5bcec968b322b Author: Dave Reisner <d(a)falconindy.com> Date: Tue Jun 21 13:58:32 2011 -0400 repo-add: enforce file extensions Allow one of 4 archive extensions: .tar{,.gz,.xz,.bz2} for each of the 2 valid repo extensions: .db and .files. Check for this via 'verify_repo_extension' directly after option parsing to assert that this extension is present, and again after files have been added to get the proper archive option for bsdtar. Signed-off-by: Dave Reisner <d(a)falconindy.com> commit 122b4c218785a89dcf6e1a335f6083aa166d4cdb Author: Dave Reisner <d(a)falconindy.com> Date: Wed Jun 22 16:26:55 2011 -0400 repo-add: move command invocation out of arg parsing loop Signed-off-by: Dave Reisner <d(a)falconindy.com> commit 6f5a90edb39cdd7e5e3faa7acdbaad288876f9da Author: Dave Reisner <d(a)falconindy.com> Date: Wed Jun 22 15:35:27 2011 -0400 repo-add: refactor repacking of repo file Dump the whole conditional and filter the contents of the directory to create an empty or non-empty archive. Signed-off-by: Dave Reisner <d(a)falconindy.com> commit 865ac0f0557560216b42ea14efb4487a236c0b2b Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jun 24 15:30:45 2011 -0500 Remove setter for DB signature level This should have been removed with commit db3b86e7f34f but was erroniously left behind. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f01c6f814a278a3d024d34fed0c219c8cb1e1e33 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jun 27 10:10:08 2011 -0500 Fix several -Wshadow warnings Only one of these looked like a real red flag, in find_requiredby(), but it doesn't hurt to fix several of them up anyway. Unfortunately, we can't turn this on universally due to things like the sync(), remove(), etc. builtins which we often use as variable names. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 77a09c92c66bd06440be0ccb75daf07c620acbee Merge: 51ed7df e378170 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jun 27 09:33:27 2011 -0500 Merge branch 'maint' Conflicts: lib/libalpm/conflict.c commit 51ed7dff0d30a5dcb73ce271e5d02bdb0d119cb9 Author: Eric Bélanger <snowmaniscool(a)gmail.com> Date: Sun Jun 26 15:13:48 2011 -0400 Remove -f option from ln for POSIX compliance Fixes FS#24893. Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f5dc5c46e0cf212c32ed149e22331f99764355c4 Author: Eric Bélanger <snowmaniscool(a)gmail.com> Date: Sat Jun 25 00:31:42 2011 -0400 makepkg: Add warning if VCS tool is not present when determining latest VCS revision Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit bdd8ebd631bc305d1a15f4a873b550c9438ac0af Author: Eric Bélanger <snowmaniscool(a)gmail.com> Date: Fri Jun 24 22:07:23 2011 -0400 makepkg: Move check for sudo into check_software function Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6a413fe72f610f0ec11aa2aee78b248c51727e93 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jun 25 08:28:28 2011 +1000 Remove two alpm_list_count usages We have just looped through the list of files, so might as well get the count as we go. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 93c77565f65b9784701eea7953eefb0643c053e5 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jun 25 07:27:40 2011 +1000 Add scripts po directory to autoclean.sh Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3725998cbc418187a90e86212941d18f7cbfda78 Author: Dave Reisner <d(a)falconindy.com> Date: Tue Jun 21 13:47:50 2011 -0400 pactree: add -s option to walk sync DBs Add a whole lot of bloat to parse pacman.conf and only a few lines to use the list of sync DBs instead of the local DB. Dan: I fully plan on this being temporary and us finding a better way in the future to parse pacman.conf from multiple binaries. Adding a standalone config parser is probably not the right way of going about things, but for now it is by far the easiest. Signed-off-by: Dave Reisner <d(a)falconindy.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 777bdc6c508a1a94dfa0854a34c7964ba0af02c9 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Oct 27 01:41:01 2010 -0500 Make sync DB reading a bit more flexible We can reorganize things a bit to not require reading a directory-only entry first (or at all). This was noticed while working on some pactest improvements, but should be a good step forward anyway. Also make _alpm_splitname() a bit more generic in where it stores the data it parses. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 719e0d3ddb300a8f0f8367b516c0e3c9579c4448 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jun 22 18:17:38 2011 -0500 archive_fgets(): ensure we return any trailing text with no newline Discovered this when doing some pactest rewrite work to generate archives in memory only. If a sync database file or PKGINFO file is missing a newline on the final line, the text from that line gets tossed aside and never read into the package struct. This is pretty critical when that last line is a depend or something. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1187edb38c5ba42d27fd1de8e97aab658049367f Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jun 14 10:32:35 2011 -0500 valgrind.supp: add known leaks from GPGME Thank you too, GPGME, for these. Why don't you provide a way to clean up your static variable mess? Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 112858ae615e4b7b84a2f3617277824d3145a6d8 Author: Dave Reisner <d(a)falconindy.com> Date: Mon Jun 20 10:22:12 2011 -0400 repo-add.8.txt: document valid DB file extensions Signed-off-by: Dave Reisner <d(a)falconindy.com> commit 7d8e9b8ed65343031284b891d713529aecbff659 Author: Dave Reisner <d(a)falconindy.com> Date: Mon Jun 20 15:37:09 2011 -0400 repo-add: use format_entry for all desc/depends fields This ranks high on the code readability scale. The same function formats all of our data and writes to the metadata file at once. Signed-off-by: Dave Reisner <d(a)falconindy.com> commit 5246fdecf6ab6a3f847d02967250f100ef440242 Author: Dave Reisner <d(a)falconindy.com> Date: Mon Jun 20 15:12:01 2011 -0400 repo-add: store multi-value fields as arrays Fields like groups and depends should be stored as arrays. This requires rewriting our write_list_entry function to accomodate our new data type. This new function will not write to a file, but rather only format it. Signed-off-by: Dave Reisner <d(a)falconindy.com> commit 522c94f16842d4fe307cc72069b16a94c927c6ea Author: Dave Reisner <d(a)falconindy.com> Date: Mon Jun 20 15:01:23 2011 -0400 repo-add: bashify reading of .PKGINFO file grep and sed aren't needed here, and this removes the truly ugly manipulation of IFS. The process substituion could just as well be a herestring, but it breaks vim's syntax highlighting. Style over substance, mang. Signed-off-by: Dave Reisner <d(a)falconindy.com> commit 2d32a9a3a348d25d6d0f3d12752399bf7fdf6570 Merge: 8581694 e06586c Author: Dave Reisner <d(a)falconindy.com> Date: Fri Jun 24 14:55:32 2011 -0400 Merge branch 'master' of git://projects.archlinux.org/pacman * 'master' of git://projects.archlinux.org/pacman: pactree: carry a list of databases for dep resolution makepkg: Remove a lone quotation mark makepkg: remove the cleancache option Don't require a transaction for sync DB updates Move locking functions to handle Add a 'valid' flag to the database object Move database 'version' check to registration time Do database signature checking at load time commit 8581694ceb63f4ed2854206b38574599c3d9df28 Author: Dave Reisner <d(a)falconindy.com> Date: Fri Jun 24 08:36:54 2011 -0400 makepkg: fix incorrect parenthesis in gettext call allan broke it in 4bdb868a. Signed-off-by: Dave Reisner <d(a)falconindy.com> ----------------------------------------------------------------------- Summary of changes: .gitignore | 1 + autoclean.sh | 13 +-- doc/repo-add.8.txt | 5 + lib/libalpm/alpm.h | 1 - lib/libalpm/backup.c | 6 +- lib/libalpm/backup.h | 2 +- lib/libalpm/be_local.c | 3 +- lib/libalpm/be_sync.c | 128 +++++++++++---------- lib/libalpm/conflict.c | 35 ++++-- lib/libalpm/db.c | 17 --- lib/libalpm/diskspace.c | 8 +- lib/libalpm/dload.c | 6 +- lib/libalpm/package.c | 6 +- lib/libalpm/remove.c | 8 +- lib/libalpm/util.c | 82 ++++++++------ lib/libalpm/util.h | 3 +- scripts/Makefile.am | 11 ++- scripts/makepkg.sh.in | 66 ++++++++---- scripts/pacman-optimize.sh.in | 12 +-- scripts/repo-add.sh.in | 208 +++++++++++++++++++--------------- src/pacman/callback.c | 10 +- src/pacman/sync.c | 4 +- src/pacman/upgrade.c | 1 - src/pacman/util.c | 2 +- src/util/pactree.c | 96 +++++++++++++++- src/util/testpkg.c | 2 +- test/pacman/tests/fileconflict008.py | 21 ++++ valgrind.supp | 22 ++++ 28 files changed, 486 insertions(+), 293 deletions(-) create mode 100644 test/pacman/tests/fileconflict008.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] pacman-optimize: use output library
by Dan McGee 27 Jun '11

27 Jun '11

We already use msg() and error() in here, might as well just use the standard functions. In addition, fix one translated message that would have printed ERROR twice if anyone ever saw it. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- scripts/Makefile.am | 4 +++- scripts/pacman-optimize.sh.in | 12 ++---------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 492eb0f..e34c300 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -82,7 +82,9 @@ pacman-key: \ $(srcdir)/pacman-key.sh.in \ $(srcdir)/library/output_format.sh -pacman-optimize: $(srcdir)/pacman-optimize.sh.in +pacman-optimize: \ + $(srcdir)/pacman-optimize.sh.in \ + $(srcdir)/library/output_format.sh pkgdelta: \ $(srcdir)/pkgdelta.sh.in \ diff --git a/scripts/pacman-optimize.sh.in b/scripts/pacman-optimize.sh.in index c9d42d2..0dc32bf 100644 --- a/scripts/pacman-optimize.sh.in +++ b/scripts/pacman-optimize.sh.in @@ -29,15 +29,7 @@ myver='@PACKAGE_VERSION@' eval $(awk '/DBPath/ {print $1$2$3}' @sysconfdir@/pacman.conf) dbroot="${DBPath:-@localstatedir@/lib/pacman/}" -msg() { - local mesg=$1; shift - printf "==> ${mesg}\n" "$@" >&2 -} - -error () { - local mesg=$1; shift - printf "==> ERROR: ${mesg}\n" "$@" >&2 -} +m4_include(library/output_format.sh) usage() { printf "pacman-optimize (pacman) %s\n\n" "$myver" @@ -122,7 +114,7 @@ fi touch "$lockfile" workdir=$(mktemp -d /tmp/pacman-optimize.XXXXXXXXXX) || - die_r "$(gettext "ERROR: Can not create temp directory for database building.")\n" >&2 + die_r "$(gettext "Can not create temp directory for database building.")\n" >&2 # step 1: sum the old db msg "$(gettext "MD5sum'ing the old database...")" -- 1.7.5.4

1 0

[pacman-dev] [PATCH 2/2] Do not replicate files list when removing packages
by Allan McRae 27 Jun '11

27 Jun '11

This saves replicating the list of files in a package that is being removed which can be quite large. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- The tradeoff here is a slightly less readable loop, but duplicating that list just struck me as wasteful. lib/libalpm/remove.c | 41 +++++++++++++++++++++++------------------ 1 files changed, 23 insertions(+), 18 deletions(-) diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index cc6daea..2d75a84 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -285,8 +285,7 @@ static void unlink_file(pmhandle_t *handle, pmpkg_t *info, const char *filename, int _alpm_upgraderemove_package(pmhandle_t *handle, pmpkg_t *oldpkg, pmpkg_t *newpkg) { - alpm_list_t *skip_remove, *b; - alpm_list_t *newfiles, *lp; + alpm_list_t *skip_remove, *b, *lp; size_t filenum=0; alpm_list_t *files = alpm_pkg_get_files(oldpkg); const char *pkgname = alpm_pkg_get_name(oldpkg); @@ -329,11 +328,15 @@ int _alpm_upgraderemove_package(pmhandle_t *handle, _alpm_log(handle, PM_LOG_DEBUG, "removing %ld files\n", (unsigned long)filenum); /* iterate through the list backwards, unlinking files */ - newfiles = alpm_list_reverse(files); - for(lp = newfiles; lp; lp = alpm_list_next(lp)) { - unlink_file(handle, oldpkg, lp->data, skip_remove, 0); + if(files) { + alpm_list_t *last = alpm_list_last(files); + lp = last; + do { + unlink_file(handle, oldpkg, lp->data, skip_remove, 0); + lp = lp->prev; + } while (lp != last); } - alpm_list_free(newfiles); + FREELIST(skip_remove); db: @@ -390,7 +393,6 @@ int _alpm_remove_packages(pmhandle_t *handle) if(!(trans->flags & PM_TRANS_FLAG_DBONLY)) { alpm_list_t *files = alpm_pkg_get_files(info); - alpm_list_t *newfiles; size_t filenum=0; for(lp = files; lp; lp = lp->next) { @@ -409,18 +411,21 @@ int _alpm_remove_packages(pmhandle_t *handle) pkg_count, (pkg_count - targcount + 1)); /* iterate through the list backwards, unlinking files */ - newfiles = alpm_list_reverse(files); - for(lp = newfiles; lp; lp = alpm_list_next(lp)) { - int percent; - unlink_file(handle, info, lp->data, NULL, trans->flags & PM_TRANS_FLAG_NOSAVE); - - /* update progress bar after each file */ - percent = (position * 100) / filenum; - PROGRESS(trans, PM_TRANS_PROGRESS_REMOVE_START, info->name, - percent, pkg_count, (pkg_count - targcount + 1)); - position++; + if(files) { + alpm_list_t *last = alpm_list_last(files); + lp = last; + do { + int percent; + unlink_file(handle, info, lp->data, NULL, trans->flags & PM_TRANS_FLAG_NOSAVE); + + /* update progress bar after each file */ + percent = (position * 100) / filenum; + PROGRESS(trans, PM_TRANS_PROGRESS_REMOVE_START, info->name, + percent, pkg_count, (pkg_count - targcount + 1)); + position++; + lp = lp->prev; + } while (lp != last); } - alpm_list_free(newfiles); } /* set progress to 100% after we finish unlinking files */ -- 1.7.5.4

2 1

[pacman-dev] [PATCH 1/2] Remove two alpm_list_count usages
by Allan McRae 27 Jun '11

27 Jun '11

We have just looped through the list of files, so might as well get the count as we go. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/remove.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index b6a4c71..cc6daea 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -287,7 +287,7 @@ int _alpm_upgraderemove_package(pmhandle_t *handle, { alpm_list_t *skip_remove, *b; alpm_list_t *newfiles, *lp; - size_t filenum; + size_t filenum=0; alpm_list_t *files = alpm_pkg_get_files(oldpkg); const char *pkgname = alpm_pkg_get_name(oldpkg); @@ -323,9 +323,9 @@ int _alpm_upgraderemove_package(pmhandle_t *handle, "not removing package '%s', can't remove all files\n", pkgname); RET_ERR(handle, PM_ERR_PKG_CANT_REMOVE, -1); } + filenum++; } - filenum = alpm_list_count(files); _alpm_log(handle, PM_LOG_DEBUG, "removing %ld files\n", (unsigned long)filenum); /* iterate through the list backwards, unlinking files */ @@ -391,7 +391,7 @@ int _alpm_remove_packages(pmhandle_t *handle) if(!(trans->flags & PM_TRANS_FLAG_DBONLY)) { alpm_list_t *files = alpm_pkg_get_files(info); alpm_list_t *newfiles; - size_t filenum; + size_t filenum=0; for(lp = files; lp; lp = lp->next) { if(!can_remove_file(handle, lp->data, NULL)) { @@ -399,9 +399,9 @@ int _alpm_remove_packages(pmhandle_t *handle) pkgname); RET_ERR(handle, PM_ERR_PKG_CANT_REMOVE, -1); } + filenum++; } - filenum = alpm_list_count(files); _alpm_log(handle, PM_LOG_DEBUG, "removing %ld files\n", (unsigned long)filenum); /* init progress bar */ -- 1.7.5.4

2 1

[pacman-dev] [PATCH 1/2] File conflict code cleanups
by Dan McGee 27 Jun '11

27 Jun '11

While researching the root cause of FS#24904, I couldn't help but clean up some of the cruft in here. A few whitespace/line-wrapping issues, but also fix shadowed variables and add some const where applicable. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/conflict.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 6faced1..b1df108 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -296,14 +296,14 @@ static alpm_list_t *chk_filedifference(alpm_list_t *filesA, alpm_list_t *filesB) return(ret); } -/* Adds pmfileconflict_t to a conflicts list. Pass the conflicts list, type (either - * PM_FILECONFLICT_TARGET or PM_FILECONFLICT_FILESYSTEM), a file string, and either - * two package names or one package name and NULL. This is a wrapper for former - * functionality that was done inline. +/* Adds pmfileconflict_t to a conflicts list. Pass the conflicts list, type + * (either PM_FILECONFLICT_TARGET or PM_FILECONFLICT_FILESYSTEM), a file + * string, and either two package names or one package name and NULL. This is + * a wrapper for former functionality that was done inline. */ static alpm_list_t *add_fileconflict(alpm_list_t *conflicts, pmfileconflicttype_t type, const char *filestr, - const char* name1, const char* name2) + const char *name1, const char *name2) { pmfileconflict_t *conflict; MALLOC(conflict, sizeof(pmfileconflict_t), RET_ERR(PM_ERR_MEMORY, NULL)); @@ -334,7 +334,7 @@ void _alpm_fileconflict_free(pmfileconflict_t *conflict) FREE(conflict); } -static int dir_belongsto_pkg(char *dirpath, pmpkg_t *pkg) +static int dir_belongsto_pkg(const char *dirpath, pmpkg_t *pkg) { struct dirent *ent = NULL; struct stat sbuf; @@ -462,7 +462,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans, } stat(path, &sbuf); - if(path[strlen(path)-1] == '/') { + if(path[strlen(path) - 1] == '/') { if(S_ISDIR(lsbuf.st_mode)) { _alpm_log(PM_LOG_DEBUG, "%s is a directory, not a conflict\n", path); continue; @@ -518,19 +518,19 @@ alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans, if(!resolved_conflict && dbpkg) { char *rpath = calloc(PATH_MAX+1, sizeof(char)); + const char *relative_rpath; if(!realpath(path, rpath)) { - FREE(rpath); + free(rpath); continue; } - char *filestr = rpath + strlen(handle->root); - if(alpm_list_find_str(alpm_pkg_get_files(dbpkg),filestr)) { + relative_rpath = rpath + strlen(handle->root); + if(alpm_list_find_str(alpm_pkg_get_files(dbpkg), relative_rpath)) { resolved_conflict = 1; } free(rpath); } if(!resolved_conflict) { - _alpm_log(PM_LOG_DEBUG, "file found in conflict: %s\n", path); conflicts = add_fileconflict(conflicts, PM_FILECONFLICT_FILESYSTEM, path, p1->name, NULL); } -- 1.7.5.2

1 1

[pacman-dev] [PATCH 1/2] Make sync DB reading a bit more flexible
by Dan McGee 27 Jun '11

27 Jun '11

We can reorganize things a bit to not require reading a directory-only entry first (or at all). This was noticed while working on some pactest improvements, but should be a good step forward anyway. Also make _alpm_splitname() a bit more generic in where it stores the data it parses. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/be_local.c | 3 +- lib/libalpm/be_sync.c | 130 ++++++++++++++++++++++++----------------------- lib/libalpm/util.c | 46 ++++++++++------- lib/libalpm/util.h | 3 +- 4 files changed, 97 insertions(+), 85 deletions(-) diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index 4b2a301..9e4de54 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -382,7 +382,8 @@ static int local_db_populate(pmdb_t *db) RET_ERR(db->handle, PM_ERR_MEMORY, -1); } /* split the db entry name */ - if(_alpm_splitname(name, pkg) != 0) { + if(_alpm_splitname(name, &(pkg->name), &(pkg->version), + &(pkg->name_hash)) != 0) { _alpm_log(db->handle, PM_LOG_ERROR, _("invalid name for database entry '%s'\n"), name); _alpm_pkg_free(pkg); diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index f0b1736..6d1ab39 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -182,7 +182,61 @@ cleanup: /* Forward decl so I don't reorganize the whole file right now */ static int sync_db_read(pmdb_t *db, struct archive *archive, - struct archive_entry *entry, pmpkg_t *likely_pkg); + struct archive_entry *entry, pmpkg_t **likely_pkg); + +static pmpkg_t *load_pkg_for_entry(pmdb_t *db, const char *entryname, + const char **entry_filename, pmpkg_t *likely_pkg) +{ + char *pkgname = NULL, *pkgver = NULL; + unsigned long pkgname_hash; + pmpkg_t *pkg; + + /* get package and db file names */ + if(entry_filename) { + char *fname = strrchr(entryname, '/'); + if(fname) { + *entry_filename = fname + 1; + } else { + *entry_filename = NULL; + } + } + if(_alpm_splitname(entryname, &pkgname, &pkgver, &pkgname_hash) != 0) { + _alpm_log(db->handle, PM_LOG_ERROR, + _("invalid name for database entry '%s'\n"), entryname); + return NULL; + } + + if(likely_pkg && strcmp(likely_pkg->name, pkgname) == 0) { + pkg = likely_pkg; + } else { + pkg = _alpm_pkghash_find(db->pkgcache, pkgname); + } + if(pkg == NULL) { + pkg = _alpm_pkg_new(); + if(pkg == NULL) { + RET_ERR(db->handle, PM_ERR_MEMORY, NULL); + } + + pkg->name = pkgname; + pkg->version = pkgver; + pkg->name_hash = pkgname_hash; + + pkg->origin = PKG_FROM_SYNCDB; + pkg->origin_data.db = db; + pkg->ops = &default_pkg_ops; + pkg->handle = db->handle; + + /* add to the collection */ + _alpm_log(db->handle, PM_LOG_FUNCTION, "adding '%s' to package cache for db '%s'\n", + pkg->name, db->treename); + db->pkgcache = _alpm_pkghash_add(db->pkgcache, pkg); + } else { + free(pkgname); + free(pkgver); + } + + return pkg; +} /* * This is the data table used to generate the estimating function below. @@ -292,55 +346,20 @@ static int sync_db_populate(pmdb_t *db) st = archive_entry_stat(entry); if(S_ISDIR(st->st_mode)) { - const char *name; - - pkg = _alpm_pkg_new(); - if(pkg == NULL) { - archive_read_finish(archive); - RET_ERR(db->handle, PM_ERR_MEMORY, -1); - } - - name = archive_entry_pathname(entry); - - if(_alpm_splitname(name, pkg) != 0) { - _alpm_log(db->handle, PM_LOG_ERROR, _("invalid name for database entry '%s'\n"), - name); - _alpm_pkg_free(pkg); - pkg = NULL; - continue; - } - - /* duplicated database entries are not allowed */ - if(_alpm_pkghash_find(db->pkgcache, pkg->name)) { - _alpm_log(db->handle, PM_LOG_ERROR, _("duplicated database entry '%s'\n"), pkg->name); - _alpm_pkg_free(pkg); - pkg = NULL; - continue; - } - - pkg->origin = PKG_FROM_SYNCDB; - pkg->origin_data.db = db; - pkg->ops = &default_pkg_ops; - pkg->handle = db->handle; - - /* add to the collection */ - _alpm_log(db->handle, PM_LOG_FUNCTION, "adding '%s' to package cache for db '%s'\n", - pkg->name, db->treename); - db->pkgcache = _alpm_pkghash_add(db->pkgcache, pkg); - count++; + continue; } else { /* we have desc, depends or deltas - parse it */ - if(sync_db_read(db, archive, entry, pkg) != 0) { + if(sync_db_read(db, archive, entry, &pkg) != 0) { _alpm_log(db->handle, PM_LOG_ERROR, _("could not parse package '%s' description file from db '%s'\n"), pkg->name, db->treename); - _alpm_pkg_free(pkg); - pkg = NULL; continue; } } } + count = alpm_list_count(db->pkgcache->list); + if(count > 0) { db->pkgcache->list = alpm_list_msort(db->pkgcache->list, (size_t)count, _alpm_pkg_cmp); } @@ -370,10 +389,9 @@ static int sync_db_populate(pmdb_t *db) } while(1) /* note the while(1) and not (0) */ static int sync_db_read(pmdb_t *db, struct archive *archive, - struct archive_entry *entry, pmpkg_t *likely_pkg) + struct archive_entry *entry, pmpkg_t **likely_pkg) { const char *entryname, *filename; - char *pkgname, *p, *q; pmpkg_t *pkg; struct archive_read_buffer buf; @@ -391,27 +409,12 @@ static int sync_db_read(pmdb_t *db, struct archive *archive, /* 512K for a line length seems reasonable */ buf.max_line_size = 512 * 1024; - /* get package and db file names */ - STRDUP(pkgname, entryname, RET_ERR(db->handle, PM_ERR_MEMORY, -1)); - p = pkgname + strlen(pkgname); - for(q = --p; *q && *q != '/'; q--); - filename = q + 1; - for(p = --q; *p && *p != '-'; p--); - for(q = --p; *q && *q != '-'; q--); - *q = '\0'; - - /* package is already in db due to parsing of directory name */ - if(likely_pkg && strcmp(likely_pkg->name, pkgname) == 0) { - pkg = likely_pkg; - } else { - if(db->pkgcache == NULL) { - RET_ERR(db->handle, PM_ERR_MEMORY, -1); - } - pkg = _alpm_pkghash_find(db->pkgcache, pkgname); - } + pkg = load_pkg_for_entry(db, entryname, &filename, *likely_pkg); + if(pkg == NULL) { - _alpm_log(db->handle, PM_LOG_DEBUG, "package %s not found in %s sync database", - pkgname, db->treename); + _alpm_log(db->handle, PM_LOG_DEBUG, + "entry %s could not be loaded into %s sync database", + entryname, db->treename); return -1; } @@ -498,6 +501,7 @@ static int sync_db_read(pmdb_t *db, struct archive *archive, if(ret != ARCHIVE_EOF) { goto error; } + *likely_pkg = pkg; } else if(strcmp(filename, "files") == 0) { /* currently do nothing with this file */ } else { @@ -505,12 +509,10 @@ static int sync_db_read(pmdb_t *db, struct archive *archive, _alpm_log(db->handle, PM_LOG_DEBUG, "unknown database file: %s\n", filename); } - FREE(pkgname); return 0; error: _alpm_log(db->handle, PM_LOG_DEBUG, "error parsing database file: %s\n", filename); - FREE(pkgname); return -1; } diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 4976703..e56c9f2 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -825,46 +825,54 @@ cleanup: } } -int _alpm_splitname(const char *target, pmpkg_t *pkg) +int _alpm_splitname(const char *target, char **name, char **version, + unsigned long *name_hash) { /* the format of a db entry is as follows: * package-version-rel/ + * package-version-rel/desc (we ignore the filename portion) * package name can contain hyphens, so parse from the back- go back * two hyphens and we have split the version from the name. */ - const char *version, *end; + const char *pkgver, *end; - if(target == NULL || pkg == NULL) { + if(target == NULL) { return -1; } - end = target + strlen(target); - /* remove any trailing '/' */ - while(*(end - 1) == '/') { - --end; + /* remove anything trailing a '/' */ + end = strchr(target, '/'); + if(!end) { + end = target + strlen(target); } /* do the magic parsing- find the beginning of the version string * by doing two iterations of same loop to lop off two hyphens */ - for(version = end - 1; *version && *version != '-'; version--); - for(version = version - 1; *version && *version != '-'; version--); - if(*version != '-' || version == target) { + for(pkgver = end - 1; *pkgver && *pkgver != '-'; pkgver--); + for(pkgver = pkgver - 1; *pkgver && *pkgver != '-'; pkgver--); + if(*pkgver != '-' || pkgver == target) { return -1; } /* copy into fields and return */ - if(pkg->version) { - FREE(pkg->version); + if(version) { + if(*version) { + FREE(*version); + } + /* version actually points to the dash, so need to increment 1 and account + * for potential end character */ + STRNDUP(*version, pkgver + 1, end - pkgver - 1, return -1); } - /* version actually points to the dash, so need to increment 1 and account - * for potential end character */ - STRNDUP(pkg->version, version + 1, end - version - 1, return -1); - if(pkg->name) { - FREE(pkg->name); + if(name) { + if(*name) { + FREE(*name); + } + STRNDUP(*name, target, pkgver - target, return -1); + if(name_hash) { + *name_hash = _alpm_hash_sdbm(*name); + } } - STRNDUP(pkg->name, target, version - target, return -1); - pkg->name_hash = _alpm_hash_sdbm(pkg->name); return 0; } diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index 778e20f..c68b07b 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -109,7 +109,8 @@ const char *_alpm_filecache_setup(pmhandle_t *handle); int _alpm_lstat(const char *path, struct stat *buf); int _alpm_test_md5sum(const char *filepath, const char *md5sum); int _alpm_archive_fgets(struct archive *a, struct archive_read_buffer *b); -int _alpm_splitname(const char *target, pmpkg_t *pkg); +int _alpm_splitname(const char *target, char **name, char **version, + unsigned long *name_hash); unsigned long _alpm_hash_sdbm(const char *str); long _alpm_parsedate(const char *line); -- 1.7.5.4

3 5