- Pacman-dev - lists.archlinux.org

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

22 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 886a31ef205923fd5b29012ee75932a2e2dec4bd (commit) from 85902d98e831d79dfef1bd3cc7099c6dba806e8a (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 886a31ef205923fd5b29012ee75932a2e2dec4bd Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jun 22 11:51:58 2011 -0500 makepkg: fix 'check_sofware' typo Allan broke it! Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: scripts/makepkg.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- The official pacman repository

1 0

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

22 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 85902d98e831d79dfef1bd3cc7099c6dba806e8a (commit) via 3d4bf3b3fdabb721ab4be23e6ca26e8fa5bb9806 (commit) via 74689562363b3dec2a97ce095295a5222562061d (commit) via e97541c2083205a81f46225c367a9f470c702dd1 (commit) via 41f9fa9bed15b9e01b78edcea83b9c81679be3bf (commit) via 3497eb4e2c1bf3869176f944ba97c289bebf2e30 (commit) via 508b360c24ddfdb79f66cc14b197988a829b0ecd (commit) via b803a33a8fc2ef86ba2d986c36f31524532d454b (commit) from b8990993271b34d309ada49197090895b0fbdfb6 (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 85902d98e831d79dfef1bd3cc7099c6dba806e8a Author: Dave Reisner <d(a)falconindy.com> Date: Mon Jun 20 16:38:57 2011 -0400 repo-add: style cleanup Unify function braces to be top right opening, bottom left closing. Signed-off-by: Dave Reisner <d(a)falconindy.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3d4bf3b3fdabb721ab4be23e6ca26e8fa5bb9806 Author: Kerrick Staley <mail(a)kerrickstaley.com> Date: Wed Jun 22 00:32:57 2011 -0500 Fixed outdated documentation in test/pacman/README test/pacman/README mentioned the -A flag, which no longer exists. Signed-off-by: Kerrick Staley <mail(a)kerrickstaley.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 74689562363b3dec2a97ce095295a5222562061d Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 21 13:02:07 2011 +1000 makepkg: add software check function Add a function that checks for the software needed by makepkg to process a PKGBUILD with the requested options. This allows makepkg to bail early in the packaging process. Many other checks can be added to this function... Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e97541c2083205a81f46225c367a9f470c702dd1 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 21 12:27:21 2011 +1000 Remove old TODO lists These had not been touched since 2007 and had lost most of their relevance. The bug tracker is a better place for the filing of ideas. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 41f9fa9bed15b9e01b78edcea83b9c81679be3bf Author: Allan McRae <allan(a)archlinux.org> Date: Thu Jun 16 19:57:31 2011 +1000 makepkg: move comment into correct place Oops... Introduced by commit d21f6ca4. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3497eb4e2c1bf3869176f944ba97c289bebf2e30 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jun 15 21:59:06 2011 +1000 makepkg: adjust libprovides/depends messages Contractions are less clear for non-native speakers so should be avoided (and cause syntax highlighting issues). Also, the 'provides' and 'depends' strings are not to be translated. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 508b360c24ddfdb79f66cc14b197988a829b0ecd Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jun 15 14:32:42 2011 +1000 makepkg: allow specifying alternative build directory Add a BUILDDIR variable (which can be overridden in the environment) to specify an alternative location for building the package. This is useful for people who want to build on a different filesystem for improved performance (e.g. tmpfs). Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b803a33a8fc2ef86ba2d986c36f31524532d454b Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 14 22:01:05 2011 +1000 makepkg: Add UPX compression support This patch enables the automatic compression of executable binaries using UPX when the 'upx' options is specified in makepkg.conf or the PKGBUILD. Additional arguments can be passed to UPX by specifying the UPXFLAGS variable. Original-patch-by: Bryce Gibson <bryce(a)gibson-consulting.com.au> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: TODO.aaron | 57 -------------------------- TODO.dan | 95 -------------------------------------------- doc/PKGBUILD.5.txt | 3 + doc/makepkg.8.txt | 3 + doc/makepkg.conf.5.txt | 14 ++++++- etc/makepkg.conf.in | 8 +++- scripts/makepkg.sh.in | 103 ++++++++++++++++++++++++++++++++++++------------ scripts/repo-add.sh.in | 24 ++++------- test/pacman/README | 6 +- 9 files changed, 114 insertions(+), 199 deletions(-) delete mode 100644 TODO.aaron delete mode 100644 TODO.dan hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Unify modelines in Asciidoc files
by Dan McGee 22 Jun '11

22 Jun '11

This gets us close to using the same modeline in all files we run through Asciidoc, as well as adding the spell and spelllang declarations, just as we had in NEWS already. The choice of 'en_us' is mainly for consistency and because the body of work already uses these spellings. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- HACKING | 2 +- doc/PKGBUILD.5.txt | 2 +- doc/footer.txt | 2 +- doc/index.txt | 10 +++++----- doc/libalpm.3.txt | 2 +- doc/makepkg.8.txt | 2 +- doc/makepkg.conf.5.txt | 2 +- doc/pacman-key.8.txt | 2 +- doc/pacman.8.txt | 2 +- doc/pacman.conf.5.txt | 2 +- doc/pkgdelta.8.txt | 2 +- doc/repo-add.8.txt | 2 +- doc/submitting-patches.txt | 6 +++--- doc/translation-help.txt | 34 +++++++++++++++++----------------- doc/vercmp.8.txt | 2 +- 15 files changed, 37 insertions(+), 37 deletions(-) diff --git a/HACKING b/HACKING index 2df7ecc..6692f7e 100644 --- a/HACKING +++ b/HACKING @@ -147,5 +147,5 @@ For example, to run valgrind: valgrind --leak-check=full -- src/pacman/.libs/lt-pacman -Syu ///// -vim: set ts=2 sw=2 syntax=asciidoc et: +vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: ///// diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 4d76121..8dcf491 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -1,5 +1,5 @@ ///// -vim:set ts=4 sw=4 syntax=asciidoc noet: +vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: ///// PKGBUILD(5) =========== diff --git a/doc/footer.txt b/doc/footer.txt index 2ffb009..a132542 100644 --- a/doc/footer.txt +++ b/doc/footer.txt @@ -1,5 +1,5 @@ ///// -vim:set ts=4 sw=4 syntax=asciidoc noet: +vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: ///// See the pacman website at http://www.archlinux.org/pacman/[] for current diff --git a/doc/index.txt b/doc/index.txt index 4cc8313..5fd3f3b 100644 --- a/doc/index.txt +++ b/doc/index.txt @@ -107,9 +107,9 @@ link:ftp://ftp.archlinux.org/other/pacman/[]. To install, download the newest available source tarball, unpack it in a directory, and run the three magic commands: - $ ./configure - $ make - # make install + $ ./configure + $ make + # make install You may wish to read the options presented by `./configure --help` in order to set appropriate paths and build options that are correct for your system. @@ -132,7 +132,7 @@ these trees). The current development tree can be fetched with the following command: - git clone git://projects.archlinux.org/pacman.git pacman + git clone git://projects.archlinux.org/pacman.git pacman which will fetch the full development history into a directory named pacman. You can browse the source as well using @@ -206,5 +206,5 @@ pacman is Copyright (C) 2006-2011 Pacman Development Team version 2 or later. ///// -vim: set ts=2 sw=2 syntax=asciidoc et: +vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: ///// diff --git a/doc/libalpm.3.txt b/doc/libalpm.3.txt index b7a892c..e2ea32c 100644 --- a/doc/libalpm.3.txt +++ b/doc/libalpm.3.txt @@ -1,5 +1,5 @@ ///// -vim:set ts=4 sw=4 syntax=asciidoc noet: +vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: ///// libalpm(3) ========== diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index f15226a..e59c5ff 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -1,5 +1,5 @@ ///// -vim:set ts=4 sw=4 syntax=asciidoc noet: +vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: ///// makepkg(8) ========== diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index aa0174c..b93e4cd 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -1,5 +1,5 @@ ///// -vim:set ts=4 sw=4 syntax=asciidoc noet: +vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: ///// makepkg.conf(5) =============== diff --git a/doc/pacman-key.8.txt b/doc/pacman-key.8.txt index 892f14d..24c9470 100644 --- a/doc/pacman-key.8.txt +++ b/doc/pacman-key.8.txt @@ -1,5 +1,5 @@ ///// -vim:set ts=4 sw=4 syntax=asciidoc noet: +vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: ///// pacman-key(8) ============= diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 531c992..8a6565f 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -1,5 +1,5 @@ ///// -vim:set ts=4 sw=4 syntax=asciidoc noet: +vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: ///// pacman(8) ========= diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt index bdf0bc8..308f471 100644 --- a/doc/pacman.conf.5.txt +++ b/doc/pacman.conf.5.txt @@ -1,5 +1,5 @@ ///// -vim:set ts=4 sw=4 syntax=asciidoc noet: +vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: ///// pacman.conf(5) ============== diff --git a/doc/pkgdelta.8.txt b/doc/pkgdelta.8.txt index 2d99a87..3804c5d 100644 --- a/doc/pkgdelta.8.txt +++ b/doc/pkgdelta.8.txt @@ -1,5 +1,5 @@ ///// -vim:set ts=4 sw=4 syntax=asciidoc noet: +vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: ///// pkgdelta(8) ========= diff --git a/doc/repo-add.8.txt b/doc/repo-add.8.txt index 0196882..919b906 100644 --- a/doc/repo-add.8.txt +++ b/doc/repo-add.8.txt @@ -1,5 +1,5 @@ ///// -vim:set ts=4 sw=4 syntax=asciidoc noet: +vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: ///// repo-add(8) ========== diff --git a/doc/submitting-patches.txt b/doc/submitting-patches.txt index e6853c5..3428768 100644 --- a/doc/submitting-patches.txt +++ b/doc/submitting-patches.txt @@ -20,7 +20,7 @@ started with GIT if you have not worked with it before. The pacman code can be fetched using the following command: - git clone git://projects.archlinux.org/pacman.git + git clone git://projects.archlinux.org/pacman.git Creating your patch @@ -32,7 +32,7 @@ Creating your patch The -s allows you to credit yourself by adding a "Signed Off By" line to indicate who has "signed" the patch - who has approved it. - Signed-off-by: Aaron Griffin <aaron(a)archlinux.org> + Signed-off-by: Aaron Griffin <aaron(a)archlinux.org> Please use your real name and email address. Feel free to "scramble" the address if you're afraid of spam. @@ -94,5 +94,5 @@ aren't their own. -- ///// -vim: set ts=2 sw=2 syntax=asciidoc et: +vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: ///// diff --git a/doc/translation-help.txt b/doc/translation-help.txt index d95b513..ef86dbf 100644 --- a/doc/translation-help.txt +++ b/doc/translation-help.txt @@ -40,15 +40,15 @@ not worried about any local translations being overwritten. The .tx/ directory is checked into the git repository so is preconfigured with the two project resources (See `tx status` output for a quick overview). - tx pull -f - poedit po/<mylang>.po - poedit lib/libalpm/po/<mylang>.po - tx push -t -l <mylang> + tx pull -f + poedit po/<mylang>.po + poedit lib/libalpm/po/<mylang>.po + tx push -t -l <mylang> Or to just push one of the two available resources: - tx push -r archlinux-pacman.pacman-pot -t -l fi - tx push -r archlinux-pacman.libalpm-pot -t -l fi + tx push -r archlinux-pacman.pacman-pot -t -l fi + tx push -r archlinux-pacman.libalpm-pot -t -l fi See the <<Notes,Notes>> section for additional hints on translating. @@ -79,7 +79,7 @@ Incremental Updates If you have more advanced needs you will have to get a copy of the pacman repository. - git clone git://projects.archlinux.org/pacman.git pacman + git clone git://projects.archlinux.org/pacman.git pacman Next, you will need to run `./autogen.sh` and `./configure` in the base directory to generate the correct Makefiles. At this point, all necessary @@ -91,11 +91,11 @@ We need to first update the main message catalog file. Navigate into either the work on first, and execute the following command. If you are working in the `po/` tree, replace 'libalpm.pot' with 'pacman.pot': - make libalpm.pot-update + make libalpm.pot-update Next, update your specific language's translation file: - make <po file>-update + make <po file>-update At this point, you can do the translation. To submit your changes, either email the new `.po` file to the mailing-list with *[translation]* in the subject, or @@ -104,7 +104,7 @@ submit a GIT-formatted patch (please do not include any `.pot` file changes). As a shortcut, all translation files (including `.pot` files) can be updated with the following command: - make update-po + make update-po Adding a New Language ~~~~~~~~~~~~~~~~~~~~~ @@ -133,16 +133,16 @@ msgid and msgstr 'variables' can be on as many lines as necessary. Line breaks are ignored- if you need a literal line break, use an `\n` in your string. The following two translations are equivalent: - msgstr "This is a test translation" + msgstr "This is a test translation" - msgstr "" - "This is a test translation" + msgstr "" + "This is a test translation" If you want to test the translation (for example, the frontend one): - rm *.gmo stamp-po - make - cp <lang code>.gmo /usr/share/locale/<lang code>/LC_MESSAGES/pacman.mo + rm *.gmo stamp-po + make + cp <lang code>.gmo /usr/share/locale/<lang code>/LC_MESSAGES/pacman.mo Translating Manpages @@ -160,5 +160,5 @@ check there first before undergoing a translation effort to ensure you are not duplicating efforts. ///// -vim: set ts=2 sw=2 syntax=asciidoc et: +vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: ///// diff --git a/doc/vercmp.8.txt b/doc/vercmp.8.txt index f2fc530..a3bc561 100644 --- a/doc/vercmp.8.txt +++ b/doc/vercmp.8.txt @@ -1,5 +1,5 @@ ///// -vim:set ts=4 sw=4 syntax=asciidoc noet: +vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: ///// vercmp(8) ========= -- 1.7.5.4

1 0

[pacman-dev] [PATCH 0/3] repo-add desc/depends creation cleanup
by Dave Reisner 22 Jun '11

22 Jun '11

This is basically what I referred to in my last patch about refactoring desc/depends writing. I snuck in an extra winner (the first) to get rid of the insane IFS tweaking and iteration of the .PKGINFO file with a for loop. Dan, I'm not sure if I can break this up any further, but I'm happy to refactor if it would make you more comfortable. I know it's an insanely important code path so I encourage you (and anyone else reading) to put on your nerd glasses and nitpick this. Dave Reisner (3): 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 scripts/repo-add.sh.in | 105 +++++++++++++++++++++++------------------------ 1 files changed, 51 insertions(+), 54 deletions(-) -- 1.7.5.4

3 9

[pacman-dev] [PATCH] [RFC] repo-add: don't create links if archive extension is invalid
by Dan McGee 22 Jun '11

22 Jun '11

Not sure what to do here, if we should be proceeding at all. The current situation: dmcgee@galway ~/projects/pacman (master) $ ./scripts/repo-add /tmp/invalid.xxx /var/cache/pacman/pkg/apr-1.4.5-1-x86_64.pkg.tar.xz ==> Adding package '/var/cache/pacman/pkg/apr-1.4.5-1-x86_64.pkg.tar.xz' -> Computing checksums... -> Creating 'desc' db entry... -> Creating 'depends' db entry... ==> Creating updated database file '/tmp/invalid.xxx' ==> WARNING: '/tmp/invalid.xxx' does not have a valid archive extension. dmcgee@galway ~/projects/pacman (master) $ ll /tmp/invalid.xxx lrwxrwxrwx 1 dmcgee users 11 Jun 20 11:08 /tmp/invalid.xxx -> invalid.xxx So we get a symlink to ourself, and overwrite the originally generated repo database. This patch prevents this behavior, and writes out a non-compressed database to invalid.xxx and generates no links. Thoughts? Pacman has a requirement that the db file end in '.db', and the only other extension out there in the wild is '.files' as far as I know. Should we have strict enforcement of one of these two types in repo-add? Doing this could also make the --files flag a bit less necessary as one could auto-detect the correct setting based on the DB extension. --- scripts/repo-add.sh.in | 24 ++++++++++++++---------- 1 files changed, 14 insertions(+), 10 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 0ea8e5b..b29ff92 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -582,8 +582,10 @@ if (( success )); then *.tar.bz2) TAR_OPT="j" ;; *.tar.xz) TAR_OPT="J" ;; *.tar) TAR_OPT="" ;; - *) warning "$(gettext "'%s' does not have a valid archive extension.")" \ - "$REPO_DB_FILE" ;; + *) + warning "$(gettext "'%s' does not have a valid archive extension.")" \ + "$REPO_DB_FILE" + TAR_OPT="" ;; esac filename=${REPO_DB_FILE##*/} @@ -605,14 +607,16 @@ if (( success )); then [[ -f $tmpdir/$filename ]] && mv "$tmpdir/$filename" "$REPO_DB_FILE" [[ -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 || \ - 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 || \ - cp "$REPO_DB_FILE.sig" "$dblink.sig" + if [[ $dblink != $REPO_DB_FILE ]]; then + target=${REPO_DB_FILE##*/} + ln -sf "$target" "$dblink" 2>/dev/null || \ + ln -f "$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 || \ + cp "$REPO_DB_FILE.sig" "$dblink.sig" + fi fi else msg "$(gettext "No packages modified, nothing to do.")" -- 1.7.5.4

2 1

[pacman-dev] [PATCH] Fixed outdated documentation in test/pacman/README
by Kerrick Staley 22 Jun '11

22 Jun '11

test/pacman/README mentioned the -A flag, which no longer exists. Signed-off-by: Kerrick Staley <mail(a)kerrickstaley.com> --- test/pacman/README | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/pacman/README b/test/pacman/README index 0bd0213..a3c36fc 100644 --- a/test/pacman/README +++ b/test/pacman/README @@ -22,7 +22,7 @@ The following directory structure is used: - var/cache/pkg: sync packages cache - var/log/pactest.log: log file - var/pub: location for pseudo sync repositories - - tmp: hold all local package archives (to be used with pacman -A or -U) + - tmp: hold all local package archives (to be used with pacman -U) Note: the logfile is used to capture all pacman outputs. @@ -34,7 +34,7 @@ Test case example: "usr/man/man1/dummy.1"] self.addpkg(p) - self.args = "-A dummy-1.0-1.pkg.tar.gz" + self.args = "-U dummy-1.0-1.pkg.tar.gz" self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_EXIST=dummy") @@ -42,7 +42,7 @@ Test case example: self.addrule("FILE_EXIST=%s" % f) Basically, the above test case will try to install a package (dummy-1.0-3), -including two files, from a local archive, by calling "pacman -A" +including two files, from a local archive, by calling "pacman -U" Upon completion, it checks that: - pacman returned no error code, - a "dummy" entry exists in the "local" database -- 1.7.5.2

