August 2011 - Arch-projects - lists.archlinux.org

[arch-projects] [devtools][PATCH 1/6] commitpkg: declare rsyncopts as an array
by Dave Reisner 17 Aug '11

17 Aug '11

From: Dave Reisner <d(a)falconindy.com> Signed-off-by: Dave Reisner <d(a)falconindy.com> --- commitpkg | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/commitpkg b/commitpkg index bdc1fd6..d37babf 100755 --- a/commitpkg +++ b/commitpkg @@ -97,9 +97,9 @@ for i in 'changelog' 'install'; do done # see if any limit options were passed, we'll send them to rsync -rsyncopts='-e ssh -p --chmod=ug=rw,o=r -c -h -L --progress --partial -y' +rsyncopts=(-e ssh -p --chmod=ug=rw,o=r -c -h -L --progress --partial -y) if [ "$1" = '-l' ]; then - rsyncopts="$rsyncopts --bwlimit=$2" + rsyncopts+=("--bwlimit=$2") shift 2 fi @@ -175,7 +175,7 @@ done if [[ ${#uploads[*]} -gt 0 ]]; then echo 'uploading all package and signature files' - rsync $rsyncopts "${uploads[@]}" "$server:staging/$repo/" || abort + rsync "${rsyncopts[@]}" "${uploads[@]}" "$server:staging/$repo/" || abort fi if [ "${arch[*]}" == 'any' ]; then -- 1.7.6

2 6

[arch-projects] [devtools] [PATCH] commitpkg: Fix leading whitespace in commit messages
by Lukas Fleischer 15 Aug '11

15 Aug '11

Commit c51cc8d365fad3be529776e9dce34ac115664451 erroneously introduced a tab character that is prepended to the body of each commit message. Fix this by using C-style newline escape sequences which will avoid further whitespace issues caused by re-indentation of code at this point. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- commitpkg | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/commitpkg b/commitpkg index 4d5054b..bdc1fd6 100755 --- a/commitpkg +++ b/commitpkg @@ -110,9 +110,7 @@ fi if [ -n "$(svn status -q)" ]; then echo -n 'committing changes to trunk...' - msgtemplate="upgpkg: $pkgbase $(get_full_version ${epoch:-0} $pkgver $pkgrel) - - " + msgtemplate="upgpkg: $pkgbase $(get_full_version ${epoch:-0} $pkgver $pkgrel)"$'\n\n' if [ -n "$1" ]; then svn commit -q -m "${msgtemplate}${1}" || abort else -- 1.7.6

3 5

[arch-projects] [signoff] Netcfg 2.6.8-1
by Rémy Oudompheng 14 Aug '11

14 Aug '11

Hello, netcfg 2.6.8 is released. It is a bug fix release for bugs FS#25514 [1], FS#25473 [2], FS#25530 [3]. Please sign it off and move it to [core] when possible. [1] http://bugs.archlinux.org/task/25514 [2] http://bugs.archlinux.org/task/25473 [3] http://bugs.archlinux.org/task/25530 Regards, -- Rémy.

1 0

[arch-projects] [devtools] [PATCH 1/3] merge archco and communityco
by Florian Pritz 13 Aug '11

13 Aug '11

Signed-off-by: Florian Pritz <bluewind(a)xinu.at> delete mode 100755 communityco diff --git a/Makefile b/Makefile index 8772bc0..27cefba 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,6 @@ BINPROGS = \ checkpkg \ commitpkg \ archco \ - communityco \ archrelease \ archrm \ archbuild \ @@ -57,6 +56,7 @@ install: install -m0644 ${CONFIGFILES} $(DESTDIR)/usr/share/devtools for l in ${COMMITPKG_LINKS}; do ln -sf commitpkg $(DESTDIR)/usr/bin/$$l; done for l in ${ARCHBUILD_LINKS}; do ln -sf archbuild $(DESTDIR)/usr/bin/$$l; done + ln -sf archco $(DESTDIR)/usr/bin/communityco install -Dm0644 bash_completion $(DESTDIR)/etc/bash_completion.d/devtools uninstall: diff --git a/archco b/archco index 5fc9ebe..3a153a7 100755 --- a/archco +++ b/archco @@ -1,10 +1,23 @@ #!/bin/bash +scriptname=${0##*/} + if [ "$1" = '' ]; then - echo 'Usage: archco <package name> [<package name>]' + echo 'Usage: '$scriptname' <package name> [<package name>]' exit 1 fi +case $scriptname in + archco) + SVNURL="svn+ssh://gerolde.archlinux.org/srv/svn-packages";; + communityco) + SVNURL="svn+ssh://aur.archlinux.org/srv/svn-packages";; + *) + echo "error: couldn't find svn url for $scriptname" + exit 1 + ;; +esac + for i in "$@"; do - svn co svn+ssh://gerolde.archlinux.org/srv/svn-packages/$i + svn co "$SVNURL/$i" done diff --git a/communityco b/communityco deleted file mode 100755 index 0909db1..0000000 --- a/communityco +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ "$1" = '' ]; then - echo 'Usage: communityco <package name> [<package name>]' - exit 1 -fi - -for i in "$@"; do - svn co svn+ssh://aur.archlinux.org/srv/svn-packages/$i -done -- 1.7.6

