- Pacman-dev - lists.archlinux.org

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

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

06 Apr '09

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(-) 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 found in '/usr/share/licenses/common', then you should include the license - in the package itself and set `$$license=('custom')$$` or - `$$license=('custom:LicenseName')$$`. The license should be placed in + in the package itself and set $$license=('custom')$$ or + $$license=('custom:LicenseName')$$. The license should be placed in '$pkgdir/usr/share/licenses/$pkgname' when building the package. If multiple licenses are applicable for a package, list all of them: - `$$license=('GPL' 'FDL')$$`. + $$license=('GPL' 'FDL')$$. *install*:: Specifies a special install script that is to be included in the package. This file should reside in the same directory as the PKGBUILD, and will be copied into the package by makepkg. It does not need to be included - in the source array (e.g. `$$install=pkgname.install$$`). + in the source array (e.g. $$install=pkgname.install$$). *source (array)*:: An array of source files required to build the package. Source files @@ -90,7 +90,7 @@ similar to `$_basekernver`. + It is also possible to specify an optional filename, which is helpful with weird URLs and for handling multiple source files with the same -name. The syntax is: `$$source=('filename::url')$$` +name. The syntax is: $$source=('filename::url')$$ *noextract (array)*:: An array of filenames corresponding to those from the source array. Files @@ -118,7 +118,7 @@ name. The syntax is: `$$source=('filename::url')$$` *arch (array)*:: Defines on which architectures the given package is available (e.g. - `$$arch=('i686' 'x86_64')$$`). + $$arch=('i686' 'x86_64')$$). *backup (array)*:: A space-delimited array of filenames, without preceding slashes, that diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index 4bb3780..5bc4ce4 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -43,7 +43,7 @@ Options *-A, \--ignorearch*:: Ignore a missing or incomplete arch field in the build script. This is for rebuilding packages from source when the PKGBUILD may be slightly - outdated and not updated with an `$$arch=('yourarch')$$` field. + outdated and not updated with an $$arch=('yourarch')$$ field. *-c, \--clean*:: Clean up leftover work files and directories after a successful build. diff --git a/doc/repo-add.8.txt b/doc/repo-add.8.txt index b9956e9..30fb8ae 100644 --- a/doc/repo-add.8.txt +++ b/doc/repo-add.8.txt @@ -6,13 +6,7 @@ repo-add(8) 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 Synopsis -------- -- 1.6.2.2

2 1

[pacman-dev] Building docs fails
by Allan McRae 06 Apr '09

06 Apr '09

Hi, Anybody an asciidoc expert around here. The upgrade from asciidoc-8.4.0 to 8.4.{1,2} causes building docs to fail for me (output below). Anybody want to look at this? Allan Making all in doc make[2]: Entering directory `/home/allan/code/makepkg/src/pacman/doc' a2x --no-xmllint -d manpage -f manpage --xsltproc-opts='-param man.endnotes.list.enabled 0' --xsltproc-opts='-param man.endnotes.are.numbered 0' --asciidoc-opts="-f asciidoc.conf -a pacman_version="3.2.2" -a pacman_date="`date +%Y-%m-%d`" -a sysconfdir=/etc" pacman.8.txt WARNING: [graphviz-block] missing template section WARNING: [graphviz-block] missing template section Note: Writing pacman.8 a2x --no-xmllint -d manpage -f manpage --xsltproc-opts='-param man.endnotes.list.enabled 0' --xsltproc-opts='-param man.endnotes.are.numbered 0' --asciidoc-opts="-f asciidoc.conf -a pacman_version="3.2.2" -a pacman_date="`date +%Y-%m-%d`" -a sysconfdir=/etc" makepkg.8.txt WARNING: [graphviz-block] missing template section WARNING: [graphviz-block] missing template section WARNING: makepkg.8.txt: line 46: nested inline passthrough Note: Writing makepkg.8 a2x --no-xmllint -d manpage -f manpage --xsltproc-opts='-param man.endnotes.list.enabled 0' --xsltproc-opts='-param man.endnotes.are.numbered 0' --asciidoc-opts="-f asciidoc.conf -a pacman_version="3.2.2" -a pacman_date="`date +%Y-%m-%d`" -a sysconfdir=/etc" repo-add.8.txt WARNING: [graphviz-block] missing template section WARNING: [graphviz-block] missing template section ERROR: repo-add.8.txt: line 8: malformed NAME section body a2x: failed: asciidoc --doctype=manpage -f asciidoc.conf -a pacman_version=3.2.2 -a pacman_date=2009-04-04 -a sysconfdir=/etc -d manpage -b docbook "repo-add.8.txt" make[2]: *** [repo-add.8] Error 1 make[2]: Leaving directory `/home/allan/code/makepkg/src/pacman/doc'

2 4

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

