- 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

[pacman-dev] [PATCH] makepkg: Add warning if VCS tool is not present when determining latest VCS revision
by Eric Bélanger 26 Jun '11

26 Jun '11

Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> --- scripts/makepkg.sh.in | 32 +++++++++++++++++++++++++------- 1 files changed, 25 insertions(+), 7 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 4e15d54..8d082a2 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1538,30 +1538,48 @@ devel_check() { # This will only be used on the first call to makepkg; subsequent # calls to makepkg via fakeroot will explicitly pass the version # number to avoid having to determine the version number twice. - # Also do a brief check to make sure we have the VCS tool available. + # Also do a check to make sure we have the VCS tool available. oldpkgver=$pkgver if [[ -n ${_darcstrunk} && -n ${_darcsmod} ]] ; then - type -p darcs >/dev/null || return 0 + if ! type -p darcs >/dev/null; then + warning "$(gettext "Cannot find the %s binary required to determine latest %s revision.")" "darcs" "darcs" + return 0 + fi msg "$(gettext "Determining latest %s revision...")" 'darcs' newpkgver=$(date +%Y%m%d) elif [[ -n ${_cvsroot} && -n ${_cvsmod} ]] ; then - type -p cvs >/dev/null || return 0 + if ! type -p cvs >/dev/null; then + warning "$(gettext "Cannot find the %s binary required to determine latest %s revision.")" "cvs" "cvs" + return 0 + fi msg "$(gettext "Determining latest %s revision...")" 'cvs' newpkgver=$(date +%Y%m%d) elif [[ -n ${_gitroot} && -n ${_gitname} ]] ; then - type -p git >/dev/null || return 0 + if ! type -p git >/dev/null; then + warning "$(gettext "Cannot find the %s binary required to determine latest %s revision.")" "git "git" + return 0 + fi msg "$(gettext "Determining latest %s revision...")" 'git' newpkgver=$(date +%Y%m%d) elif [[ -n ${_svntrunk} && -n ${_svnmod} ]] ; then - type -p svn >/dev/null || return 0 + if ! type -p svn >/dev/null; then + warning "$(gettext "Cannot find the %s binary required to determine latest %s revision.")" "svn" "svn" + return 0 + fi msg "$(gettext "Determining latest %s revision...")" 'svn' newpkgver=$(LC_ALL=C svn info $_svntrunk | sed -n 's/^Last Changed Rev: $[0-9]*$$/\1/p') elif [[ -n ${_bzrtrunk} && -n ${_bzrmod} ]] ; then - type -p bzr >/dev/null || return 0 + if ! type -p bzr >/dev/null; then + warning "$(gettext "Cannot find the %s binary required to determine latest %s revision.")" "bzr" bzr" + return 0 + fi msg "$(gettext "Determining latest %s revision...")" 'bzr' newpkgver=$(bzr revno ${_bzrtrunk}) elif [[ -n ${_hgroot} && -n ${_hgrepo} ]] ; then - type -p hg >/dev/null || return 0 + if ! type -p hg >/dev/null; then + warning "$(gettext "Cannot find the %s binary required to determine latest %s revision.")" "hg" "hg" + return 0 + fi msg "$(gettext "Determining latest %s revision...")" 'hg' if [[ -d ./src/$_hgrepo ]] ; then cd ./src/$_hgrepo -- 1.7.5.4

2 3

[pacman-dev] [PATCH] Remove -f option from ln for POSIX compliance (close FS#24893)
by Eric Bélanger 26 Jun '11

26 Jun '11

Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> --- scripts/makepkg.sh.in | 18 ++++++++++++------ scripts/repo-add.sh.in | 10 ++++++---- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 8d082a2..ed5cdef 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -518,7 +518,8 @@ download_sources() { local file=$(get_filepath "$netfile" || true) if [[ -n "$file" ]]; then msg2 "$(gettext "Found %s")" "${file##*/}" - ln -sf "$file" "$srcdir/" + rm -f "$srcdir/$file" + ln -s "$file" "$srcdir/" continue fi @@ -878,8 +879,8 @@ tidy_install() { # update symlinks to this manpage find ${MAN_DIRS[@]} -lname "$file" 2>/dev/null | while read link ; do - rm -f "$link" - ln -sf "${file}.gz" "${link}.gz" + rm -f "$link" "${link}.gz" + ln -s "${file}.gz" "${link}.gz" done # check file still exists (potentially already compressed due to hardlink) @@ -1187,9 +1188,13 @@ create_package() { create_signature "$pkg_file" if (( ! ret )) && [[ ! "$PKGDEST" -ef "${startdir}" ]]; then - ln -sf "${pkg_file}" "${pkg_file/$PKGDEST/$startdir}" + rm -f "${pkg_file/$PKGDEST/$startdir}" + ln -s "${pkg_file}" "${pkg_file/$PKGDEST/$startdir}" ret=$? - [[ -f $pkg_file.sig ]] && ln -sf "$pkg_file.sig" "${pkg_file/$PKGDEST/$startdir}.sig" + if [[ -f $pkg_file.sig ]]; then + rm -f "${pkg_file/$PKGDEST/$startdir}.sig" + ln -s "$pkg_file.sig" "${pkg_file/$PKGDEST/$startdir}.sig" + fi fi if (( ret )); then @@ -1276,7 +1281,8 @@ create_srcpackage() { fi if (( ! ret )) && [[ ! "$SRCPKGDEST" -ef "${startdir}" ]]; then - ln -sf "${pkg_file}" "${pkg_file/$SRCPKGDEST/$startdir}" + rm -f "${pkg_file/$SRCPKGDEST/$startdir}" + ln -s "${pkg_file}" "${pkg_file/$SRCPKGDEST/$startdir}" ret=$? fi diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index e970da3..b125035 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -613,12 +613,14 @@ if (( success )); then [[ -f $tmpdir/$filename.sig ]] && mv "$tmpdir/$filename.sig" "$REPO_DB_FILE.sig" dblink="${REPO_DB_FILE%.tar*}" target=${REPO_DB_FILE##*/} - ln -sf "$target" "$dblink" 2>/dev/null || \ - ln -f "$target" "$dblink" 2>/dev/null || \ + rm -f "$dblink" + ln -s "$target" "$dblink" 2>/dev/null || \ + ln "$target" "$dblink" 2>/dev/null || \ cp "$REPO_DB_FILE" "$dblink" if [[ -f "$target.sig" ]]; then - ln -sf "$target.sig" "$dblink.sig" 2>/dev/null || \ - ln -f "$target.sig" "$dblink.sig" 2>/dev/null || \ + rm -f "$dblink.sig" + ln -s "$target.sig" "$dblink.sig" 2>/dev/null || \ + ln "$target.sig" "$dblink.sig" 2>/dev/null || \ cp "$REPO_DB_FILE.sig" "$dblink.sig" fi else -- 1.7.5.4

3 4

[pacman-dev] [PATCH] makepkg: Move check for sudo into check_software function
by Eric Bélanger 25 Jun '11

25 Jun '11

Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> --- scripts/makepkg.sh.in | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index ebe010b..4e15d54 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1449,6 +1449,13 @@ check_software() { # check for needed software local ret=0 + # check for sudo if we will need it during makepkg execution + if (( ! ( ASROOT || INFAKEROOT ) && ( DEP_BIN || RMDEPS || INSTALL ) )); then + if ! type -p sudo >/dev/null; then + warning "$(gettext "Sudo can not be found. Will use su to acquire root privileges.")" + fi + fi + # fakeroot - building as non-root user if [[ $(check_buildenv fakeroot) = "y" ]] && (( EUID > 0 )); then if ! type -p fakeroot >/dev/null; then @@ -1898,13 +1905,6 @@ else fi fi -# check for sudo if we will need it during makepkg execution -if (( ! ( ASROOT || INFAKEROOT ) && ( DEP_BIN || RMDEPS || INSTALL ) )); then - if ! type -p sudo >/dev/null; then - warning "$(gettext "Sudo can not be found. Will use su to acquire root privileges.")" - fi -fi - unset pkgname pkgbase pkgver pkgrel epoch pkgdesc url license groups provides unset md5sums replaces depends conflicts backup source install changelog build unset makedepends optdepends options noextract -- 1.7.5.4

2 1

[pacman-dev] [PATCH] Add scripts po directory to autoclean.sh
by Allan McRae 24 Jun '11

24 Jun '11

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- autoclean.sh | 13 ++++--------- 1 files changed, 4 insertions(+), 9 deletions(-) diff --git a/autoclean.sh b/autoclean.sh index 71284ad..1a1ed5e 100755 --- a/autoclean.sh +++ b/autoclean.sh @@ -26,12 +26,7 @@ rm -f test/pacman/*.pyc rm -f doc/html/*.html rm -f doc/man3/*.3 -rm -f po/{Makefile.in,Makefile} -rm -f po/POTFILES -rm -f po/stamp-po -rm -f po/*.gmo - -rm -f lib/libalpm/po/{Makefile.in,Makefile} -rm -f lib/libalpm/po/POTFILES -rm -f lib/libalpm/po/stamp-po -rm -f lib/libalpm/po/*.gmo +rm -f {.,lib/libalpm,scripts}/po/{Makefile.in,Makefile} +rm -f {.,lib/libalpm,scripts}/po/POTFILES +rm -f {.,lib/libalpm,scripts}/po/stamp-po +rm -f {.,lib/libalpm,scripts}/po/*.gmo -- 1.7.5.4

2 2

[pacman-dev] [PATCH] repo-add: add new command, repo-elephant
by Dave Reisner 24 Jun '11

24 Jun '11

_ _ / \__/ \_____ / / \ \ `\ ) \''/ ( |\ `\__)/__/'_\ / ` //_|_|~|_|_| ^""'"' ""'"' Signed-off-by: Dave Reisner <d(a)falconindy.com> --- An elephant never forgets... or forgives... scripts/Makefile.am | 7 ++++++- scripts/repo-add.sh.in | 26 ++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletions(-) diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 3b96c11..492eb0f 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -5,7 +5,8 @@ SUBDIRS = po bin_SCRIPTS = \ $(OURSCRIPTS) \ - repo-remove + repo-remove \ + repo-elephant OURSCRIPTS = \ makepkg \ @@ -97,4 +98,8 @@ repo-remove: $(srcdir)/repo-add.sh.in rm -f repo-remove $(LN_S) repo-add repo-remove +repo-elephant: $(srcdir)/repo-add.sh.in + rm -f repo-elephant + $(LN_S) repo-add repo-elephant + # vim:set ts=2 sw=2 noet: diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 9fdc750..0ccefc2 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -391,6 +391,27 @@ db_remove_entry() { return $notfound } # end db_remove_entry +elephant() { + cat <<EOF + __ + '. \ + '- \ + / /_ .---. + / | \\,.\/--.// ) + | \// )/ / + \ ' ^ ^ / )____.----.. 6 + '.____. .___/ \._) + .\/. ) + '\ / + _/ \/ ). ) ( + /# .! | /\ / + \ C// # /'-----''/ # / + . 'C/ | | | | |mrf , + \), .. .'OOO-'. ..'OOO'OOO-'. ..\(, +EOF + exit 0 +} + check_repo_db() { local repodir @@ -533,6 +554,11 @@ esac # figure out what program we are cmd=${0##*/} +if [[ $cmd == "repo-elephant" ]]; then + elephant + exit 0 +fi + if [[ $cmd != "repo-add" && $cmd != "repo-remove" ]]; then error "$(gettext "Invalid command name '%s' specified.")" "$cmd" exit 1 -- 1.7.5.4

2 1

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

24 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 e06586ceb49a0dc7e59996ae3a1483337d2ada05 (commit) via 61cb8e76c3f42bad318462e51bbfade752425023 (commit) via c45cfb17419a0bc56c1396febd83f455a0dcbad0 (commit) via 4f8ae2bab61c8fc678589c6840d44977c82d4cc2 (commit) via 7b8f8f69f14dac2bbcd7e96fc548aa084be7cd8e (commit) via 79e98316ea89486d107466858543e965bcfbb0a9 (commit) via 1150d9e15aaea2ae1f259995d11442f491ef0af7 (commit) via db3b86e7f34f4c3ccb42e98465f2069aa642a85f (commit) from 94d22f93096e210cd00d2e9c97c65f77d49ae387 (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 e06586ceb49a0dc7e59996ae3a1483337d2ada05 Author: Dave Reisner <d(a)falconindy.com> Date: Tue Jun 21 13:42:17 2011 -0400 pactree: carry a list of databases for dep resolution Declare an alpm_list which, for now, only holds our local database. walk_deps and walk_reverse_deps are refactored to account for this, and a helper function is added to wrap alpm_db_get_pkg for traversing a list. This is groundwork for letting pactree walk the sync DBs. Signed-off-by: Dave Reisner <d(a)falconindy.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 61cb8e76c3f42bad318462e51bbfade752425023 Author: Wieland Hoffmann <themineo(a)googlemail.com> Date: Fri Jun 24 12:59:20 2011 +0200 makepkg: Remove a lone quotation mark Allan broke it in 4bdb868. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c45cfb17419a0bc56c1396febd83f455a0dcbad0 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Jun 24 17:19:32 2011 +1000 makepkg: remove the cleancache option This is a fairly useless feature given all it does is an "rm" on a directory. It is also unlikely that you would want to remove the entire SRCDEST anyway, but rather just the old files. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4f8ae2bab61c8fc678589c6840d44977c82d4cc2 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jun 24 04:11:38 2011 -0500 Don't require a transaction for sync DB updates Instead, just do the required locking directly in the backend in calls to alpm_db_update(). Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7b8f8f69f14dac2bbcd7e96fc548aa084be7cd8e Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jun 24 04:02:58 2011 -0500 Move locking functions to handle These operate on the handle, and the state is stored on the handle, so move them where they belong. Up until now only the transaction stuff calls them, but this will soon change and alpm_db_update() will handle locking all on its own. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 79e98316ea89486d107466858543e965bcfbb0a9 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jun 7 20:42:15 2011 -0500 Add a 'valid' flag to the database object Start by converting all of our flags to a 'status' bitmask (pkgcache status, grpcache status). Add a new 'valid' flag as well. This will let us keep track if the database itself has been marked valid in whatever fashion. For local databases at the moment we ensure there are no depends files; for sync databases we ensure the PGP signature is valid if required/requested. The loading of the pkgcache is prohibited if the database is invalid. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1150d9e15aaea2ae1f259995d11442f491ef0af7 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Apr 20 19:54:01 2011 -0500 Move database 'version' check to registration time This is another step toward doing both local database validation (ensuring we don't have depends files) and sync database validation (via signatures if present) when the database is registered. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit db3b86e7f34f4c3ccb42e98465f2069aa642a85f Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jun 7 17:29:55 2011 -0500 Do database signature checking at load time This is the ideal place to do it as all clients should be checking the return value and ensuring there are no errors. This is similar to pkg_load(). We also add an additional step of validation after we download a new database; a subsequent '-y' operation can potentially invalidate the original check at registration time. Note that this implementation is still a bit naive; if a signature is invalid it is currently impossible to refresh and re-download the file without manually deleting it first. Similarly, if one downloads a database and the check fails, the database object is still there and can be used. These shortcomings will be addressed in a future commit. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/makepkg.8.txt | 4 -- lib/libalpm/alpm.c | 2 +- lib/libalpm/alpm.h | 6 ++- lib/libalpm/be_local.c | 117 ++++++++++++++++++++++------------------ lib/libalpm/be_sync.c | 114 ++++++++++++++++++++++++++++++--------- lib/libalpm/db.c | 63 +++++++++------------ lib/libalpm/db.h | 18 ++++--- lib/libalpm/error.c | 2 + lib/libalpm/handle.c | 54 ++++++++++++++++++ lib/libalpm/handle.h | 3 + lib/libalpm/trans.c | 72 ++++--------------------- scripts/makepkg.sh.in | 38 +------------ src/pacman/conf.c | 19 ++----- src/pacman/sync.c | 7 --- src/pacman/util.c | 3 - src/util/cleanupdelta.c | 2 +- src/util/pactree.c | 37 +++++++++---- src/util/testdb.c | 2 +- test/pacman/tests/ignore007.py | 2 +- test/pacman/tests/sign001.py | 4 +- 20 files changed, 304 insertions(+), 265 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 0/9] repo-add cleanup
by Dave Reisner 24 Jun '11

24 Jun '11

Sigh. This started as a simple addition to the man page to document valid file extensions, and look what happened. The first 4 patches are a resend -- I've fixed the 2 blockers that Allan pointed out, the whitespace error I noticed, and a final tweak at Dan's suggestion to my terrible grammar in the man page. The other patches are a mix of cleanup, features, and a regression fix from an earlier patch I submitted. I wrote myself a little test suite for checking my work. It'll probably (eventually) end up as something more significant since, imo, repo-add deserves some test suite love. d Dave Reisner (9): repo-add: bashify reading of .PKGINFO file repo-add: store multi-value fields as arrays repo-add: use format_entry for all desc/depends fields repo-add.8.txt: document valid DB file extensions repo-add: enforce file extensions repo-add: fix path designation regression repo-add: avoid using ls to check for presence of files repo-add: move command invocation out of arg parsing loop repo-add: allow specifying symlink as repo file doc/repo-add.8.txt | 4 + scripts/repo-add.sh.in | 162 +++++++++++++++++++++++++---------------------- 2 files changed, 90 insertions(+), 76 deletions(-) -- 1.7.5.4

3 17

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

24 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 94d22f93096e210cd00d2e9c97c65f77d49ae387 (commit) via 4bdb868ac8d535a3818d519b16eff7d129fe6717 (commit) via 624a87870164ab48bda485204d6fd49c86a0c354 (commit) via 63335859d1b1c77222c31229fe499c031a76361d (commit) via f15cce1d414cb497ee804d50c25c6d3d717240bd (commit) via 3ace8ceb2343621ada4a72fc60e8e03a570fd389 (commit) via 11d8418737d9d9c12584c6eed83bc6cea46ef3e9 (commit) via 763d638ca1d3f1f1d6a8276e36b837e82890f4ee (commit) via a8c3202836014908b95df7d294d2e309faf4b2a0 (commit) via f12ead2cf278d4a9b330d0d320733960fc750e96 (commit) via d589a7b5dbdfcf740d72aa4e9e8fcab9a3de0fbd (commit) via e27a5c88514c5eb9480294374e98914ec27bf65d (commit) from ac7d17f88e200f3f1c213474e7b875ecd341753d (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 94d22f93096e210cd00d2e9c97c65f77d49ae387 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jun 22 14:07:27 2011 +1000 Document group and providers selection The format required for selection of packages within the group selection dialog is not entirely obvious, so provide some documentation. Fixes FS#24134. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4bdb868ac8d535a3818d519b16eff7d129fe6717 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jun 18 12:40:14 2011 +1000 makepkg: clean-up of output messages There was a lot of inconsistency in how strings that should not be translated (program names, option flags, PKGBUILD directives, etc) were handled. This patch moves them all outside the gettext invocation for consistency and to prevent accidental translation. Note that some of these may need reverted if they cause difficulties in translation due to gettext usage in bash not taking positional parameters for arguments. A quick survey of current translations indicates that this issue will be rare. Also, we should be able to catch these before a full string freeze given we are going to probably need a "developer preview" release before the next release series. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 624a87870164ab48bda485204d6fd49c86a0c354 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jun 22 15:45:09 2011 -0500 pactest: generate sync DB's in memory Sync database are no longer exploded on the filesystem. Rework the logic used to generate our test databases so we can create them completely in memory without having to write the individual files to disk at all. The local database is unaffected. Note that several shortcomings in libalpm parsing were discovered by this change, which have since been temporarily patched around in this test suite: * archive_fgets() did not properly handle a file that ended in a non-newline, and would silently drop the data in this line. * sync database with only the file entries and not the directories would fail to parse properly, and even cause segfaults in some cases. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 63335859d1b1c77222c31229fe499c031a76361d Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jun 22 15:11:56 2011 -0500 pactest: refactor install file creation Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f15cce1d414cb497ee804d50c25c6d3d717240bd Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jun 22 15:05:53 2011 -0500 pactest: move filelist/backup generation into package object These are definite methods that operate on a package, so move them there which cleans up util a bit more. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3ace8ceb2343621ada4a72fc60e8e03a570fd389 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jun 22 14:39:50 2011 -0500 pactest: make pmfile a bit more pythonic Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 11d8418737d9d9c12584c6eed83bc6cea46ef3e9 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jun 22 14:45:55 2011 -0500 pactest: small cleanups and chmod -x most files Remove empty docstrings, small and easy pylint fixes, etc. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 763d638ca1d3f1f1d6a8276e36b837e82890f4ee Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jun 22 14:28:56 2011 -0500 pactest: clean up database section writing Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a8c3202836014908b95df7d294d2e309faf4b2a0 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jun 22 13:58:07 2011 -0500 pactest: add isize attribute, fix url attribute Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f12ead2cf278d4a9b330d0d320733960fc750e96 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jun 24 00:40:03 2011 -0500 Remove three unnecessary usages of alpm_list_count() For the files count when loading from a package, we can keep a counter. The two in the frontend were completely useless due to the fact that if sync_dbs is non-NULL, alpm_list_count() will always be greater than 0. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d589a7b5dbdfcf740d72aa4e9e8fcab9a3de0fbd Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jun 24 01:33:12 2011 -0500 Prevent segfault when parsing unexpected sync database file This doesn't fix the real (bigger) problem of failing to parse sync databases without directory entries, but it does prevent the parser from segfaulting when the first desc file encountered did not have a directory entry, among other conditions. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e27a5c88514c5eb9480294374e98914ec27bf65d Author: Dave Reisner <d(a)falconindy.com> Date: Wed Jun 22 17:53:06 2011 -0400 parse-options: simplify unused-arg & parameter printing Signed-off-by: Dave Reisner <d(a)falconindy.com> ----------------------------------------------------------------------- Summary of changes: doc/pacman.8.txt | 12 ++- lib/libalpm/be_package.c | 5 +- lib/libalpm/be_sync.c | 6 +- scripts/library/parse_options.sh | 13 +-- scripts/makepkg.sh.in | 102 ++++++++-------- src/pacman/query.c | 2 +- src/pacman/sync.c | 2 +- test/pacman/pactest.py | 20 ++-- test/pacman/pmdb.py | 242 +++++++++++++++---------------------- test/pacman/pmenv.py | 26 ++-- test/pacman/pmfile.py | 24 +++-- test/pacman/pmpkg.py | 49 ++++++++- test/pacman/pmtest.py | 43 +------ test/pacman/util.py | 44 ------- 14 files changed, 255 insertions(+), 335 deletions(-) mode change 100755 => 100644 test/pacman/pmdb.py mode change 100755 => 100644 test/pacman/pmenv.py mode change 100755 => 100644 test/pacman/pmfile.py mode change 100755 => 100644 test/pacman/pmpkg.py mode change 100755 => 100644 test/pacman/pmrule.py mode change 100755 => 100644 test/pacman/pmtest.py mode change 100755 => 100644 test/pacman/util.py hooks/post-receive -- The official pacman repository

3 6

[pacman-dev] [PATCH] makepkg: Remove a lone quotation mark
by Wieland Hoffmann 24 Jun '11

24 Jun '11

Allan broke it in 4bdb868. --- scripts/makepkg.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index e101a76..1043e44 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2245,7 +2245,7 @@ else if (( ! REPKG )); then tidy_install else - warning "$(gettext "Repackaging without the use of a %s" function is deprecated.")" "package()" + warning "$(gettext "Repackaging without the use of a %s function is deprecated.")" "package()" plain "$(gettext "File permissions may not be preserved.")" fi fi -- 1.7.5.4

2 1

Re: [pacman-dev] Discussion about deprecating/removing the changelog feature from pacman.
by Marc - A. Dahlhaus 24 Jun '11

24 Jun '11

Am Donnerstag, den 23.06.2011, 15:48 -0500 schrieb Dan McGee: --8<-- > > We use changelogs quite extensively, and all should keep in mind that > > > > pacman -Qc PACKAGENAME > > > > will help any user that doesn't need to know where your PKGBUILD tree is > > managed / tracked / whatever... > > > > I would suggest that makepkg should be extended to have a way to add the > > output of a command (e.g. "svn log") as changelog to a package... > > > > That would make the life easier for any maintainer and would solve the > > problem even for the lazy arch package maintainers... :-P > > Agree with you here- this seems like it would be a useful addition. > Just calling out to a CHANGELOG_SCRIPT or something would be pretty > awesome. Arch Linux would use svn log --limit <date> of some sort, > other distros using git to track their repos could use git logs, etc. > > If you don't think you're interested in implementing this, I'd at > least suggest opening a feature request for it. Have some things to take care of for upstart first and will take a look at it when i'm done with it. Also have som cleanup work for pacman in my pipe but havn't had time to write down a mail for the list and for implementing it. (Mostly about a removal of '.d' suffix on /etc/pacman.d as its misnamed with respect to all other users of a '.d' suffix in etc and a rework of rate mirrors that would make a packages like "mirrors-{africa,asia,europe,{north,south}america}" possible without much of a hassle for pacman...) Marc

1 0

[pacman-dev] [PATCH] makepkg: remove the cleancache option
by Allan McRae 24 Jun '11

24 Jun '11

This is a fairly useless feature given all it does is an "rm" on a directory. It is also unlikely that you would want to remove the entire SRCDEST anyway, but rather just the old files. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/makepkg.8.txt | 4 ---- scripts/makepkg.sh.in | 36 +----------------------------------- 2 files changed, 1 insertions(+), 39 deletions(-) diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index f15226a..e11e9b3 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -48,10 +48,6 @@ Options *-c, \--clean*:: Clean up leftover work files and directories after a successful build. -*-C, \--cleancache*:: - Removes all cached source files from the directory specified in `SRCDEST` - in linkman:makepkg.conf[5]. - *\--config* <file>:: Use an alternate config file instead of the +{sysconfdir}/makepkg.conf+ default. diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index e101a76..4a4d43c 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -52,7 +52,6 @@ readonly -a packaging_options other_options splitpkg_overrides # Options ASROOT=0 CLEANUP=0 -CLEANCACHE=0 DEP_BIN=0 FORCE=0 INFAKEROOT=0 @@ -1661,7 +1660,6 @@ usage() { echo "$(gettext "Options:")" printf "$(gettext " -A, --ignorearch Ignore incomplete %s field in %s")\n" "arch" "$BUILDSCRIPT" echo "$(gettext " -c, --clean Clean up work files after build")" - echo "$(gettext " -C, --cleancache Clean up source files from the cache")" echo "$(gettext " -d, --nodeps Skip all dependency checks")" printf "$(gettext " -e, --noextract Do not extract source files (use existing %s dir)")\n" "src/" echo "$(gettext " -f, --force Overwrite existing package")" @@ -1719,7 +1717,7 @@ ARGLIST=("$@") # Parse Command Line Options. OPT_SHORT="AcCdefFghiLmop:rRsV" -OPT_LONG="allsource,asroot,ignorearch,check,clean,cleancache,nodeps" +OPT_LONG="allsource,asroot,ignorearch,check,clean,nodeps" OPT_LONG+=",noextract,force,forcever:,geninteg,help,holdver" OPT_LONG+=",install,key:,log,nocolor,nobuild,nocheck,nosign,pkg:,rmdeps" OPT_LONG+=",repackage,skipinteg,sign,source,syncdeps,version,config:" @@ -1744,7 +1742,6 @@ while true; do --asroot) ASROOT=1 ;; -A|--ignorearch) IGNOREARCH=1 ;; -c|--clean) CLEANUP=1 ;; - -C|--cleancache) CLEANCACHE=1 ;; --check) RUN_CHECK='y' ;; --config) shift; MAKEPKG_CONF=$1 ;; -d|--nodeps) NODEPS=1 ;; @@ -1876,37 +1873,6 @@ if (( HOLDVER )) && [[ -n $FORCE_VER ]]; then exit 1 fi -if (( CLEANCACHE )); then - #fix flyspray feature request #5223 - if [[ -n $SRCDEST && ! $SRCDEST -ef "${startdir}" ]]; then - msg "$(gettext "Cleaning up ALL files from %s.")" "$SRCDEST" - echo -n "$(gettext " Are you sure you wish to do this? ")" - echo -n "$(gettext "[y/N]")" - read answer - answer=$(tr '[:lower:]' '[:upper:]' <<< "$answer") - if [[ $answer = $(gettext YES) || $answer = $(gettext Y) ]]; then - rm "$SRCDEST"/* - if (( $? )); then - error "$(gettext "Problem removing files; you may not have correct permissions in %s")" "$SRCDEST" - exit 1 - else - # removal worked - msg "$(gettext "Source cache cleaned.")" - exit 0 - fi - else - # answer = no - msg "$(gettext "No files have been removed.")" - exit 0 - fi - else - # $SRCDEST is $startdir, two possibilities - error "$(gettext "Source destination must be defined in %s.")" "$MAKEPKG_CONF" - plain "$(gettext "In addition, please run %s outside of your cache directory.")" "makepkg -C" - exit 1 - fi -fi - if (( ! INFAKEROOT )); then if (( EUID == 0 && ! ASROOT )); then # Warn those who like to live dangerously. -- 1.7.5.4

2 1

[pacman-dev] [PATCH] Remove three unnecessary usages of alpm_list_count()
by Dan McGee 24 Jun '11

24 Jun '11

For the files count when loading from a package, we can keep a counter. The two in the frontend were completely useless due to the fact that if sync_dbs is non-NULL, alpm_list_count() will always be greater than 0. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/be_package.c | 5 +++-- src/pacman/query.c | 2 +- src/pacman/sync.c | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 1807051..748f27a 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -241,6 +241,7 @@ pmpkg_t *_alpm_pkg_load_internal(pmhandle_t *handle, const char *pkgfile, struct archive_entry *entry; pmpkg_t *newpkg = NULL; struct stat st; + size_t files_count = 0; if(pkgfile == NULL || strlen(pkgfile) == 0) { RET_ERR(handle, PM_ERR_WRONG_ARGS, NULL); @@ -328,6 +329,7 @@ pmpkg_t *_alpm_pkg_load_internal(pmhandle_t *handle, const char *pkgfile, } else if(full) { /* Keep track of all files for filelist generation */ newpkg->files = alpm_list_add(newpkg->files, strdup(entry_name)); + files_count++; } if(archive_read_data_skip(archive)) { @@ -366,8 +368,7 @@ pmpkg_t *_alpm_pkg_load_internal(pmhandle_t *handle, const char *pkgfile, if(full) { /* "checking for conflicts" requires a sorted list, ensure that here */ _alpm_log(handle, PM_LOG_DEBUG, "sorting package filelist for %s\n", pkgfile); - newpkg->files = alpm_list_msort(newpkg->files, alpm_list_count(newpkg->files), - _alpm_str_cmp); + newpkg->files = alpm_list_msort(newpkg->files, files_count, _alpm_str_cmp); newpkg->infolevel = INFRQ_ALL; } else { /* get rid of any partial filelist we may have collected, it is invalid */ diff --git a/src/pacman/query.c b/src/pacman/query.c index aa77907..62472cb 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -502,7 +502,7 @@ int pacman_query(alpm_list_t *targets) if(config->op_q_foreign) { /* ensure we have at least one valid sync db set up */ alpm_list_t *sync_dbs = alpm_option_get_syncdbs(config->handle); - if(sync_dbs == NULL || alpm_list_count(sync_dbs) == 0) { + if(sync_dbs == NULL) { pm_printf(PM_LOG_ERROR, _("no usable package repositories configured.\n")); return 1; } diff --git a/src/pacman/sync.c b/src/pacman/sync.c index acb8a33..6c86bd1 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -911,7 +911,7 @@ int pacman_sync(alpm_list_t *targets) /* ensure we have at least one valid sync db set up */ sync_dbs = alpm_option_get_syncdbs(config->handle); - if(sync_dbs == NULL || alpm_list_count(sync_dbs) == 0) { + if(sync_dbs == NULL) { pm_printf(PM_LOG_ERROR, _("no usable package repositories configured.\n")); return 1; } -- 1.7.5.4

2 1

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

24 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 ac7d17f88e200f3f1c213474e7b875ecd341753d (commit) via d8d287b4d215eceb382385b84495666f5a03399e (commit) via d62a429b924e70f48bf021d3c355dd9455d1c45b (commit) via c699c0b15466343099d24caa644aba903edabd1a (commit) via 963b942bb91d798ac54cad8a36088fcb7abab278 (commit) via a4a7006a138f05c1b774414a55ffb5499d7b289f (commit) via 78f297dabe17eef518eaccb880f9013641124cda (commit) via fa3aa6441c9a8a4ac460e11d18b4ed3b0ae543b8 (commit) via eedd56f320c175c430ead9226dc871a9ce04ba3f (commit) via aa89a65a83bbac5487fff377cd6ac969e1796542 (commit) via 54ef162a1a9e27e362732d873f0739bc0a2cf1bf (commit) from 886a31ef205923fd5b29012ee75932a2e2dec4bd (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 ac7d17f88e200f3f1c213474e7b875ecd341753d Merge: d8d287b d62a429 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 23 23:44:35 2011 -0500 Merge branch 'po-split' commit d8d287b4d215eceb382385b84495666f5a03399e Author: Dave Reisner <d(a)falconindy.com> Date: Wed Jun 22 09:30:35 2011 -0400 repo-add: fix path designation regression b899099 made path checking a bit more strict than I had intended, and would actually forbid creation of a repo in $PWD if only the filename was specified. readlink would be the fun and easy solution here, but it's avoided due to portability issues, making the validation process a bit more verbose. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d62a429b924e70f48bf021d3c355dd9455d1c45b Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 23 22:25:16 2011 -0500 scripts/po/: add pacman-key This has gettext strings, but wasn't added to the list of files in POTFILES.in just yet. Add it and update the catalogs. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c699c0b15466343099d24caa644aba903edabd1a Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 23 22:01:20 2011 -0500 src/pacman/po/: prune message catalog and translations Now that we have performed the split, prune the catalogs of all scripts-only messages. All old messages were pruned from the files using the following command: sed -i -e '/^#\~/,$d' *.po Note: the diff on this commit looks much less insane if the --patience option is used. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 963b942bb91d798ac54cad8a36088fcb7abab278 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 23 21:58:18 2011 -0500 scripts/po/: prune message catalog and translations Now that we have performed the split, prune the catalogs of all pacman-only messages. All old messages were pruned from the files using the following command: sed -i -e '/^#\~/,' *.po Note: the diff on this commit looks much less insane if the --patience option is used. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a4a7006a138f05c1b774414a55ffb5499d7b289f Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 23 21:21:51 2011 -0500 po/: split into scripts/po/ and src/pacman/po/ This is the first step at separating the pacman message catalog and the scripts message catalog. Makefiles, configure.ac, and other such files are adjusted accordingly, as well as renaming files. The TEXTDOMAIN of scripts is also adjusted. Note that no actual pot or po files get changed here; these will get pruned in a future commit so each catalog contains only the necessary messages. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 78f297dabe17eef518eaccb880f9013641124cda Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 23 21:48:35 2011 -0500 Update all translation files This is for the eventual 4.0.0 release, but more importantly to logically separate new translations and strings from the PO split about to happen between pacman and scripts. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit fa3aa6441c9a8a4ac460e11d18b4ed3b0ae543b8 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 23 22:22:57 2011 -0500 Let configure gettext setup know we use ngettext() Signed-off-by: Dan McGee <dan(a)archlinux.org> commit eedd56f320c175c430ead9226dc871a9ce04ba3f Author: Eric Bélanger <snowmaniscool(a)gmail.com> Date: Thu Jun 23 00:02:33 2011 -0400 makepkg: Added checks in check_software for distcc, ccache, strip and gzip Dan: slightly shorten some of the messages. Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit aa89a65a83bbac5487fff377cd6ac969e1796542 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 23 15:19:01 2011 -0500 makepkg: remove distcc/makeflags option interaction Way back in c94bfbaba when refactoring makepkg options handling, I added these lines to unset MAKEFLAGS if '!distcc' was set in a PKGBUILD (not taking into account makepkg.conf settings). This was an attempt to say "if it is broken in distcc, it is probably broken even more". However, this is silly as one should be using '!makeflags' as well. Remove the linkage. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 54ef162a1a9e27e362732d873f0739bc0a2cf1bf Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 16 13:15:11 2011 -0500 Convert backup list to new pmbackup_t type This allows us to separate the name and hash elements in one place and not scatter different parsing code all over the place, including both the frontend and backend. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: Makefile.am | 2 +- configure.ac | 5 +- lib/libalpm/add.c | 67 +- lib/libalpm/alpm.h | 6 + lib/libalpm/backup.c | 80 +- lib/libalpm/backup.h | 8 +- lib/libalpm/be_local.c | 12 +- lib/libalpm/be_package.c | 5 +- lib/libalpm/package.c | 7 +- lib/libalpm/package.h | 1 + lib/libalpm/po/Makevars | 2 +- lib/libalpm/po/ca.po | 57 +- lib/libalpm/po/cs.po | 57 +- lib/libalpm/po/da.po | 51 +- lib/libalpm/po/de.po | 57 +- lib/libalpm/po/el.po | 57 +- lib/libalpm/po/en_GB.po | 57 +- lib/libalpm/po/es.po | 57 +- lib/libalpm/po/fi.po | 58 +- lib/libalpm/po/fr.po | 58 +- lib/libalpm/po/hu.po | 57 +- lib/libalpm/po/it.po | 59 +- lib/libalpm/po/kk.po | 57 +- lib/libalpm/po/libalpm.pot | 42 +- lib/libalpm/po/nb.po | 57 +- lib/libalpm/po/pl.po | 57 +- lib/libalpm/po/pt.po | 57 +- lib/libalpm/po/pt_BR.po | 57 +- lib/libalpm/po/ro.po | 61 +- lib/libalpm/po/ru.po | 57 +- lib/libalpm/po/sk.po | 58 +- lib/libalpm/po/sr.po | 57 +- lib/libalpm/po/sr(a)latin.po | 57 +- lib/libalpm/po/sv.po | 51 +- lib/libalpm/po/tr.po | 57 +- lib/libalpm/po/uk.po | 51 +- lib/libalpm/po/zh_CN.po | 57 +- lib/libalpm/remove.c | 22 +- po/POTFILES.in | 21 - po/ca.po | 1946 ------------------- po/cs.po | 1888 ------------------- po/da.po | 1866 ------------------ po/de.po | 1961 ------------------- po/el.po | 1896 ------------------- po/en_GB.po | 1874 ------------------- po/es.po | 1955 ------------------- po/fi.po | 1914 ------------------- po/fr.po | 1957 ------------------- po/hu.po | 1924 ------------------- po/it.po | 1952 ------------------- po/kk.po | 1894 ------------------- po/nb.po | 1894 ------------------- po/pacman.pot | 1784 ------------------ po/pl.po | 1901 ------------------- po/pt.po | 1972 -------------------- po/pt_BR.po | 1947 ------------------- po/ro.po | 1954 ------------------- po/ru.po | 1912 ------------------- po/sk.po | 1891 ------------------- po/sr.po | 1888 ------------------- po/sr(a)latin.po | 1892 ------------------- po/sv.po | 1871 ------------------- po/tr.po | 1907 ------------------- po/uk.po | 1878 ------------------- po/zh_CN.po | 1822 ------------------ scripts/Makefile.am | 2 + scripts/makepkg.sh.in | 37 +- scripts/pacman-db-upgrade.sh.in | 2 +- scripts/pacman-key.sh.in | 2 +- scripts/pacman-optimize.sh.in | 2 +- scripts/pkgdelta.sh.in | 2 +- {po => scripts/po}/.gitignore | 0 {po => scripts/po}/LINGUAS | 0 {po => scripts/po}/Makefile.in.in | 0 {lib/libalpm => scripts}/po/Makevars | 6 +- scripts/po/POTFILES.in | 9 + scripts/po/ca.po | 1067 +++++++++++ scripts/po/cs.po | 1020 ++++++++++ scripts/po/da.po | 1018 ++++++++++ scripts/po/de.po | 1075 +++++++++++ scripts/po/el.po | 1030 ++++++++++ scripts/po/en_GB.po | 1018 ++++++++++ scripts/po/es.po | 1056 +++++++++++ scripts/po/fi.po | 1056 +++++++++++ scripts/po/fr.po | 1076 +++++++++++ scripts/po/hu.po | 1065 +++++++++++ scripts/po/it.po | 1072 +++++++++++ scripts/po/kk.po | 1044 +++++++++++ scripts/po/nb.po | 1028 ++++++++++ scripts/po/pacman-scripts.pot | 943 ++++++++++ scripts/po/pl.po | 1026 ++++++++++ scripts/po/pt.po | 1079 +++++++++++ scripts/po/pt_BR.po | 1070 +++++++++++ {po => scripts/po}/remove-potcdate.sin | 0 scripts/po/ro.po | 1060 +++++++++++ scripts/po/ru.po | 1055 +++++++++++ scripts/po/sk.po | 1023 ++++++++++ scripts/po/sr.po | 1026 ++++++++++ scripts/po/sr(a)latin.po | 1028 ++++++++++ scripts/po/sv.po | 1021 ++++++++++ scripts/po/tr.po | 1050 +++++++++++ scripts/po/uk.po | 1025 ++++++++++ scripts/po/zh_CN.po | 1003 ++++++++++ scripts/repo-add.sh.in | 15 +- src/pacman/Makefile.am | 2 + src/pacman/package.c | 19 +- {lib/libalpm => src/pacman}/po/.gitignore | 0 {lib/libalpm => src/pacman}/po/LINGUAS | 0 {lib/libalpm => src/pacman}/po/Makefile.in.in | 0 {po => src/pacman/po}/Makevars | 4 +- src/pacman/po/POTFILES.in | 14 + src/pacman/po/ca.po | 1154 ++++++++++++ src/pacman/po/cs.po | 1130 +++++++++++ src/pacman/po/da.po | 1117 +++++++++++ src/pacman/po/de.po | 1153 ++++++++++++ src/pacman/po/el.po | 1127 +++++++++++ src/pacman/po/en_GB.po | 1117 +++++++++++ src/pacman/po/es.po | 1173 ++++++++++++ src/pacman/po/fi.po | 1123 +++++++++++ src/pacman/po/fr.po | 1163 ++++++++++++ src/pacman/po/hu.po | 1131 +++++++++++ src/pacman/po/it.po | 1153 ++++++++++++ src/pacman/po/kk.po | 1118 +++++++++++ src/pacman/po/nb.po | 1124 +++++++++++ src/pacman/po/pacman.pot | 1070 +++++++++++ src/pacman/po/pl.po | 1138 +++++++++++ src/pacman/po/pt.po | 1167 ++++++++++++ src/pacman/po/pt_BR.po | 1153 ++++++++++++ {lib/libalpm => src/pacman}/po/remove-potcdate.sin | 0 src/pacman/po/ro.po | 1163 ++++++++++++ src/pacman/po/ru.po | 1133 +++++++++++ src/pacman/po/sk.po | 1130 +++++++++++ src/pacman/po/sr.po | 1125 +++++++++++ src/pacman/po/sr(a)latin.po | 1127 +++++++++++ src/pacman/po/sv.po | 1116 +++++++++++ src/pacman/po/tr.po | 1120 +++++++++++ src/pacman/po/uk.po | 1127 +++++++++++ src/pacman/po/zh_CN.po | 1085 +++++++++++ 138 files changed, 57572 insertions(+), 50251 deletions(-) delete mode 100644 po/POTFILES.in delete mode 100644 po/ca.po delete mode 100644 po/cs.po delete mode 100644 po/da.po delete mode 100644 po/de.po delete mode 100644 po/el.po delete mode 100644 po/en_GB.po delete mode 100644 po/es.po delete mode 100644 po/fi.po delete mode 100644 po/fr.po delete mode 100644 po/hu.po delete mode 100644 po/it.po delete mode 100644 po/kk.po delete mode 100644 po/nb.po delete mode 100644 po/pacman.pot delete mode 100644 po/pl.po delete mode 100644 po/pt.po delete mode 100644 po/pt_BR.po delete mode 100644 po/ro.po delete mode 100644 po/ru.po delete mode 100644 po/sk.po delete mode 100644 po/sr.po delete mode 100644 po/sr(a)latin.po delete mode 100644 po/sv.po delete mode 100644 po/tr.po delete mode 100644 po/uk.po delete mode 100644 po/zh_CN.po rename {po => scripts/po}/.gitignore (100%) rename {po => scripts/po}/LINGUAS (100%) rename {po => scripts/po}/Makefile.in.in (100%) copy {lib/libalpm => scripts}/po/Makevars (93%) create mode 100644 scripts/po/POTFILES.in create mode 100644 scripts/po/ca.po create mode 100644 scripts/po/cs.po create mode 100644 scripts/po/da.po create mode 100644 scripts/po/de.po create mode 100644 scripts/po/el.po create mode 100644 scripts/po/en_GB.po create mode 100644 scripts/po/es.po create mode 100644 scripts/po/fi.po create mode 100644 scripts/po/fr.po create mode 100644 scripts/po/hu.po create mode 100644 scripts/po/it.po create mode 100644 scripts/po/kk.po create mode 100644 scripts/po/nb.po create mode 100644 scripts/po/pacman-scripts.pot create mode 100644 scripts/po/pl.po create mode 100644 scripts/po/pt.po create mode 100644 scripts/po/pt_BR.po rename {po => scripts/po}/remove-potcdate.sin (100%) create mode 100644 scripts/po/ro.po create mode 100644 scripts/po/ru.po create mode 100644 scripts/po/sk.po create mode 100644 scripts/po/sr.po create mode 100644 scripts/po/sr(a)latin.po create mode 100644 scripts/po/sv.po create mode 100644 scripts/po/tr.po create mode 100644 scripts/po/uk.po create mode 100644 scripts/po/zh_CN.po copy {lib/libalpm => src/pacman}/po/.gitignore (100%) copy {lib/libalpm => src/pacman}/po/LINGUAS (100%) copy {lib/libalpm => src/pacman}/po/Makefile.in.in (100%) rename {po => src/pacman/po}/Makevars (95%) create mode 100644 src/pacman/po/POTFILES.in create mode 100644 src/pacman/po/ca.po create mode 100644 src/pacman/po/cs.po create mode 100644 src/pacman/po/da.po create mode 100644 src/pacman/po/de.po create mode 100644 src/pacman/po/el.po create mode 100644 src/pacman/po/en_GB.po create mode 100644 src/pacman/po/es.po create mode 100644 src/pacman/po/fi.po create mode 100644 src/pacman/po/fr.po create mode 100644 src/pacman/po/hu.po create mode 100644 src/pacman/po/it.po create mode 100644 src/pacman/po/kk.po create mode 100644 src/pacman/po/nb.po create mode 100644 src/pacman/po/pacman.pot create mode 100644 src/pacman/po/pl.po create mode 100644 src/pacman/po/pt.po create mode 100644 src/pacman/po/pt_BR.po copy {lib/libalpm => src/pacman}/po/remove-potcdate.sin (100%) create mode 100644 src/pacman/po/ro.po create mode 100644 src/pacman/po/ru.po create mode 100644 src/pacman/po/sk.po create mode 100644 src/pacman/po/sr.po create mode 100644 src/pacman/po/sr(a)latin.po create mode 100644 src/pacman/po/sv.po create mode 100644 src/pacman/po/tr.po create mode 100644 src/pacman/po/uk.po create mode 100644 src/pacman/po/zh_CN.po hooks/post-receive -- The official pacman repository

2 1

[pacman-dev] Fwd: [PATCH 8/9] repo-add: move command invocation out of arg parsing loop
by Dave Reisner 24 Jun '11

24 Jun '11

Forwarding this, as it seems to have been eaten by gmail as well on the initial send... d ----- Forwarded message from Dave Reisner <d(a)falconindy.com> ----- > Date: Wed, 22 Jun 2011 20:38:52 -0400 > From: Dave Reisner <d(a)falconindy.com> > To: pacman-dev(a)archlinux.org > Cc: Dave Reisner <d(a)falconindy.com> > Subject: [PATCH 8/9] repo-add: move command invocation out of arg parsing loop > > This is mostly a move to make the code easier to read, but it's my feeling > that the arg parsing loop should parse args, and the actual program logic > should be separated from this. > > Signed-off-by: Dave Reisner <d(a)falconindy.com> > --- > scripts/repo-add.sh.in | 23 ++++++++++++----------- > 1 files changed, 12 insertions(+), 11 deletions(-) > > diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in > index e75055f..8865188 100644 > --- a/scripts/repo-add.sh.in > +++ b/scripts/repo-add.sh.in > @@ -529,9 +529,10 @@ trap 'trap_exit "$(gettext "TERM signal caught. Exiting...")"' TERM HUP QUIT > trap 'trap_exit "$(gettext "Aborted by user! Exiting...")"' INT > trap 'trap_exit "$(gettext "An unknown error has occured. Exiting...")"' ERR > > +declare -a args > success=0 > # parse arguments > -while [[ $# > 0 ]]; do > +while (( $# )); do > case "$1" in > -q|--quiet) QUIET=1;; > -d|--delta) DELTA=1;; > @@ -562,21 +563,21 @@ while [[ $# > 0 ]]; do > VERIFY=1 > ;; > *) > - if [[ -z $REPO_DB_FILE ]]; then > - REPO_DB_FILE="$1" > - LOCKFILE="$REPO_DB_FILE.lck" > - check_repo_db > - else > - case "$cmd" in > - repo-add) add $1 && success=1 ;; > - repo-remove) remove $1 && success=1 ;; > - esac > - fi > + args+=("$1") > ;; > esac > shift > done > > +REPO_DB_FILE=${args[0]} > +LOCKFILE=$REPO_DB_FILE.lck > +check_repo_db > + > +# we've already validated our command -- just trim it to get the function > +for arg in "${args[@]:1}"; do > + "${cmd#repo-}" "$arg" && success=1 > +done > + > # if at least one operation was a success, re-zip database > if (( success )); then > msg "$(gettext "Creating updated database file '%s'")" "$REPO_DB_FILE" > -- > 1.7.5.4 > ----- End forwarded message -----

2 1

[pacman-dev] [PATCH] makepkg: Added checks in check_software for distcc, ccache, strip and gzip
by Eric Bélanger 24 Jun '11

24 Jun '11

Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> --- I thought about adding checks for the PKGEXT and SRCEXT compression utilities but I'm not sure as it might be overkill. Anyway, they could always be added later on in another patch. BTW, I didn't test this patch as it seemed quite straightforward. scripts/makepkg.sh.in | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 239bb64..e9b8c56 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1485,6 +1485,38 @@ check_software() { fi fi + # distcc - compilation with distcc + if [[ $(check_buildenv distcc) = "y" && $(check_option distcc) != "n" ]]; then + if ! type -p distcc >/dev/null; then + error "$(gettext "Cannot find the %s binary required for distributed compilation.")" "distcc" + ret=1 + fi + fi + + # ccache - compilation with ccache + if [[ $(check_buildenv ccache) = "y" && $(check_option ccache) != "n" ]]; then + if ! type -p ccache >/dev/null; then + error "$(gettext "Cannot find the %s binary required for compilation with compiler cache.")" "ccache" + ret=1 + fi + fi + + # strip - strip symbols from binaries/libraries + if [[ $(check_option strip) = y ]]; then + if ! type -p strip >/dev/null; then + error "$(gettext "Cannot find the %s binary required for stripping unneeded symbols from binaries and libraries.")" "strip" + ret=1 + fi + fi + + # gzip - compressig man and info pages + if [[ $(check_option zipman) = "y" ]]; then + if ! type -p gzip >/dev/null; then + error "$(gettext "Cannot find the %s binary required for compressing man and info pages.")" "gzip" + ret=1 + fi + fi + return $ret } -- 1.7.5.4

2 2