2 4

[arch-projects] [devtools] [PATCH] commitpkg: Provide a commit message template
by Lukas Fleischer 13 Aug '11

13 Aug '11

Generate a message template when omitting the commit message (includes the same subject line that is used if a commit message is specified). Also, use two newlines to separate the subject line from the message body as it looks much clearer that way. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- I fully agree that this is a bit hacky. I really dislike the current behaviour of adding a header if a message is specified on the command line and not adding anything if you use an editor. If anyone can come up with a better idea - suggestions welcome! commitpkg | 21 ++++++++++++++++++--- 1 files changed, 18 insertions(+), 3 deletions(-) diff --git a/commitpkg b/commitpkg index 07b0994..be40344 100755 --- a/commitpkg +++ b/commitpkg @@ -109,11 +109,26 @@ if [ "$1" = "-a" ]; then fi echo -n 'committing changes to trunk...' +msgtemplate="upgpkg: $pkgbase $(get_full_version ${epoch:-0} $pkgver $pkgrel) + +" if [ -n "$1" ]; then - svn commit -q -m "upgpkg: $pkgbase $(get_full_version ${epoch:-0} $pkgver $pkgrel) -$1" || abort + svn commit -q -m "${msgtemplate}${1}" || abort else - svn commit -q || abort + msgfile="$(mktemp)" + echo "$msgtemplate" > "$msgfile" + if [ -n "$SVN_EDITOR" ]; then + $SVN_EDITOR "$msgfile" + elif [ -n "$VISUAL" ]; then + $VISUAL "$msgfile" + elif [ -n "$EDITOR" ]; then + $EDITOR "$msgfile" + else + vi "$msgfile" + fi + [ -s "$msgfile" ] || abort + svn commit -q -F "$msgfile" || abort + unlink "$msgfile" fi echo 'done' -- 1.7.6

2 1

[arch-projects] [INITSCRIPTS][PATCH 1/4] Let background daemons show errors on stderr
by Sebastien Luttringer 12 Aug '11

12 Aug '11