1 0

[pacman-dev] [PATCH] repo-add.8.txt: document valid DB file extensions
by Dave Reisner 21 Jun '11

21 Jun '11

Signed-off-by: Dave Reisner <d(a)falconindy.com> --- This isn't documented anywhere except in the code, and every few months when I end up having to test something that requires my own repo, it takes me 10 minutes to figure out wtf a valid file extension is. d doc/repo-add.8.txt | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/doc/repo-add.8.txt b/doc/repo-add.8.txt index 0196882..c4f42a2 100644 --- a/doc/repo-add.8.txt +++ b/doc/repo-add.8.txt @@ -29,6 +29,10 @@ command line. delta specified on the command line. Multiple packages and/or delta to remove can be specified on the command line. +A package database is a path a compressed tar file with one of the extensions: +``.tar'', ``.tar.gz'', ``.tar.bz2'', or ``.tar.xz''. The file does not need to +exist, but all parent directories must exist. + Common Options -------------- -- 1.7.5.4

3 4

[pacman-dev] [PATCH] makepkg: reword purge message
by Allan McRae 21 Jun '11

21 Jun '11

Clarfiy that it is unwanted files are being removed rather than "other" files (whatever they are...). Signed-off-by: Allan McRae <allan(a)archlinux.org> --- 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 0639fbd..01206d1 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -856,7 +856,7 @@ tidy_install() { fi if [[ $(check_option purge) = "y" && -n ${PURGE_TARGETS[*]} ]]; then - msg2 "$(gettext "Purging other files...")" + msg2 "$(gettext "Purging unwanted files...")" local pt for pt in "${PURGE_TARGETS[@]}"; do if [[ ${pt} = ${pt//\/} ]]; then -- 1.7.5.4

2 12

[pacman-dev] [PATCH] repo-add: reuse write_list_entry for desc file
by Dave Reisner 20 Jun '11

20 Jun '11

Repurpose the write_list_entry function for everything we write to the depends and desc files by appending our own extra newline after each single line data point. This also refactors write_list_entry into a single printf statement. Signed-off-by: Dave Reisner <d(a)falconindy.com> --- More repo-add madness. Reusable code, ftw. dave scripts/repo-add.sh.in | 31 +++++++++++++++---------------- 1 files changed, 15 insertions(+), 16 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 14506dc..a23f89e 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -88,8 +88,7 @@ There is NO WARRANTY, to the extent permitted by law.\n")" # arg3 - File to write to write_list_entry() { if [[ -n $2 ]]; then - echo "%$1%" >>$3 - echo -e $2 >>$3 + printf "%%%s%%\n$2\n" "$1" >>"$3" fi } @@ -301,27 +300,27 @@ db_write_entry() # create desc entry msg2 "$(gettext "Creating '%s' db entry...")" 'desc' - echo -e "%FILENAME%\n${1##*/}\n" >>desc - echo -e "%NAME%\n$pkgname\n" >>desc - [[ -n $pkgbase ]] && echo -e "%BASE%\n$pkgbase\n" >>desc - echo -e "%VERSION%\n$pkgver\n" >>desc - [[ -n $pkgdesc ]] && echo -e "%DESC%\n$pkgdesc\n" >>desc + write_list_entry "FILENAME" "${1##*/}\n" "desc" + write_list_entry "NAME" "$pkgname\n" "desc" + [[ -n $pkgbase ]] && write_list_entry "BASE" "$pkgbase\n" "desc" + write_list_entry "VERSION" "$pkgver\n" "desc" + [[ -n $pkgdesc ]] && write_list_entry "DESC" "$pkgdesc\n" "desc" write_list_entry "GROUPS" "$_groups" "desc" - [[ -n $csize ]] && echo -e "%CSIZE%\n$csize\n" >>desc - [[ -n $size ]] && echo -e "%ISIZE%\n$size\n" >>desc + [[ -n $csize ]] && write_list_entry "CSIZE" "$csize\n" "desc" + [[ -n $size ]] && write_list_entry "ISIZE" "$size\n" "desc" # add checksums - echo -e "%MD5SUM%\n$md5sum\n" >>desc - echo -e "%SHA256SUM%\n$sha256sum\n" >>desc + write_list_entry "MD5SUM" "$md5sum\n" "desc" + write_list_entry "SHA256SUM" "$sha256sum\n" "desc" # add PGP sig - [[ -n $pgpsig ]] && echo -e "%PGPSIG%\n$pgpsig\n" >>desc + [[ -n $pgpsig ]] && write_list_entry "PGPSIG" "$pgpsig\n" "desc" - [[ -n $url ]] && echo -e "%URL%\n$url\n" >>desc + [[ -n $url ]] && write_list_entry "URL" "$url\n" "desc" write_list_entry "LICENSE" "$_licenses" "desc" - [[ -n $arch ]] && echo -e "%ARCH%\n$arch\n" >>desc - [[ -n $builddate ]] && echo -e "%BUILDDATE%\n$builddate\n" >>desc - [[ -n $packager ]] && echo -e "%PACKAGER%\n$packager\n" >>desc + [[ -n $arch ]] && write_list_entry "ARCH" "$arch\n" "desc" + [[ -n $builddate ]] && write_list_entry "BUILDDATE" "$builddate\n" "desc" + [[ -n $packager ]] && write_list_entry "PACKAGER" "$packager\n" "desc" write_list_entry "REPLACES" "$_replaces" "desc" # create depends entry -- 1.7.5.4

2 2

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

20 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 b8990993271b34d309ada49197090895b0fbdfb6 (commit) via ee638415e305a390cbf3fa68fb2a1fb5523f18e9 (commit) via ab53aa3e3c6370d21ab763210830cd31a5a024a2 (commit) via 3847446603036e3a873c2d0bc0cdd6c1aa19fc2e (commit) via 81e6071e0f0c6ea1f4bb654e3e98493c4650e858 (commit) from 34876e4fe9707de961318da28dba604dffff6d49 (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 b8990993271b34d309ada49197090895b0fbdfb6 Author: Dave Reisner <d(a)falconindy.com> Date: Mon Jun 20 11:05:08 2011 -0400 repo-add: show better error when path to repo does not exist Previously, the error message when trying to add to a repo where a parent directory didn't exist was: ==> ERROR: Failed to acquire lockfile: /path/to/noexist/repo.tar.gz.lck This sucks. Make an explicit check to ensure that the path to the repo really does exist, and throw a meaningful error message when it can't be found. Dan: reuse an existing (translated) error message. Signed-off-by: Dave Reisner <d(a)falconindy.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ee638415e305a390cbf3fa68fb2a1fb5523f18e9 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jun 20 11:08:40 2011 -0500 repo-add: allow creating a database with no compression A plain '.tar' ending should be allowed. This corresponds to how we handle this extension in makepkg. Also fix up the other extension checks, which were missing a leading '.' character. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ab53aa3e3c6370d21ab763210830cd31a5a024a2 Author: Dave Reisner <d(a)falconindy.com> Date: Mon Jun 20 10:32:12 2011 -0400 repo-add: use bash equivalents of basename/dirname Signed-off-by: Dave Reisner <d(a)falconindy.com> commit 3847446603036e3a873c2d0bc0cdd6c1aa19fc2e Author: Dave Reisner <d(a)falconindy.com> Date: Sat Jun 18 19:21:21 2011 -0400 lib/util: call _alpm_log before setting handle->pm_errno This is an unfortunate chain of events. RET_ERR and RET_ERR_VOID will eventually call CHECK_HANDLE, which resets the handle's pm_errno member. Dan probably had a reason for doing this, so we merely switch the order of operations in the RET_ERR macros to avoid stomping on our pm_errno. Signed-off-by: Dave Reisner <d(a)falconindy.com> commit 81e6071e0f0c6ea1f4bb654e3e98493c4650e858 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 16 13:50:23 2011 -0500 pactest: add retcode=0 to several tests Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/util.h | 6 ++++-- scripts/repo-add.sh.in | 27 +++++++++++++++++---------- test/pacman/tests/upgrade020.py | 1 + test/pacman/tests/upgrade021.py | 1 + test/pacman/tests/upgrade022.py | 1 + test/pacman/tests/upgrade023.py | 1 + test/pacman/tests/upgrade024.py | 1 + test/pacman/tests/upgrade025.py | 1 + test/pacman/tests/upgrade026.py | 1 + test/pacman/tests/upgrade042.py | 1 + test/pacman/tests/upgrade043.py | 1 + test/pacman/tests/upgrade045.py | 1 + 12 files changed, 31 insertions(+), 12 deletions(-) hooks/post-receive -- The official pacman repository

1 0