06 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 3cb4eaef4fc2d61fd365d35e7678408d2de124c2 (commit) from f385242f99a732c321aea4fe39b7c7b3fcc8d17f (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 3cb4eaef4fc2d61fd365d35e7678408d2de124c2 Author: Samed Beyribey <ras0ir(a)eventualis.org> Date: Mon Mar 23 18:14:44 2009 +0200 fixed typos and alignment problem in Turkish translation Signed-off-by: Samed Beyribey <ras0ir(a)eventualis.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/po/tr.po | 14 +++++++------- po/tr.po | 50 +++++++++++++++++++++++++------------------------- 2 files changed, 32 insertions(+), 32 deletions(-) hooks/post-receive -- The official pacman repository

1 0

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

06 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 f385242f99a732c321aea4fe39b7c7b3fcc8d17f (commit) via 5fcc9ae7f4cb4044ed0a7e4c7b06567256d5f36a (commit) via 442b91a5dd522596f55caec40e0026ef65ac2479 (commit) via deff57ce8bc2dbe77a9a597505c67ac891718dc0 (commit) via 7370fd595bc0447e7c17135e3a27cc3ae64015d4 (commit) via 4c27a776bd6287d6022a014d4d87ebe6ec6c75f9 (commit) via 7a8ba5a978024228fa3b068fd77d778b44f47ae0 (commit) via 7df0d048d1617df2c5472fd2edd6858b3117d52f (commit) from 9519d22df7cef5b5a48a7d1ebee44a9e935e02b7 (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 f385242f99a732c321aea4fe39b7c7b3fcc8d17f Merge: 5fcc9ae7f4cb4044ed0a7e4c7b06567256d5f36a 442b91a5dd522596f55caec40e0026ef65ac2479 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Apr 5 21:12:28 2009 -0500 Merge commit 'allan/working' commit 5fcc9ae7f4cb4044ed0a7e4c7b06567256d5f36a Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sun Mar 22 17:13:29 2009 +0100 Document --debug After some irc/forum experiences, I decided to document this option. However, I left the debug-level undocumented (--debug=2). Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 442b91a5dd522596f55caec40e0026ef65ac2479 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Mar 30 17:41:34 2009 +1000 makepkg: run tidy_install with no package() function After the splitpkg implementation, the tidy_install function was not being called in PKGBUILDs with only the build() function. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit deff57ce8bc2dbe77a9a597505c67ac891718dc0 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Mar 29 16:49:57 2009 +1000 makepkg: do not bail on failure to install built package Fixes FS#13417. Do no exit makepkg on a failure to install the built package(s). This allows clean-up to still occur. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7370fd595bc0447e7c17135e3a27cc3ae64015d4 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Mar 26 01:29:15 2009 +1000 makepkg: adjust log clean-up for new filenames The log files now have -build or -package at the end and there are separate log files for each *_package() function. Alter clean_up() to deal with this. Also, move glob outside quotes so this actually works. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4c27a776bd6287d6022a014d4d87ebe6ec6c75f9 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Mar 25 23:52:27 2009 +1000 makepkg: adjust install_package for split packages Install all created packages when using the install option with package splitting. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7a8ba5a978024228fa3b068fd77d778b44f47ae0 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Mar 14 23:51:58 2009 +1000 Refactor testing for color message output Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7df0d048d1617df2c5472fd2edd6858b3117d52f Author: Allan McRae <allan(a)archlinux.org> Date: Fri Mar 6 18:28:47 2009 +1000 makepkg: add pkgbase variable The pkgbase variable is added to improve informational output and source package naming when using split packages. Defaults to ${pkgname[0]} if not set. Also: - move splitpkg detection to after pkgname presence is verified - add "cd" line to package_foo() functions in splitpkg proto Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: PKGBUILD-split.proto | 7 +++- doc/pacman.8.txt | 6 +++- scripts/makepkg.sh.in | 93 +++++++++++++++++++++++++++++++++---------------- src/pacman/pacman.c | 1 + 4 files changed, 74 insertions(+), 33 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] help! - globbing not working in makepkg log cleanup
by Allan McRae 04 Apr '09

04 Apr '09

Hi, For some reason, this line in the clean_up() function is not working: rm -f "${pkgname}-${pkgver}-${pkgrel}-${CARCH}.log*" Printing out the value shows everything looks OK but the * does not appear to be wildcarding. To replicate, capy the abs files and "makepkg -Lf" a couple of times the "makepkg -cf". Note the pkg and src directories get cleaned up but none of the log files. Any ideas? Allan

3 3

[pacman-dev] [PATCH] makepkg: run tidy_install with no package() function
by Allan McRae 30 Mar '09

30 Mar '09

After the splitpkg implementation, the tidy_install function was not being called in PKGBUILDs with only the build() function. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 716c5a9..349d0e0 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1635,6 +1635,7 @@ if [ "$INFAKEROOT" -eq 1 ]; then if [ "$PKGFUNC" -eq 0 ]; then if [ "$REPKG" -eq 0 ]; then run_build + tidy_install fi else run_package -- 1.6.2.1

1 0

[pacman-dev] [PATCH] makepkg: do not bail on failure to install built package
by Allan McRae 29 Mar '09

29 Mar '09

Fixes FS#13417. Do no exit makepkg on a failure to install the built package(s). This allows clean-up to still occur. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index ff2663b..716c5a9 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1071,10 +1071,16 @@ install_package() { pkglist="${pkglist} $PKGDEST/${pkg}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" done + local ret=0 if [ "$ASROOT" -eq 0 ]; then - sudo pacman $PACMAN_OPTS -U ${pkglist} || exit $? + sudo pacman $PACMAN_OPTS -U ${pkglist} || ret=$? else - pacman $PACMAN_OPTS -U ${pkglist} || exit $? + pacman $PACMAN_OPTS -U ${pkglist} || ret=$? + fi + + if [ $ret -ne 0 ]; then + warning "$(gettext "Failed to install built package(s).")" + return 0 fi } -- 1.6.2.1

1 0

[pacman-dev] makepkg repackage option text
by Allan McRae 26 Mar '09

26 Mar '09

Hi, Currently makepkg has a line like this: echo "$(gettext " -R, --repackage Repackage contents of pkg/ without building")" which is now true, but only to an extent... If a PKGBUILD has a package() function or split packages, then the packaging functions are run, not just a simple repacking of pkg/. So, alternative text is needed, and I need help generating it. How about: "Rerun the packaging stage only"? or does this need more description? For the man page: Rerun the packaging stage without rebuilding the package. This is useful if you forgot a depend or install file in your PKGBUILD and the build itself will not change. Comments? Allan

3 3