Daemon running in background should let error output to be printed. Standart output is still hided to have a correct printing in default cases. This will help to detect error in daemon runned in background. This will also remove have_daemon call which is already called in start_daemon. Signed-off-by: Sebastien Luttringer <seblu(a)seblu.net> --- functions | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/functions b/functions index f42c21e..2048450 100644 --- a/functions +++ b/functions @@ -218,7 +218,7 @@ ck_depends() { start_daemon_bkgd() { stat_bkgd "Starting $1" - have_daemon "$1" && (start_daemon "$1") &>/dev/null & + (start_daemon "$1") >/dev/null & } stop_daemon() { -- Sebastien "Seblu" Luttringer

3 5

[arch-projects] [devtools] [PATCH] Makefile: Add PREFIX support
by Lukas Fleischer 12 Aug '11

12 Aug '11

Default to "/usr/local" which should be used if you want to build devtools from sources and install without using a package manager. Use `make PREFIX=/usr install` to install to "/usr" instead. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- Do not forget to update the devtools PKGBUILD when doing the next release. Makefile | 28 +++++++++++++++------------- 1 files changed, 15 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 8772bc0..ec5b41e 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,7 @@ V=0.9.23 +PREFIX = /usr/local + BINPROGS = \ checkpkg \ commitpkg \ @@ -49,22 +51,22 @@ ARCHBUILD_LINKS = \ all: install: - install -dm0755 $(DESTDIR)/usr/bin - install -dm0755 $(DESTDIR)/usr/sbin - install -dm0755 $(DESTDIR)/usr/share/devtools - install -m0755 ${BINPROGS} $(DESTDIR)/usr/bin - install -m0755 ${SBINPROGS} $(DESTDIR)/usr/sbin - install -m0644 ${CONFIGFILES} $(DESTDIR)/usr/share/devtools - for l in ${COMMITPKG_LINKS}; do ln -sf commitpkg $(DESTDIR)/usr/bin/$$l; done - for l in ${ARCHBUILD_LINKS}; do ln -sf archbuild $(DESTDIR)/usr/bin/$$l; done + install -dm0755 $(DESTDIR)$(PREFIX)/bin + install -dm0755 $(DESTDIR)$(PREFIX)/sbin + install -dm0755 $(DESTDIR)$(PREFIX)/share/devtools + install -m0755 ${BINPROGS} $(DESTDIR)$(PREFIX)/bin + install -m0755 ${SBINPROGS} $(DESTDIR)$(PREFIX)/sbin + install -m0644 ${CONFIGFILES} $(DESTDIR)$(PREFIX)/share/devtools + for l in ${COMMITPKG_LINKS}; do ln -sf commitpkg $(DESTDIR)$(PREFIX)/bin/$$l; done + for l in ${ARCHBUILD_LINKS}; do ln -sf archbuild $(DESTDIR)$(PREFIX)/bin/$$l; done install -Dm0644 bash_completion $(DESTDIR)/etc/bash_completion.d/devtools uninstall: - for f in ${BINPROGS}; do rm -f $(DESTDIR)/usr/bin/$$f; done - for f in ${SBINPROGS}; do rm -f $(DESTDIR)/usr/sbin/$$f; done - for f in ${CONFIGFILES}; do rm -f $(DESTDIR)/usr/share/devtools/$$f; done - for l in ${COMMITPKG_LINKS}; do rm -f $(DESTDIR)/usr/bin/$$l; done - for l in ${ARCHBUILD_LINKS}; do rm -f $(DESTDIR)/usr/bin/$$l; done + for f in ${BINPROGS}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$f; done + for f in ${SBINPROGS}; do rm -f $(DESTDIR)$(PREFIX)/sbin/$$f; done + for f in ${CONFIGFILES}; do rm -f $(DESTDIR)$(PREFIX)/share/devtools/$$f; done + for l in ${COMMITPKG_LINKS}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$l; done + for l in ${ARCHBUILD_LINKS}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$l; done rm $(DESTDIR)/etc/bash_completion.d/devtools dist: -- 1.7.6

1 0

[arch-projects] [PATCH] archrelease: Fix removal of repository content
by Lukas Fleischer 12 Aug '11

12 Aug '11

Fix the `svn rm` invocation when releasing to a repository that already contains some files. `svn ls` only returns basenames, so we need to prepend the path here. Regression introduced in 8384ad849dfe308ed3e63e252785b9a6f80474f5. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- Dan broke it!!!1! archrelease | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/archrelease b/archrelease index 3d32e6f..0eb3afa 100755 --- a/archrelease +++ b/archrelease @@ -31,7 +31,7 @@ echo -n "releasing package to ${1}..." pushd .. >/dev/null if [ -d "repos/${1}" ]; then for file in $(svn ls "repos/${1}"); do - svn rm -q "$file" + svn rm -q "repos/${1}/$file" done fi if [ ! -d repos ]; then -- 1.7.6

1 0

[arch-projects] [devtools] [PATCH 0/3] commitpkg: Version control check improvements (v2)
by Lukas Fleischer 10 Aug '11

10 Aug '11

Reverted the changes to the "install"/"changelog" version control check as well as the patch merging both loops. Added proper quoting. Lukas Fleischer (3): commitpkg: Proper quoting in version control checks commitpkg: Avoid unnecessary use of grep(1) commitpkg: Use positive patterns in SVN checks commitpkg | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) -- 1.7.6

1 3

[arch-projects] [devtools] [PATCH 0/3] commitpkg: Version control check improvements
by Lukas Fleischer 10 Aug '11

10 Aug '11

Some refactoring and bug fixes to the version control checks in commitpkg. The last patch is probably the most important one. I forgot to copy the install script from another build location to the local SVN checkout a couple of times in the last few months and commitpkg never warned me about that. Lukas Fleischer (3): commitpkg: Avoid redundant use of grep(1) commitpkg: Merge version control checks commitpkg: Use positive pattern in SVN checks commitpkg | 23 +++++++---------------- 1 files changed, 7 insertions(+), 16 deletions(-) -- 1.7.6

3 9