- Pacman-dev - lists.archlinux.org

[pacman-dev] bash scripts errexit and nounset options
by Xavier 12 Apr '09

12 Apr '09

I found this page while implementing the locking system for repo-add, I stole some code from it : http://www.davidpashley.com/articles/writing-robust-shell-scripts.html It recommends using set -u and set -e, these both seem like a good idea to me. Should we try to be consistent using these options in all the bash scripts in pacman repo? Several already use set -e, but not all of them. And none seem to use set -u. While I find these two options useful, I wonder if it isn't a bad idea to introduce them now, as it could cause more harm than good. I guess that ideally, they would have been set from the beginning. Adding them now could add some non obvious problems to code that worked fine. Anyway, if we agree these flags are indeed useful, they could at least be considered when adding new scripts.

3 6

[pacman-dev] alpm_list regex matching
by leslie.polzer＠gmx.net 11 Apr '09

11 Apr '09

Hello, inlined diff (p0, hope that's not a problem) adds regex matching to alpm_list; useful for regular expressions in IgnorePkg etc. I'll leave the actual usage up to you and hope it helps somehow :) Leslie -- NEW homepage: https://viridian.dnsalias.net/~sky/homepage/ gpg --keyserver pgp.mit.edu --recv-keys DD4EBF83 Index: lib/libalpm/alpm_list.c =================================================================== RCS file: /home/cvs-pacman/pacman-lib/lib/libalpm/alpm_list.c,v retrieving revision 1.11 diff -a -p -u -r1.11 alpm_list.c --- lib/libalpm/alpm_list.c 11 Mar 2007 21:10:03 -0000 1.11 +++ lib/libalpm/alpm_list.c 14 Apr 2007 19:18:15 -0000 @@ -24,9 +24,11 @@ #include <stdlib.h> #include <string.h> #include <stdio.h> +#include <regex.h> /* libalpm */ #include "alpm_list.h" +#include "error.h" #include "util.h" /** \defgroup alpm_list functions */ @@ -458,6 +460,39 @@ int SYMEXPORT alpm_list_find_str(alpm_li return(0); } +/* Test for existence of a string in an alpm_list_t, treating the list + * elements as regular expressions +*/ +/** Is a _string_ in the list (optimization of alpm_list_find for strings) + * @param needle the string to compare + * @param haystack the list to search + * @return 1 if `needle` is found, 0 otherwise + */ + +int SYMEXPORT alpm_list_find_str_regex(alpm_list_t *haystack, const char *needle) +{ + alpm_list_t *lp = haystack; + + while(lp) { + if(lp->data) { + char* targ = lp->data; + regex_t reg; + + _alpm_log(PM_LOG_DEBUG, "matching needle '%s' against haystack item '%s'", + needle, lp->data); + + if(regcomp(&reg, targ, REG_EXTENDED | REG_NOSUB | REG_ICASE | REG_NEWLINE) != 0) { + RET_ERR(PM_ERR_INVALID_REGEX, NULL); + } + + if (regexec(&reg, needle, 0, 0, 0) == 0) { + return(1); + } + } + lp = lp->next; + } + return(0); +} /** * Calculate the items in list `lhs` that are not present in list `rhs` * @note Entries are not duplicated

3 2

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.2-142-gdb3e166
by dan＠archlinux.org 11 Apr '09

11 Apr '09

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 db3e166503386b4f9e456017fd56d8bce84528fe (commit) via d70465decc617412db0670c8169ec22421c8e3d1 (commit) from 4b78852f7e78ec605be0a382ddc78afe33251d78 (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 db3e166503386b4f9e456017fd56d8bce84528fe Author: Bryan Ischo <bji-keyword-pacman.3644cb(a)www.ischo.com> Date: Mon Mar 9 09:56:13 2009 +1300 Look in target-list first to resolve dependencies This fixes a bug introduced by my previous changes which changes the behavior of IgnorePkg/IgnoreGroup to allow the user to remove unresolvable packages from the transaction. The bug is that the target-list was no longer being consulted first to resolve dependencies, which means that if two packages in the sync database satisfied a dependency, and the user explicitly requested one of those two packages in the sync, the other package was still being pulled in. A new test was added, sync993.py, to verify the desired behavior. Signed-off-by: Bryan Ischo <bji-keyword-pacman.3644cb(a)www.ischo.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d70465decc617412db0670c8169ec22421c8e3d1 Author: Bryan Ischo <bji-keyword-pacman.3644cb(a)www.ischo.com> Date: Mon Mar 9 10:05:10 2009 +1300 Remove duplicates from the unresolvable list before prompting user Signed-off-by: Bryan Ischo <bji-keyword-pacman.3644cb(a)www.ischo.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/deps.c | 18 +++++++++++------- lib/libalpm/deps.h | 3 ++- lib/libalpm/sync.c | 8 ++++++-- pactest/tests/sync993.py | 20 ++++++++++++++++++++ 4 files changed, 39 insertions(+), 10 deletions(-) create mode 100644 pactest/tests/sync993.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.2-140-g4b78852
by dan＠archlinux.org 11 Apr '09

11 Apr '09

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 4b78852f7e78ec605be0a382ddc78afe33251d78 (commit) via aefb4e0fa54ad5b4140d6991f389b5a6fb4ead6d (commit) via 391952600d30bf7c28c5403c5c9e220d345ffe87 (commit) via 634304feae6574d42e069a6718621cf2852f08ab (commit) via 56fd24ecf8b75904444f548488fbe96185cf2492 (commit) via 77efd512165ca2066dc6547bda52082f8bd11db2 (commit) via 93ca155b48a29685914ffa10b11be42ef5d4734a (commit) via 0c614c181efec31ea8d3948745e5746b642cb10c (commit) via 91d43ba4b44e0827c6d9b66c70485672953f5a6d (commit) via 59b4725bbb881140fea47dd2d1b09cef37e8a9dc (commit) via a556bc57fccf9b35f9b2eca08ddae595c3a75592 (commit) via bbcf96230ad16ad91f5ab8cb93c05fd15136d3e4 (commit) via 89685bdb2918c59a109cba2199ab25bc1bcfa784 (commit) via 994804f20e51ea6dbbb236b919846a420b2d2369 (commit) via f8bb69c1d22473a3a82c6bab27799e3cada56a0a (commit) via 9fa18d9a4b4ce5217842c71d8a45676e3fb9d3f4 (commit) via c8beffa7904abe7e0ad01fed6113acf449df15cd (commit) from 101c16b3eb8048dffd1c6c4438e84b759d2e2aff (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 4b78852f7e78ec605be0a382ddc78afe33251d78 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Apr 11 14:13:03 2009 -0500 const-ify endswith() Signed-off-by: Dan McGee <dan(a)archlinux.org> commit aefb4e0fa54ad5b4140d6991f389b5a6fb4ead6d Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sat Mar 7 19:44:34 2009 +0100 Remove pmsyncpkg_t pmsyncpkg_t data sructure was removed: 1. pmpkg_t.reason is used instead of pmsyncpkg_t.newreason. (The target packages come from sync repos, so we can use this field without any problems. Upgrade transaction also uses this field to store this info.) 2. pmsyncpkg_t.removes was moved to pmpkg_t.removes. This step requires careful programming, because we don't duplicate packages when we add them to trans->packages. So we modify sync pkgcache when we add this transaction-only info to our package. Hence it is important to free this list when we remove any package from the target list (remove_unresolvable, remove_conflicts, trans_free), otherwise this could confuse the new sync transactions (with non-pacman GUI). Overall, our code became ~100 line shorter, and we can call our helper functions directly on trans->packages in sync.c, we don't need to maintain parallel package lists. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 391952600d30bf7c28c5403c5c9e220d345ffe87 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Fri Jan 2 17:43:05 2009 +0100 Fix for trans001.py (FS#9088) From now on _alpm_db_find_fileconflicts() works with upgrade and remove target lists (like checkdeps), which makes it transaction independent (we still need a trans param because of the progressbar). This is a small step towards the universal transaction. So we call this function directly from sync.c before commiting the remove transaction. This is much safer, but we can get false fileconflict error alarms in some tricky cases ("symlinks puzzle" etc). The patch on find_fileconflict looks complex, but it is mainly an "indent-patch", the new code-part can be found after the /* check remove list ... */ comment, and I modified something around the "file has changed hand" case (see comment modifications in the code). Unfortunately sync.c became more ugly, because we have to create 2 parallel internal transactions: to avoid duplicated work, upgrade transaction is used to load package data (filelists). This problem will disappear, when we finally get rid of internal transactions. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 634304feae6574d42e069a6718621cf2852f08ab Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sat Mar 7 16:25:29 2009 +0100 Free *data list when user removes unresolvable packages Resolvedeps reports error when it cannot resolve some dependencies, puts them into the *data list, and set pm_errno. If user removes the unresolvable packages from the target list, we have no error anymore, so from now on we free *data list (we eliminate a memleak) and unset pm_errno. (Additionally I removed two needless lines from the code, unresolvable list is always freed in cleanup.) Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 56fd24ecf8b75904444f548488fbe96185cf2492 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Wed Mar 4 20:34:06 2009 +0100 Print warning in _alpm_resolvedep() if a satisfier package is ignored without QUESTION After commit f57f8d33862050acc8d131710c100ba47877e675 pacman *silently* ignores packages from IgnorePkg/IgnoreGroup during dependency resolving, if prompt == 0. This behavior is changed to "give warning + ignore". (Otherwise the user is not informed about the fact that the package resolving was blocked by ignorepkg.) Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 77efd512165ca2066dc6547bda52082f8bd11db2 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sun Nov 9 17:34:49 2008 +0100 New error type: PM_ERR_PKG_IGNORED This patch fixes FS#12059. Now sync_addtarget can return with PM_ERR_PKG_IGNORED, which indicates that although the requested package was found it is in ignorepkg, so alpm could not add it to the transaction. So the front-end can decide what to do. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 93ca155b48a29685914ffa10b11be42ef5d4734a Merge: 101c16b3eb8048dffd1c6c4438e84b759d2e2aff 0c614c181efec31ea8d3948745e5746b642cb10c Author: Dan McGee <dan(a)archlinux.org> Date: Sat Apr 11 13:50:56 2009 -0500 Merge branch 'xav/repo-add' commit 0c614c181efec31ea8d3948745e5746b642cb10c Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Tue Mar 3 17:13:52 2009 +0100 repo-add : rename gstmpdir to tmpdir What does gstmpdir mean? Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> commit 91d43ba4b44e0827c6d9b66c70485672953f5a6d Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Tue Mar 3 17:10:26 2009 +0100 repo-add : don't change the modification time on depends and desc The modification time on depends and desc file were changed to match the modification time of the package file. I don't see why and we are actualling losing information here. If we want to know the date of the package file, we can just look inside the depends file. If we want to know when the entry was created, we should not alter the modification time of depends and desc. Besides, this had the non-obvious and undocumented side effect that the depends file was always created, even if it was empty. And pacman actually does require that. So I added a "touch depends" to always create the file. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> commit 59b4725bbb881140fea47dd2d1b09cef37e8a9dc Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Tue Mar 3 17:05:14 2009 +0100 repo-add : new locking system Weird things could happen if several repo-add were run concurrently on the same database. The introduced locking system will prevent this to happen. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> commit a556bc57fccf9b35f9b2eca08ddae595c3a75592 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Fri Feb 27 15:18:10 2009 +0100 repo-add : fix package variables declaration - arch was missing - backup is not used by repo-add. However makepkg still needs to put it in PKGINFO because pacman uses it - startdir is no longer used after the new delta implementation - the declaration of group, depend, backup, etc is not needed because these variables are always declared before being used : declare $var="$val" case "$var" in group) _groups="$_groups$group\n" ;; - reorder the variables declaration to follow the same order than they are written to the depends and desc file, for making future checks easier Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> commit bbcf96230ad16ad91f5ab8cb93c05fd15136d3e4 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Wed Feb 25 19:06:16 2009 +0100 repo-add : rewrite delta support Use the correct database format Use xdelta3 to get the source and destination files from the delta itself Allow delta files to be added with repo-add just like package files. delta files can also be removed with repo-remove. This is simply done by looking for a .delta extension in the arguments, and calling the appropriate db_write_delta or db_remove_delta functions. Example usage: repo-add repo/test.db.tar.gz repo/libx11-1.1.99.2-2-x86_64.pkg.tar.gz repo-add repo/test.db.tar.gz repo/libx11-1.1.5-2_to_1.1.99.2-2-x86_64.delta repo-remove repo/test.db.tar.gz libx11-1.1.5-2_to_1.1.99.2-2-x86_64.delta Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> commit 89685bdb2918c59a109cba2199ab25bc1bcfa784 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Thu Feb 26 20:08:33 2009 +0100 repo-add : drop delta support to rewrite it from scratch The current implementation has several problems : Wrong database format All the info is taken from the filename, which is a bit ugly It looks for .delta files in the current directory when adding a package, which is not very flexible Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> commit 994804f20e51ea6dbbb236b919846a420b2d2369 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Thu Feb 26 20:02:05 2009 +0100 repo-add.sh.in : repo-remove improvements * report when a package entry to be removed is not found * backup and restore eventual "deltas" files * slight optimization when looking for an entry : only look at the entries starting with $pkgname Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> commit f8bb69c1d22473a3a82c6bab27799e3cada56a0a Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Thu Feb 26 19:23:33 2009 +0100 repo-add cleanup Refactor the main loop, which was difficult to read. Use case instead of if when appropriate. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> commit 9fa18d9a4b4ce5217842c71d8a45676e3fb9d3f4 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Wed Feb 25 19:26:31 2009 +0100 Add pkgdelta script to create deltas. This should obsolete the delta support in makepkg. Having a separate script should be more flexible. Example usage: $ pkgdelta repo/tzdata-2009a-1-x86_64.pkg.tar.gz repo/tzdata-2009b-1-x86_64.pkg.tar.gz ==> Generating delta from version 2009a-1 to version 2009b-1 ==> Generated delta : 'repo/tzdata-2009a-1_to_2009b-1-x86_64.delta' Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> commit c8beffa7904abe7e0ad01fed6113acf449df15cd Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Thu Feb 19 19:12:34 2009 +0100 Fix several issues with xdelta 1) The changes to sync.c look big but there are mostly caused by the indentation. Fix a bug where download_size == 0 because the packages and deltas are already in the cache, but we still need to build the deltas list and apply the deltas to create the final package. 2) Fix the gzip / md5sum issue by switching to xdelta3, disabling external recompression and using gzip -n in pacman, and disable bsdtar compression and using gzip -n in makepkg. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> ----------------------------------------------------------------------- Summary of changes: doc/pacman.conf.5.txt | 2 +- lib/libalpm/add.c | 2 +- lib/libalpm/alpm.h | 5 +- lib/libalpm/conflict.c | 90 ++++---- lib/libalpm/conflict.h | 3 +- lib/libalpm/delta.c | 5 +- lib/libalpm/deps.c | 14 ++- lib/libalpm/error.c | 2 + lib/libalpm/package.c | 8 + lib/libalpm/package.h | 1 + lib/libalpm/sync.c | 497 +++++++++++++++++++-------------------------- lib/libalpm/sync.h | 13 -- lib/libalpm/trans.c | 7 +- lib/libalpm/trans.h | 2 +- pactest/tests/trans001.py | 2 - scripts/.gitignore | 1 + scripts/Makefile.am | 3 + scripts/makepkg.sh.in | 23 ++- scripts/pkgdelta.sh.in | 165 +++++++++++++++ scripts/repo-add.sh.in | 378 +++++++++++++++++++++------------- src/pacman/sync.c | 9 +- src/pacman/util.c | 7 +- 22 files changed, 720 insertions(+), 519 deletions(-) create mode 100644 scripts/pkgdelta.sh.in hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.2-123-g101c16b
by dan＠archlinux.org 11 Apr '09

11 Apr '09

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 101c16b3eb8048dffd1c6c4438e84b759d2e2aff (commit) via 52d184dae82dbcfe265683dac04ff1c7b0e5be74 (commit) via 63fc93607b3fb9950f927d0533742f0e1fc37dd0 (commit) from d15d4f923dcfbe4afe97fb89322ff1234e2445cd (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 101c16b3eb8048dffd1c6c4438e84b759d2e2aff Author: Dan McGee <dan(a)archlinux.org> Date: Sat Apr 11 13:09:14 2009 -0500 makepkg: fix double check on same path Commit 142225fd typo-ed this one, as it should look like the rest of the checks similar to it. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 52d184dae82dbcfe265683dac04ff1c7b0e5be74 Author: Loui Chang <louipc.ist(a)gmail.com> Date: Tue Apr 7 00:15:45 2009 -0400 makepkg: Fix integrity check when files are missing. The index in the for loop wasn't being incremented, so if the first file wasn't found, the second file would be compared to the first checksum, rather than the second. Signed-off-by: Loui Chang <louipc.ist(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 63fc93607b3fb9950f927d0533742f0e1fc37dd0 Author: Sebastian Nowicki <sebnow(a)gmail.com> Date: Thu Apr 9 13:42:14 2009 +0800 Add detail documentation for alpm_db_update() This adds alpm_db_update() to the alpm_databases Doxygen group. The function is described in more detail and a code example is given. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/be_files.c | 31 +++++++++++++++++++++++++++++++ scripts/makepkg.sh.in | 21 ++++++++++++--------- 2 files changed, 43 insertions(+), 9 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Add detail documentation for alpm_db_update()
by Sebastian Nowicki 11 Apr '09

11 Apr '09

This adds alpm_db_update() to the alpm_databases Doxygen group. The function is described in more detail and a code example is given. --- lib/libalpm/be_files.c | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/lib/libalpm/be_files.c b/lib/libalpm/be_files.c index 93a2cc9..8ac253a 100644 --- a/lib/libalpm/be_files.c +++ b/lib/libalpm/be_files.c @@ -134,6 +134,37 @@ static int checkdbdir(pmdb_t *db) } /** Update a package database + * + * An update of the package database \a db will be attempted. Unless + * \a force is true, the update will only be performed if the remote + * database was modified since the last update. + * + * A transaction is necessary for this operation, in order to obtain a + * database lock. During this transaction the front-end will be informed + * of the download progress of the database via the download callback. + * + * Example: + * @code + * pmdb_t *db; + * int result; + * db = alpm_list_getdata(alpm_option_get_syncdbs()); + * if(alpm_trans_init(PM_TRANS_TYPE_SYNC, 0, NULL, NULL, NULL) == 0) { + * result = alpm_db_update(0, db); + * alpm_trans_release(); + * + * if(result > 0) { + * printf("Unable to update database: %s\n", alpm_strerrorlast()); + * } else if(result < 0) { + * printf("Database already up to date\n"); + * } else { + * printf("Database updated\n"); + * } + * } + * @endcode + * + * @ingroup alpm_databases + * @note After a successful update, the \link alpm_db_get_pkgcache() + * package cache \endlink will be invalidated * @param force if true, then forces the update, otherwise update only in case * the database isn't up to date * @param db pointer to the package database to update -- 1.6.1

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.2-120-gd15d4f9
by dan＠archlinux.org 11 Apr '09

11 Apr '09

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 d15d4f923dcfbe4afe97fb89322ff1234e2445cd (commit) via 6fb0c5abd7ac98694e9fb25749ed3b2e5b8c8848 (commit) via 20ab91fb792644d8f32a525dd38ba02761d03c4c (commit) via afb2f39291ea1eee0cb0ab036ef4519d7206c6f7 (commit) via e37ecbe8a496921ec12f24d949b347fbc25e8683 (commit) via 22a46165507b65891612c14ff87819019ca822f6 (commit) via cb8aee58ebb6d0b7b9c8e4d574b54e1be1d0d0ec (commit) from 3cb4eaef4fc2d61fd365d35e7678408d2de124c2 (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 d15d4f923dcfbe4afe97fb89322ff1234e2445cd Author: Dan McGee <dan(a)archlinux.org> Date: Sat Apr 11 12:43:28 2009 -0500 Small cleanups to index.txt Simplify the gitweb links. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6fb0c5abd7ac98694e9fb25749ed3b2e5b8c8848 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Apr 11 12:38:20 2009 -0500 doc: move files around for consistency Move some of our documentation files, even though they aren't manpages, to the doc/ directory. This allows the new 'html' make target to manage them. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 20ab91fb792644d8f32a525dd38ba02761d03c4c Author: Dan McGee <dan(a)archlinux.org> Date: Sat Apr 11 12:34:15 2009 -0500 doc: add 'html' target to Makefile.am Signed-off-by: Dan McGee <dan(a)archlinux.org> commit afb2f39291ea1eee0cb0ab036ef4519d7206c6f7 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Apr 11 12:33:33 2009 -0500 doc: fix repo-add manpage Now the comment was showing up in the generated manpage and HTML documentation. Just kill it as asciidoc keeps screwing us over. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e37ecbe8a496921ec12f24d949b347fbc25e8683 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Apr 11 11:14:28 2009 -0500 Fix asciidoc formatting warnings and issues Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 22a46165507b65891612c14ff87819019ca822f6 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Apr 11 11:00:19 2009 -0500 Add the pacman home page to the doc directory Also ignore .html files in doc/. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit cb8aee58ebb6d0b7b9c8e4d574b54e1be1d0d0ec Author: Allan McRae <allan(a)archlinux.org> Date: Sat Apr 4 01:44:22 2009 +1000 Fix doc building for asciidoc >= 8.4.1 Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/.gitignore | 2 + doc/Makefile.am | 51 +++++- doc/PKGBUILD.5.txt | 18 +- doc/index.txt | 194 ++++++++++++++++++++++ doc/makepkg.8.txt | 2 +- doc/repo-add.8.txt | 6 - submitting-patches => doc/submitting-patches.txt | 0 translation-help => doc/translation-help.txt | 0 8 files changed, 249 insertions(+), 24 deletions(-) create mode 100644 doc/index.txt rename submitting-patches => doc/submitting-patches.txt (100%) rename translation-help => doc/translation-help.txt (100%) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] Patch for pm_printf
by Dan Campbell 07 Apr '09

07 Apr '09

It doesn't do much, just checks the log level, and if set to debug or error, prints to stderr instead of stdout. Not a pressing thing, but in my opinion this makes more sense. >From 6f0607564bc32291b5bab8e49a657f6f255dce93 Mon Sep 17 00:00:00 2001 From: Dan Campbell <dan(a)archbox.localdomain> Date: Tue, 7 Apr 2009 19:00:51 -0500 Subject: [PATCH] Make pacman behave more like "standard" unix utilities by printing error and debug messages to stderr instead of stdout. Signed-off-by: Dan Campbell <dan<dot>campbell@gmail<dot>com> --- src/pacman/util.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index b80b09a..ebc5ff2 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -710,7 +710,11 @@ int pm_printf(pmloglevel_t level, const char *format, ...) /* print the message using va_arg list */ va_start(args, format); + if(level == PM_LOG_DEBUG || level == PM_LOG_ERROR) { + ret = pm_vfprintf(stderr, level, format, args); + } else { ret = pm_vfprintf(stdout, level, format, args); + } va_end(args); return(ret); -- 1.6.2.2

1 0

Re: [pacman-dev] [PATCH] doc: Fix asciidoc warnings and errors.
by Loui Chang 06 Apr '09

06 Apr '09

On Mon, Apr 06, 2009 at 02:56:52PM +1000, Allan McRae wrote: > Loui Chang wrote: > > Signed-off-by: Loui Chang <louipc.ist(a)gmail.com> > > --- > > doc/PKGBUILD.5.txt | 14 +++++++------- > > doc/makepkg.8.txt | 2 +- > > doc/repo-add.8.txt | 8 +------- > > 3 files changed, 9 insertions(+), 15 deletions(-) > > > > This patch along with an asciidoc patch > (http://hg.sharesource.org/asciidoc/rev/1dfa7028bbb3) remove all warnings > for me and I notice no problem with man pages afterwards. I'm just using the asciidoc provided in the repos by the way. I didn't get any errors or warnings.

1 0

Re: [pacman-dev] [PATCH] doc: Fix asciidoc warnings and errors.
by Loui Chang 06 Apr '09

06 Apr '09

On Mon, Apr 06, 2009 at 02:56:52PM +1000, Allan McRae wrote: > Loui Chang wrote: > > Signed-off-by: Loui Chang <louipc.ist(a)gmail.com> > > --- > > doc/PKGBUILD.5.txt | 14 +++++++------- > > doc/makepkg.8.txt | 2 +- > > doc/repo-add.8.txt | 8 +------- > > 3 files changed, 9 insertions(+), 15 deletions(-) > > > > This patch along with an asciidoc patch > (http://hg.sharesource.org/asciidoc/rev/1dfa7028bbb3) remove all warnings > for me and I notice no problem with man pages afterwards. > > > diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt > > index f8ed7f2..9e271af 100644 > > --- a/doc/PKGBUILD.5.txt > > +++ b/doc/PKGBUILD.5.txt > > @@ -65,19 +65,19 @@ similar to `$_basekernver`. > > This field specifies the license(s) that apply to the package. > > Commonly-used licenses are found in '/usr/share/licenses/common'. If you > > see the package's license there, simply reference it in the license > > - field (e.g. `$$license=('GPL')$$`). If the package provides a license not > > + field (e.g. $$license=('GPL')$$). If the package provides a license not > > > > What were the back-ticks attempting to do in these cases? Are we losing > anything? I think they were meant to make the text monospaced. I guess this change does have an effect outside the standard console environment. Here's a reference: http://www.methods.co.nz/asciidoc/userguide.html#X77 > <snip> > > Name > > ---- > > -//// > > -* If we use this below line, the manpage name comes out all weird. We also > > -* can't use two separate lines, which is quite annoying. * > > -repo-add, repo-remove - package database maintenance utilities > > -//// > > -repo-add - package database maintenance utility > > - > > +repo-add - repo-remove - package database maintenance utilities > > > > This looks a bit strange with the dash separating repo-add and repo-remove. > Most other man pages for multiple things use commas to separate the names > then a dash before the description. It would be good to be consistent... I think it looks fine. The problem is that asciidoc will want to create a manpage called repo-add,_repo-remove.8. So this is better than totally omitting repo-remove from that description I think.

1 0