March 2010 - Arch-dev-public - lists.archlinux.org

[arch-dev-public] [signoff] tzdata 2010e-1
by Andreas Radke 13 Mar '10

13 Mar '10

Time to change our timezones again... I skipped a few minor updates but now it's time for a new timezone pkg. Please signoff. -Andy The file... ftp://elsie.nci.nih.gov/pub/tzcode2010a.tar.gz ...is now available; this reflects the changes circulated last week on the time zone mailing list. Expect tzcode2010b.tar.gz in a week or two (to address the issues identified by kre last week). The files... ftp://elsie.nci.nih.gov/pub/tzcode2010c.tar.gz ...and... ftp://elsie.nci.nih.gov/pub/tzdata2010c.tar.gz ...are now available; these reflect the changes circulated last week on the time zone mailing list (including KRE's suggestion for earlier initialization of "goahead" and "goback" structure elements). I plan to do Samoa and Bangaladesh research this week. The file... ftp://elsie.nci.nih.gov/pub/tzdata2010d.tar.gz ...is now available; this reflects the changes circulated last week on the time zone mailing list. The file... ftp://elsie.nci.nih.gov/pub/tzdata2010e.tar.gz ...is now available; this corrects the Dhaka bug found by Danvin Ruangchan and reported on the time zone mailing list.

3 2

[arch-dev-public] [signoff] man-pages 3.24-1 (any)
by Andreas Radke 13 Mar '10

13 Mar '10

Minor update. Please signoff. -Andy http://linux-man-pages.blogspot.com/2010/02/man-pages-324-is-released.html * The addition of three pages by David Howells describing the kernel key management facility: add_key(2), request_key(2), and keyctl(2). (These pages were formerly part of the keyutils package.) * The fcntl(2) manual pages adds documention of F_SETOWN_EX and F_GETOWN_EX, which are new in Linux 2.6.32. * Minor changes to many other pages.

3 2

[arch-dev-public] [signoff] man-db 2.5.7-1
by Andreas Radke 13 Mar '10

13 Mar '10

- upstream update, see changes below - add nice/ionice support following the mlocate layout, #16518 - upstream changes should fix #17622 Please test and signoff. -Andy man-db 2.5.7 (16 February 2010) =============================== Major changes since man-db 2.5.6: Fixes: ------ o If a subprocess exits before man manages to read all the output from it, it now drains the output file descriptor rather than immediately discarding it. o If /usr/share/i18n/SUPPORTED is available, man attempts to use it to ensure that LC_CTYPE is set to an appropriate locale for the selected character set when invoking col. This fixes 'LANG=C man -E UTF-8', as used by lintian. o Don't run tests if cross-compiling. o Fix possible mandb crash when MAN_MUST_CREATE is unset. Improvements: ------------- o man can now tell nroff to disable justification if the --no-justification option is used. o If the full path to an executable is given as an argument, man will try looking up the corresponding manual page in the appropriate part of the manpath, rather than just trying to format the text of the executable as a manual page. o In the GNU manual hierarchy layout, search man<sec><ext> directories as well as just man<sec> (e.g. /usr/share/man/man3p as well as /usr/share/man/man3). o By request, man now prefers getting a page from the best manual section over getting a page in the correct language. o All programs now support a MAN_DEBUG environment variable which can be used in place of the -d/--debug option. This is useful in some situations where a program is being called deep in a process tree. o man-db now builds with heirloom-doctools, thanks to Diego Pettenò of Gentoo. o Add support for emulating pipe() with socketpair(), which is faster on some systems; thanks to Werner Fink of SUSE. o Cat pages are now always saved in UTF-8, and converted to the proper encoding at display time, which means that cat pages can now be saved regardless of locale. Note that a consequence of this is that cat pages now include formatting information (e.g. overstriking) and need to be run through col(1) before display.

3 2

[arch-dev-public] Integrity Check x86_64: core, extra, community 12-03-2010
by repomaint＠archlinux.org 12 Mar '10

12 Mar '10

================================================== = Integrity Check x86_64 of core,extra,community = ================================================== Performing integrity checks... ==> parsing pkgbuilds ==> parsing db files ==> checking mismatches ==> checking archs ==> checking dependencies ==> checking makedepends ==> checking hierarchy ==> checking for circular dependencies ==> checking for differences between db files and pkgbuilds Duplicate PKGBUILDs --------------------- /srv/abs/rsync/any/extra/namcap vs. /srv/abs/rsync/x86_64/extra/namcap Missing Dependencies ---------------------- community/airsnort --> 'wlan-ng26-utils' community/sysprof-module --> 'kernel26<2.6.' Missing Makedepends --------------------- core/dash --> 'klibc>=1.5' Repo Hierarchy for Dependencies --------------------------------- extra/pan depends on community/gmime22 (0 extra (make)deps to pull) Repo Hierarchy for Makedepends -------------------------------- core/ca-certificates depends on extra/ruby (25 extra (make)deps to pull) core/crda depends on extra/python-m2crypto (26 extra (make)deps to pull) core/e2fsprogs depends on extra/bc (0 extra (make)deps to pull) core/groff depends on extra/ghostscript (137 extra (make)deps to pull) core/groff depends on extra/netpbm (45 extra (make)deps to pull) core/groff depends on extra/psutils (138 extra (make)deps to pull) core/iputils depends on extra/docbook-xsl (26 extra (make)deps to pull) core/iputils depends on extra/libxslt (25 extra (make)deps to pull) core/iputils depends on extra/opensp (30 extra (make)deps to pull) core/sqlite3 depends on extra/tcl (0 extra (make)deps to pull) core/udev depends on extra/gobject-introspection (26 extra (make)deps to pull) core/udev depends on extra/gperf (0 extra (make)deps to pull) core/udev depends on extra/libxslt (25 extra (make)deps to pull) core/udev-compat depends on extra/gobject-introspection (26 extra (make)deps to pull) core/udev-compat depends on extra/gperf (0 extra (make)deps to pull) core/udev-compat depends on extra/libxslt (25 extra (make)deps to pull) extra/bigloo depends on community/jdk (1 extra (make)deps to pull : jre) extra/dbus-python depends on community/docutils (0 extra (make)deps to pull) extra/gnome-speech depends on community/espeak (2 extra (make)deps to pull : portaudio docutils) extra/grml-zsh-config depends on community/txt2tags (0 extra (make)deps to pull) extra/opengtl depends on community/llvm (0 extra (make)deps to pull) extra/xqf depends on community/chrpath (0 extra (make)deps to pull) Summary --------- Missing PKGBUILDs: 0 Invalid PKGBUILDs: 0 Mismatching PKGBUILD names: 0 Duplicate PKGBUILDs: 1 Invalid archs: 0 Missing (make)dependencies: 3 Repo hierarchy problems: 23 Circular dependencies: 0 In db, but not in tree: 0 In tree, but not in db: 0

1 0

[arch-dev-public] Integrity Check i686: core, extra, community 12-03-2010
by repomaint＠archlinux.org 12 Mar '10

12 Mar '10

================================================ = Integrity Check i686 of core,extra,community = ================================================ Performing integrity checks... ==> parsing pkgbuilds ==> parsing db files ==> checking mismatches ==> checking archs ==> checking dependencies ==> checking makedepends ==> checking hierarchy ==> checking for circular dependencies ==> checking for differences between db files and pkgbuilds Duplicate PKGBUILDs --------------------- /srv/abs/rsync/any/extra/namcap vs. /srv/abs/rsync/i686/extra/namcap Missing Dependencies ---------------------- community/airsnort --> 'wlan-ng26-utils' community/sysprof-module --> 'kernel26<2.6.' Missing Makedepends --------------------- core/dash --> 'klibc>=1.5' Repo Hierarchy for Dependencies --------------------------------- extra/pan depends on community/gmime22 (0 extra (make)deps to pull) Repo Hierarchy for Makedepends -------------------------------- core/ca-certificates depends on extra/ruby (25 extra (make)deps to pull) core/crda depends on extra/python-m2crypto (26 extra (make)deps to pull) core/e2fsprogs depends on extra/bc (0 extra (make)deps to pull) core/groff depends on extra/ghostscript (136 extra (make)deps to pull) core/groff depends on extra/netpbm (45 extra (make)deps to pull) core/groff depends on extra/psutils (137 extra (make)deps to pull) core/iputils depends on extra/docbook-xsl (26 extra (make)deps to pull) core/iputils depends on extra/libxslt (25 extra (make)deps to pull) core/iputils depends on extra/opensp (30 extra (make)deps to pull) core/sqlite3 depends on extra/tcl (0 extra (make)deps to pull) core/udev depends on extra/gobject-introspection (26 extra (make)deps to pull) core/udev depends on extra/gperf (0 extra (make)deps to pull) core/udev depends on extra/libxslt (25 extra (make)deps to pull) core/udev-compat depends on extra/gobject-introspection (26 extra (make)deps to pull) core/udev-compat depends on extra/gperf (0 extra (make)deps to pull) core/udev-compat depends on extra/libxslt (25 extra (make)deps to pull) extra/bigloo depends on community/jdk (1 extra (make)deps to pull : jre) extra/gnome-speech depends on community/espeak (1 extra (make)deps to pull : portaudio) extra/grml-zsh-config depends on community/txt2tags (0 extra (make)deps to pull) extra/opengtl depends on community/llvm (0 extra (make)deps to pull) extra/xqf depends on community/chrpath (0 extra (make)deps to pull) Summary --------- Missing PKGBUILDs: 0 Invalid PKGBUILDs: 0 Mismatching PKGBUILD names: 0 Duplicate PKGBUILDs: 1 Invalid archs: 0 Missing (make)dependencies: 3 Repo hierarchy problems: 22 Circular dependencies: 0 In db, but not in tree: 0 In tree, but not in db: 0

1 0

[arch-dev-public] [PATCH 4/7] Remove testing2* scripts
by Ghost1227 12 Mar '10

12 Mar '10

--- testing2community | 13 ----------- testing2community-any | 13 ----------- testing2community64 | 13 ----------- testing2core | 11 --------- testing2core-any | 13 ----------- testing2core64 | 13 ----------- testing2extra | 13 ----------- testing2extra-any | 13 ----------- testing2extra64 | 13 ----------- testing2x | 57 ------------------------------------------------- testing2x64 | 1 - 11 files changed, 0 insertions(+), 173 deletions(-) delete mode 100755 testing2community delete mode 100755 testing2community-any delete mode 100755 testing2community64 delete mode 100755 testing2core delete mode 100755 testing2core-any delete mode 100755 testing2core64 delete mode 100755 testing2extra delete mode 100755 testing2extra-any delete mode 100755 testing2extra64 delete mode 100755 testing2x delete mode 120000 testing2x64 diff --git a/testing2community b/testing2community deleted file mode 100755 index f87c927..0000000 --- a/testing2community +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -if [ $# -le 0 ]; then - echo "usage: $(basename 0) <packagename> [<packagename> [<packagename ...]]" - exit 0 -fi - -for pkg in $@; do - echo "==> Moving package '$pkg'" - $(dirname $0)/db-move "$pkg" 'community-testing' 'community' 'i686' -done - -# vim: set ts=4 sw=4 noet ft=sh: diff --git a/testing2community-any b/testing2community-any deleted file mode 100755 index c9540f7..0000000 --- a/testing2community-any +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -if [ $# -le 0 ]; then - echo "usage: $(basename 0) <packagename> [<packagename> [<packagename ...]]" - exit 0 -fi - -for pkg in $@; do - echo "==> Moving package '$pkg'" - $(dirname $0)/db-move "$pkg" 'community-testing' 'community' 'any' -done - -# vim: set ts=4 sw=4 noet ft=sh: diff --git a/testing2community64 b/testing2community64 deleted file mode 100755 index c808b3f..0000000 --- a/testing2community64 +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -if [ $# -le 0 ]; then - echo "usage: $(basename 0) <packagename> [<packagename> [<packagename ...]]" - exit 0 -fi - -for pkg in $@; do - echo "==> Moving package '$pkg'" - $(dirname $0)/db-move "$pkg" 'community-testing' 'community' 'x86_64' -done - -# vim: set ts=4 sw=4 noet ft=sh: diff --git a/testing2core b/testing2core deleted file mode 100755 index 4c53d34..0000000 --- a/testing2core +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -if [ $# -le 0 ]; then - echo "usage: $(basename 0) <packagename> [<packagename> [<packagename ...]]" - exit 0 -fi - -for pkg in $@; do - echo "==> Moving package '$pkg'" - $(dirname $0)/db-move "$pkg" 'testing' 'core' 'i686' -done diff --git a/testing2core-any b/testing2core-any deleted file mode 100755 index 56f0753..0000000 --- a/testing2core-any +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -if [ $# -le 0 ]; then - echo "usage: $(basename 0) <packagename> [<packagename> [<packagename ...]]" - exit 0 -fi - -for pkg in $@; do - echo "==> Moving package '$pkg'" - $(dirname $0)/db-move "$pkg" 'testing' 'core' 'any' -done - -# vim: set ts=4 sw=4 noet ft=sh: diff --git a/testing2core64 b/testing2core64 deleted file mode 100755 index c9420fe..0000000 --- a/testing2core64 +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -if [ $# -le 0 ]; then - echo "usage: $(basename 0) <packagename> [<packagename> [<packagename ...]]" - exit 0 -fi - -for pkg in $@; do - echo "==> Moving package '$pkg'" - $(dirname $0)/db-move "$pkg" 'testing' 'core' 'x86_64' -done - -# vim: set ts=4 sw=4 noet ft=sh: diff --git a/testing2extra b/testing2extra deleted file mode 100755 index 9b62788..0000000 --- a/testing2extra +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -if [ $# -le 0 ]; then - echo "usage: $(basename 0) <packagename> [<packagename> [<packagename ...]]" - exit 0 -fi - -for pkg in $@; do - echo "==> Moving package '$pkg'" - $(dirname $0)/db-move "$pkg" 'testing' 'extra' 'i686' -done - -# vim: set ts=4 sw=4 noet ft=sh: diff --git a/testing2extra-any b/testing2extra-any deleted file mode 100755 index 5bbee58..0000000 --- a/testing2extra-any +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -if [ $# -le 0 ]; then - echo "usage: $(basename 0) <packagename> [<packagename> [<packagename ...]]" - exit 0 -fi - -for pkg in $@; do - echo "==> Moving package '$pkg'" - $(dirname $0)/db-move "$pkg" 'testing' 'extra' 'any' -done - -# vim: set ts=4 sw=4 noet ft=sh: diff --git a/testing2extra64 b/testing2extra64 deleted file mode 100755 index 25d91f6..0000000 --- a/testing2extra64 +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -if [ $# -le 0 ]; then - echo "usage: $(basename 0) <packagename> [<packagename> [<packagename ...]]" - exit 0 -fi - -for pkg in $@; do - echo "==> Moving package '$pkg'" - $(dirname $0)/db-move "$pkg" 'testing' 'extra' 'x86_64' -done - -# vim: set ts=4 sw=4 noet ft=sh: diff --git a/testing2x b/testing2x deleted file mode 100755 index 3a60da2..0000000 --- a/testing2x +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/bash - -. "$(dirname $0)/db-functions" -. "$(dirname $0)/config" - -case "$0" in - *64) - _arch='x86_64' - ;; - *) - _arch='i686' - ;; -esac -WORKDIR="$TMPDIR/testing2x.$UID" - -cleanup() { - trap '' 0 2 - rm -rf "${WORKDIR}" - [ -n "$1" ] && exit $1 -} - -ctrl_c() { - echo 'Interrupted' >&2 - cleanup 0 -} - -trap ctrl_c 2 -trap cleanup 0 - -/bin/mkdir "${WORKDIR}" -cd "${WORKDIR}" -/usr/bin/svn checkout -N $SVNREPO checkout -cd checkout - -for pkg in $*; do - moved=0 - /usr/bin/svn up -q ${pkg} - if [ -f "${pkg}/repos/testing-${_arch}/${BUILDSCRIPT}" ]; then - for repo in core extra; do - if [ -f "${pkg}/repos/${repo}-${_arch}/${BUILDSCRIPT}" ]; then - echo "===> Moving package '${pkg}': testing-${_arch} -> ${repo}-${_arch}" - $(dirname $0)/db-move "${pkg}" "testing" "${repo}" "${_arch}" - moved=1 - break - fi - done - if [ ${moved} -eq 0 ]; then - echo "===> Warning: ${pkg} is only in testing-${_arch}, cannot determine where to move it" - fi - else - echo "===> Warning: ${pkg} is not in testing-${_arch}" - fi -done - -cleanup - -# vim: set ts=4 sw=4 noet ft=sh: diff --git a/testing2x64 b/testing2x64 deleted file mode 120000 index ff08aa7..0000000 --- a/testing2x64 +++ /dev/null @@ -1 +0,0 @@ -testing2x \ No newline at end of file -- 1.7.0.2 --

6 16

[arch-dev-public] [PATCH 2/7] Move to standardized code fmt - quotes
by Ghost1227 12 Mar '10

12 Mar '10

--- cron-jobs/adjust-permissions | 10 ++++---- cron-jobs/create-filelists | 24 ++++++++++---------- cron-jobs/devlist-mailer | 10 ++++---- cron-jobs/ftpdir-cleanup | 2 +- cron-jobs/sourceballs | 16 +++++++------- cron-jobs/sourceballs-cleanup | 6 ++-- db-community | 2 +- db-community-testing | 2 +- db-core | 2 +- db-extra | 2 +- db-functions | 20 +++++++++--------- db-move | 16 +++++++------- db-remove | 16 +++++++------- db-testing | 2 +- db-update | 44 +++++++++++++++++++------------------- misc-scripts/ftpdir-cleanup | 46 ++++++++++++++++++++-------------------- misc-scripts/make-sourceball | 8 +++--- testing2community | 2 +- testing2community-any | 2 +- testing2community64 | 2 +- testing2core | 2 +- testing2core-any | 2 +- testing2core64 | 2 +- testing2extra | 2 +- testing2extra-any | 2 +- testing2extra64 | 2 +- testing2x | 6 ++-- 27 files changed, 126 insertions(+), 126 deletions(-) diff --git a/cron-jobs/adjust-permissions b/cron-jobs/adjust-permissions index c3d71a3..6b201ca 100755 --- a/cron-jobs/adjust-permissions +++ b/cron-jobs/adjust-permissions @@ -12,15 +12,15 @@ fi get_dir_owner() { case $1 in core) - echo "ftp:ftp-arch" ;; + echo 'ftp:ftp-arch' ;; extra) - echo "ftp:ftp-extra" ;; + echo 'ftp:ftp-extra' ;; testing) - echo "ftp:ftp-extra" ;; + echo 'ftp:ftp-extra' ;; community) - echo "root:tusers" ;; + echo 'root:tusers' ;; community-testing) - echo "root:tusers" ;; + echo 'root:tusers' ;; esac } diff --git a/cron-jobs/create-filelists b/cron-jobs/create-filelists index 6bbb345..f53a65d 100755 --- a/cron-jobs/create-filelists +++ b/cron-jobs/create-filelists @@ -1,15 +1,15 @@ #!/bin/bash -reposdir="/srv/ftp" -targetdir="/srv/ftp" -repos="core extra testing community community-testing" -lock="/tmp/create-filelists.lock" +reposdir='/srv/ftp' +targetdir='/srv/ftp' +repos='core extra testing community community-testing' +lock='/tmp/create-filelists.lock' . "$(dirname $0)/../db-functions" . "$(dirname $0)/../config" if [ -f "$lock" ]; then - echo "Error: create-filelists already in progress." + echo 'Error: create-filelists already in progress.' exit 1 fi @@ -25,9 +25,9 @@ TMPDIR="$(mktemp -d /tmp/create-filelists.tmpdir.XXXXXX)" || exit 1 /usr/bin/renice +10 -p $$ > /dev/null case "${DBEXT}" in - *.gz) TAR_OPT="z" ;; - *.bz2) TAR_OPT="j" ;; - *.xz) TAR_OPT="J" ;; + *.gz) TAR_OPT='z' ;; + *.bz2) TAR_OPT='j' ;; + *.xz) TAR_OPT='J' ;; *) echo "Unknown compression type for DBEXT=${DBEXT}" && exit 1 ;; esac @@ -41,7 +41,7 @@ for repo in $repos; do cd "$reposdir" repodir="${repo}/os/${arch}" - cached="no" + cached='no' # extract package db archive if [ -f "${targetdir}/${repodir}/${REPO_DB_FILE}" ]; then @@ -58,7 +58,7 @@ for repo in $repos; do mkdir -p "${CACHEDIR}/${repodir}" # echo "extracting $FILES_DB_FILE" bsdtar -xf "${targetdir}/${repodir}/${FILES_DB_FILE}" -C "${CACHEDIR}/${repodir}" - cached="yes" + cached='yes' fi # create file lists @@ -77,12 +77,12 @@ for repo in $repos; do filename=$(grep -A1 '^%FILENAME%$' "${dbpkgdir}/desc" | tail -n1) echo '%FILES%' > "${tmppkgdir}/files" bsdtar --exclude=.* -tf "$repodir/$filename" >> "${tmppkgdir}/files" - cached="no" + cached='no' fi done # create new file archive - if [ "$cached" == "no" ]; then + if [ "$cached" == 'no' ]; then # at least one package has changed, so let's rebuild the archive # echo "creating ${FILES_DB_FILE}/${arch}" pkgdir="${targetdir}/${repodir}" diff --git a/cron-jobs/devlist-mailer b/cron-jobs/devlist-mailer index 10f8662..3d24336 100755 --- a/cron-jobs/devlist-mailer +++ b/cron-jobs/devlist-mailer @@ -2,13 +2,13 @@ #Dummy helper to send email to arch-dev # It does nothing if no output -LIST="arch-dev-public(a)archlinux.org" -#LIST="aaronmgriffin(a)gmail.com" -FROM="repomaint(a)archlinux.org" +LIST='arch-dev-public(a)archlinux.org' +#LIST='aaronmgriffin(a)gmail.com' +FROM='repomaint(a)archlinux.org' -SUBJECT="Repository Maintenance $(date +"%d-%m-%Y")" +SUBJECT="Repository Maintenance $(date +'%d-%m-%Y')" if [ $# -ge 1 ]; then - SUBJECT="$1 $(date +"%d-%m-%Y")" + SUBJECT="$1 $(date +'%d-%m-%Y')" fi if [ $# -ge 2 ]; then diff --git a/cron-jobs/ftpdir-cleanup b/cron-jobs/ftpdir-cleanup index 53fcb72..8fa8cbc 100755 --- a/cron-jobs/ftpdir-cleanup +++ b/cron-jobs/ftpdir-cleanup @@ -5,7 +5,7 @@ repos="$(get_repos_for_host)" -LOCKFILE="/tmp/.ftpdircleanup.lock" +LOCKFILE='/tmp/.ftpdircleanup.lock' cleanup () { rm -f "$LOCKFILE" diff --git a/cron-jobs/sourceballs b/cron-jobs/sourceballs index fc27114..836fc48 100755 --- a/cron-jobs/sourceballs +++ b/cron-jobs/sourceballs @@ -1,13 +1,13 @@ #!/bin/bash -ftpbase="/srv/ftp" -srcbase="/srv/ftp/sources" -repos="core extra testing" #community" +ftpbase='/srv/ftp' +srcbase='/srv/ftp/sources' +repos='core extra testing' #community' . "$(dirname $0)/../db-functions" . "$(dirname $0)/../config" -LOCKFILE="/tmp/.sourceball.lock" +LOCKFILE='/tmp/.sourceball.lock' cleanup () { rm -f "$LOCKFILE" @@ -34,10 +34,10 @@ set_umask dirname="$(/bin/readlink -f $(/usr/bin/dirname $0))" -FAILED_PKGS="" +FAILED_PKGS='' [ -e "$srcbase/errors.txt" ] && /bin/mv "$srcbase/errors.txt" "$srcbase/errors.txt.old" -echo "Errors occured during run:" > "$srcbase/errors.txt" +echo 'Errors occured during run:' > "$srcbase/errors.txt" for repo in $repos; do for arch in ${ARCHES[@]} any; do @@ -68,7 +68,7 @@ for repo in $repos; do #Use this file to 'whitelist' or force building some sourceballs, # skipping the license check - force="" + force='' if grep "^$pkgbase\$" "$dirname/sourceballs.force" >/dev/null 2>&1; then force="-f" fi @@ -85,7 +85,7 @@ done if [ -n "$FAILED_PKGS" ]; then [ -e "$srcbase/failed.txt" ] && /bin/mv "$srcbase/failed.txt" "$srcbase/failed.txt.old" - echo "The following package bases failed:" > "$srcbase/failed.txt" + echo 'The following package bases failed:' > "$srcbase/failed.txt" echo -e $FAILED_PKGS | sed "s| |\n|g" | sort -u >> "$srcbase/failed.txt" fi diff --git a/cron-jobs/sourceballs-cleanup b/cron-jobs/sourceballs-cleanup index 7c2e1ce..17a27b7 100755 --- a/cron-jobs/sourceballs-cleanup +++ b/cron-jobs/sourceballs-cleanup @@ -6,7 +6,7 @@ srcpath="$FTP_BASE/sources/" logfile="$srcpath/cleanup.txt" -LOCKFILE="/tmp/.sourceball-cleanup.lock" +LOCKFILE='/tmp/.sourceball-cleanup.lock' WORKDIR="/tmp/sourceball-cleanup.$packagename.$UID" cleanup () { @@ -17,7 +17,7 @@ cleanup () { } ctrl_c() { - echo "Interrupted" >&2 + echo 'Interrupted' >&2 cleanup 0 } @@ -40,7 +40,7 @@ set_umask cd "$WORKDIR" [ -e "$logfile" ] && /bin/mv "$logfile" "$logfile.old" -echo "Orphaned sourceballs:" > "$logfile" +echo 'Orphaned sourceballs:' > "$logfile" for sourceball in "$srcpath"/*$SRCEXT; do packagename=$(basename $sourceball) diff --git a/db-community b/db-community index 44767a5..b5c5b6a 100755 --- a/db-community +++ b/db-community @@ -1,3 +1,3 @@ #!/bin/bash -$(dirname $0)/db-update "community" +$(dirname $0)/db-update 'community' diff --git a/db-community-testing b/db-community-testing index eb4cf67..68a31a5 100755 --- a/db-community-testing +++ b/db-community-testing @@ -1,3 +1,3 @@ #!/bin/bash -$(dirname $0)/db-update "community-testing" +$(dirname $0)/db-update 'community-testing' diff --git a/db-core b/db-core index eaa5032..91fca84 100755 --- a/db-core +++ b/db-core @@ -1,3 +1,3 @@ #!/bin/bash -$(dirname $0)/db-update "core" +$(dirname $0)/db-update 'core' diff --git a/db-extra b/db-extra index d14b50e..bc5360f 100755 --- a/db-extra +++ b/db-extra @@ -1,3 +1,3 @@ #!/bin/bash -$(dirname $0)/db-update "extra" +$(dirname $0)/db-update 'extra' diff --git a/db-functions b/db-functions index 77af195..c9aed8a 100644 --- a/db-functions +++ b/db-functions @@ -1,13 +1,13 @@ #!/bin/bash # Random integrity things -[ "$UID" = "" ] && UID=$(uid) +[ "$UID" = '' ] && UID=$(uid) # Useful functions -UMASK="" +UMASK='' set_umask () { - [ "$UMASK" == "" ] && UMASK="$(umask)" + [ "$UMASK" == '' ] && UMASK="$(umask)" umask 002 } @@ -69,7 +69,7 @@ _grep_pkginfo() { getpkgbase() { local _base - _base="$(_grep_pkginfo "$1" "^pkgbase")" + _base="$(_grep_pkginfo "$1" '^pkgbase')" if [ -z "$_base" ]; then getpkgname "$1" fi @@ -81,7 +81,7 @@ getpkgbase() { getpkgname() { local _name - _name="$(_grep_pkginfo "$1" "^pkgname")" + _name="$(_grep_pkginfo "$1" '^pkgname')" if [ -z "$_name" ]; then echo "ERROR: Package '$1' has no pkgname in the PKGINFO. Fail!" >&2 exit 1 @@ -94,7 +94,7 @@ getpkgname() { getpkgver() { local _ver - _ver="$(_grep_pkginfo "$1" "^pkgver")" + _ver="$(_grep_pkginfo "$1" '^pkgver')" if [ -z "$_ver" ]; then echo "ERROR: Package '$1' has no pkgver in the PKGINFO. Fail!" >&2 exit 1 @@ -133,7 +133,7 @@ getpkgfiles() { check_pkg_arch () { #check_pkg_arch pkgfile arch local _arch - _arch="$(_grep_pkginfo "$1" "^arch")" + _arch="$(_grep_pkginfo "$1" '^arch')" if [ -z "$_arch" ]; then echo "ERROR: Package '$1' has no arch in the PKGINFO. Fail!" >&2 @@ -147,10 +147,10 @@ check_pkg_arch () { #check_pkg_arch pkgfile arch } get_repos_for_host() { - if [ "$(hostname)" = "sigurd" ]; then - echo "community community-testing" + if [ "$(hostname)" = 'sigurd' ]; then + echo 'community community-testing' else - echo "core extra testing" + echo 'core extra testing' fi } diff --git a/db-move b/db-move index 9e57046..d385f12 100755 --- a/db-move +++ b/db-move @@ -18,7 +18,7 @@ ftppath_to="$FTP_BASE/$repoto/os/" svnrepo_from="$repofrom-$_arch" svnrepo_to="$repoto-$_arch" -[ "$UID" = "" ] && UID=$(uid) +[ "$UID" = '' ] && UID=$(uid) WORKDIR="$TMPDIR/db-move.$svnrepo_from.$svnrepo_to.$UID" @@ -32,7 +32,7 @@ cleanup() { } ctrl_c() { - echo "Interrupted" >&2 + echo 'Interrupted' >&2 cleanup 0 } @@ -63,22 +63,22 @@ if [ -d "$packagebase/repos/$svnrepo_from" ]; then done if [ -d "$packagebase/repos/$svnrepo_to" ]; then - echo " Removing existing package from subversion" + echo ' Removing existing package from subversion' /usr/bin/svn rm --force -q "$packagebase/repos/$svnrepo_to" /usr/bin/svn commit -q -m "$(basename $0): $packagebase removed by $(id -un) for move to $repoto" fi - echo " Moving svn entries" + echo ' Moving svn entries' /usr/bin/svn mv -r HEAD "$packagebase/repos/$svnrepo_from" "$packagebase/repos/$svnrepo_to" /usr/bin/svn commit -m "$(basename $0): moved $packagebase from [$repofrom] to [$repoto] ($_arch)" - echo " Moving package file and updating DBs" + echo ' Moving package file and updating DBs' cd "$WORKDIR" [ -d build/ ] || mkdir build cd build/ - if [ "${_arch}" == "any" ]; then - arches="i686 x86_64" + if [ "${_arch}" == 'any' ]; then + arches='i686 x86_64' else arches="${_arch}" fi @@ -90,7 +90,7 @@ if [ -d "$packagebase/repos/$svnrepo_from" ]; then /usr/bin/repo-remove -q "$repofrom$DBEXT" ${pkgname[@]} || die "Error in repo-remove" #use '*' to move the old DB too mv $repofrom$DBEXT* "$ftppath_from/$architecture" - echo " Package files will be cleaned up automatically" + echo ' Package files will be cleaned up automatically' fi if [ -f "$ftppath_to/$architecture/$repoto$DBEXT" ]; then diff --git a/db-remove b/db-remove index 8307d4c..6ad4791 100755 --- a/db-remove +++ b/db-remove @@ -15,7 +15,7 @@ _arch="$3" ftppath="$FTP_BASE/$reponame/os" svnrepo="$reponame-$_arch" -[ "$UID" = "" ] && UID=$(uid) +[ "$UID" = '' ] && UID=$(uid) WORKDIR="$TMPDIR/db-remove.$svnrepo.$UID" @@ -28,7 +28,7 @@ cleanup() { } ctrl_c() { - echo "Interrupted" >&2 + echo 'Interrupted' >&2 cleanup 0 } @@ -53,22 +53,22 @@ cd checkout /usr/bin/svn up -q $packagebase if [ -d "$packagebase/repos/$svnrepo" ]; then - echo " Removing from subversion" + echo ' Removing from subversion' . "$packagebase/repos/$svnrepo/$BUILDSCRIPT" /usr/bin/svn rm --force -q "$packagebase/repos/$svnrepo" /usr/bin/svn commit -q -m "$(basename $0): $packagebase removed by $(id -un)" else echo " Warning: $packagebase not found in $svnrepo" - echo " Removing split packages is not supported" - echo " You need to specify each sub package instead" + echo ' Removing split packages is not supported' + echo ' You need to specify each sub package instead' pkgname=$packagebase fi cd "$WORKDIR" [ -d build/ ] || mkdir build -if [ "$_arch" == "any" ]; then - arches="i686 x86_64" +if [ "$_arch" == 'any' ]; then + arches='i686 x86_64' else arches="$_arch" fi @@ -88,7 +88,7 @@ for architecture in $arches; do /bin/mv "$reponame$DBEXT" "$ftppath/$architecture" - echo "Package files will be cleaned up automatically" + echo 'Package files will be cleaned up automatically' cd .. done cleanup diff --git a/db-testing b/db-testing index 579ae37..4c88958 100755 --- a/db-testing +++ b/db-testing @@ -1,3 +1,3 @@ #!/bin/bash -$(dirname $0)/db-update "testing" +$(dirname $0)/db-update 'testing' diff --git a/db-update b/db-update index 7bd1d64..be16499 100755 --- a/db-update +++ b/db-update @@ -9,7 +9,7 @@ fi . "$(dirname $0)/config" reponame="$1" -current_arch="" +current_arch='' # ensure we should be playing with this DB on this server repos="$(get_repos_for_host)" @@ -25,8 +25,8 @@ if [ $found -ne 1 ]; then fi WORKDIR="$TMPDIR/db-update.$reponame.$UID" -ADDPKGS="" -ANYPKGS="" +ADDPKGS='' +ANYPKGS='' stagedir="$STAGING/$reponame" if [ ! -d $stagedir ]; then @@ -35,22 +35,22 @@ if [ ! -d $stagedir ]; then fi if [ -d "${stagedir}64" ]; then - echo "--------------------------------------------------" - echo "It looks like you have an old staging dir" - echo "Packages are now differentiated by the arch in the filename." + echo '--------------------------------------------------' + echo 'It looks like you have an old staging dir' + echo 'Packages are now differentiated by the arch in the filename.' echo "Please delete '${stagedir}64'" - echo "--------------------------------------------------" + echo '--------------------------------------------------' /bin/mv "${stagedir}64/add/"* "$stagedir/add/" /bin/mv "${stagedir}64/del/"* "$stagedir/del/" fi if [ -d "${stagedir}/add" ]; then - echo "--------------------------------------------------" - echo "It looks like you have an old staging dir" - echo "The 'add' and 'del' dirs are no longer used." - echo "Please delete staging/<reponame>/{add,del}" - echo " and ensure you are using the newest devtools" - echo "--------------------------------------------------" + echo '--------------------------------------------------' + echo 'It looks like you have an old staging dir' + echo 'The 'add' and 'del' dirs are no longer used.' + echo 'Please delete staging/<reponame>/{add,del}' + echo ' and ensure you are using the newest devtools' + echo '--------------------------------------------------' /bin/mv "${stagedir}/add/"* "$stagedir/" fi @@ -62,7 +62,7 @@ cleanup() { } ctrl_c() { - echo "Interrupted" >&2 + echo 'Interrupted' >&2 cleanup 1 } @@ -101,7 +101,7 @@ if [ -n "$ANYPKGS" ]; then /usr/bin/svn checkout -N $SVNREPO checkout cd checkout - to_add_any="" + to_add_any='' for pkg in $ANYPKGS; do _pkgfile=$(basename $pkg) _pkgname="$(getpkgname $pkg)" @@ -135,7 +135,7 @@ for current_arch in ${ARCHES[@]}; do if [ ! -d "$ftppath" ]; then echo "FTP path for this repo ($reponame) is missing" echo " -> $ftppath" - echo "Please contact a system administrator" + echo 'Please contact a system administrator' exit 1 fi @@ -153,7 +153,7 @@ for current_arch in ${ARCHES[@]}; do echo "Updating DB for $svnrepo" - to_add="" + to_add='' if [ -d "$stagedir" ]; then ADDPKGS="$(getpkgfiles $stagedir/*-${current_arch}$PKGEXT 2>/dev/null)" fi @@ -202,16 +202,16 @@ for current_arch in ${ARCHES[@]}; do cd "$WORKDIR/build/" for f in $to_add $to_add_any; do /bin/cp "$f" .; done - pkgs="" + pkgs='' for pkg in $to_add $to_add_any; do pkgs="$pkgs $(basename $pkg)"; done /usr/bin/repo-add -q "$reponame$DBEXT" $pkgs else rm -f "build/$reponame$DBEXT" - echo "Errors found when adding packages" + echo 'Errors found when adding packages' fi else - echo "No packages to add" + echo 'No packages to add' fi # if non empty, move all build dirs @@ -240,11 +240,11 @@ for current_arch in ${ARCHES[@]}; do die "failed to move repository $reponame-$current_arch". fi else - echo "Nothing to copy, no work done" + echo 'Nothing to copy, no work done' fi if [ -n "$to_add" ]; then - echo "Cleaning staging dir" + echo 'Cleaning staging dir' /bin/rm $to_add fi diff --git a/misc-scripts/ftpdir-cleanup b/misc-scripts/ftpdir-cleanup index 7fedd76..da2f95b 100755 --- a/misc-scripts/ftpdir-cleanup +++ b/misc-scripts/ftpdir-cleanup @@ -23,10 +23,10 @@ for arch in ${ARCHES[@]}; do TMPDIR=$(mktemp -d /tmp/cleanup-XXXXXX) || exit 1 ftppath="$ftppath_base/$arch" - MISSINGFILES="" - DELETEFILES="" - DELETESYMLINKS="" - EXTRAFILES="" + MISSINGFILES='' + DELETEFILES='' + DELETESYMLINKS='' + EXTRAFILES='' if [ ! -d "$ftppath" ]; then echo "FTP path '$ftppath' does not exist" @@ -39,14 +39,14 @@ for arch in ${ARCHES[@]}; do fi if [ ! -f "$ftppath/$reponame$DBEXT" ]; then - echo "" + echo '' echo "ERROR: The file \"$ftppath/$reponame$DBEXT\" could not be found, aborting." - echo "" + echo '' exit 1 fi if ! bsdtar xf "$ftppath/$reponame$DBEXT"; then - echo "" + echo '' echo "ERROR: Command failed: bsdtar xf \"$ftppath/$reponame$DBEXT\"" exit 1 fi @@ -92,7 +92,7 @@ for arch in ${ARCHES[@]}; do # Do a quick check to see if a missing ARCHINDEPFILE is in the any dir # If it is, and the file is MISSING, restore it missfiles="$MISSINGFILES" - MISSINGFILES="" + MISSINGFILES='' for mf in $missfiles; do if [ -e "${ftppath_base}/any/${mf}" ]; then echo "Restoring missing 'any' symlink: ${mf}" @@ -112,33 +112,33 @@ for arch in ${ARCHES[@]}; do echo "Scan complete for $reponame ($arch) at ${ftppath}" if [ -n "$DELETEFILES" ]; then - echo " The following files are out of date" + echo ' The following files are out of date' echo " They will be moved to '$dest'" for f in $DELETEFILES; do echo " $f" done - echo "" + echo '' fi if [ -n "$DELETESYMLINKS" ]; then - echo " The following symlinks are out of date" - echo " They will be deleted" + echo ' The following symlinks are out of date' + echo ' They will be deleted' for f in $DELETESYMLINKS; do echo " $f" done - echo "" + echo '' fi if [ -n "$MISSINGFILES" ]; then - echo " The following files are missing in the repo" + echo ' The following files are missing in the repo' for f in $MISSINGFILES; do echo " $f" done - echo "" + echo '' fi if [ -n "$EXTRAFILES" ]; then - echo " The following files are in the repo but not the db" + echo ' The following files are in the repo but not the db' echo " They will be moved to '$dest'" for f in $EXTRAFILES; do echo " $f" @@ -147,22 +147,22 @@ for arch in ${ARCHES[@]}; do if [ -n "${DELETEFILES}" ]; then ${CLEANUP_DRYRUN} || mv ${DELETEFILES} "$dest" - echo "" + echo '' fi if [ -n "${DELETESYMLINKS}" ]; then ${CLEANUP_DRYRUN} || rm -f ${DELETESYMLINKS} - echo "" + echo '' fi if [ -n "${EXTRAFILES}" ]; then ${CLEANUP_DRYRUN} || mv ${EXTRAFILES} "$dest" - echo "" + echo '' fi done -ARCHINDEPFILES="" +ARCHINDEPFILES='' if [ -d "$ftppath_base/any" ]; then cd "$ftppath_base/any" @@ -184,8 +184,8 @@ if [ -d "$ftppath_base/any" ]; then fi if [ -n "$ARCHINDEPFILES" ]; then - echo " The following architecture independent packages" - echo " are not symlinked in the architecture repositories." + echo ' The following architecture independent packages' + echo ' are not symlinked in the architecture repositories.' echo " They will be moved to '$dest'" for f in $ARCHINDEPFILES; do echo " $f" @@ -195,7 +195,7 @@ fi if [ -d "$ftppath_base/any" -a -n "${ARCHINDEPFILES}" ]; then cd "$ftppath_base/any" ${CLEANUP_DRYRUN} || mv ${ARCHINDEPFILES} "$dest" - echo "" + echo '' fi # vim: set ts=4 sw=4 noet ft=sh: diff --git a/misc-scripts/make-sourceball b/misc-scripts/make-sourceball index fca6ac4..9e62c06 100755 --- a/misc-scripts/make-sourceball +++ b/misc-scripts/make-sourceball @@ -2,7 +2,7 @@ if [ $# -ne 3 -a $# -ne 4 ]; then echo "usage: $(basename $0) [-f] <packagename> <repo> <arch>" - echo " -f Force building. Skip license checks" + echo ' -f Force building. Skip license checks' exit 1 fi @@ -20,7 +20,7 @@ reponame="$2" _arch="$3" srcpath="$FTP_BASE/sources/" -logpath="/var/log/sourceballs/" +logpath='/var/log/sourceballs/' WORKDIR="/tmp/make-sourceball.$packagename.$UID" @@ -31,7 +31,7 @@ cleanup() { } ctrl_c() { - echo "Interrupted" >&2 + echo 'Interrupted' >&2 cleanup 0 } @@ -97,7 +97,7 @@ create_srcpackage() { remove_old() { if [ -d "$1" ]; then pushd "$1" >/dev/null - PKGVERS="" + PKGVERS='' for repo in *; do cd "$repo" . "$BUILDSCRIPT" diff --git a/testing2community b/testing2community index b8de926..f87c927 100755 --- a/testing2community +++ b/testing2community @@ -7,7 +7,7 @@ fi for pkg in $@; do echo "==> Moving package '$pkg'" - $(dirname $0)/db-move "$pkg" "community-testing" "community" "i686" + $(dirname $0)/db-move "$pkg" 'community-testing' 'community' 'i686' done # vim: set ts=4 sw=4 noet ft=sh: diff --git a/testing2community-any b/testing2community-any index 83153dc..c9540f7 100755 --- a/testing2community-any +++ b/testing2community-any @@ -7,7 +7,7 @@ fi for pkg in $@; do echo "==> Moving package '$pkg'" - $(dirname $0)/db-move "$pkg" "community-testing" "community" "any" + $(dirname $0)/db-move "$pkg" 'community-testing' 'community' 'any' done # vim: set ts=4 sw=4 noet ft=sh: diff --git a/testing2community64 b/testing2community64 index d0d6dd3..c808b3f 100755 --- a/testing2community64 +++ b/testing2community64 @@ -7,7 +7,7 @@ fi for pkg in $@; do echo "==> Moving package '$pkg'" - $(dirname $0)/db-move "$pkg" "community-testing" "community" "x86_64" + $(dirname $0)/db-move "$pkg" 'community-testing' 'community' 'x86_64' done # vim: set ts=4 sw=4 noet ft=sh: diff --git a/testing2core b/testing2core index 5f6088a..4c53d34 100755 --- a/testing2core +++ b/testing2core @@ -7,5 +7,5 @@ fi for pkg in $@; do echo "==> Moving package '$pkg'" - $(dirname $0)/db-move "$pkg" "testing" "core" "i686" + $(dirname $0)/db-move "$pkg" 'testing' 'core' 'i686' done diff --git a/testing2core-any b/testing2core-any index 4e362ad..56f0753 100755 --- a/testing2core-any +++ b/testing2core-any @@ -7,7 +7,7 @@ fi for pkg in $@; do echo "==> Moving package '$pkg'" - $(dirname $0)/db-move "$pkg" "testing" "core" "any" + $(dirname $0)/db-move "$pkg" 'testing' 'core' 'any' done # vim: set ts=4 sw=4 noet ft=sh: diff --git a/testing2core64 b/testing2core64 index f307413..c9420fe 100755 --- a/testing2core64 +++ b/testing2core64 @@ -7,7 +7,7 @@ fi for pkg in $@; do echo "==> Moving package '$pkg'" - $(dirname $0)/db-move "$pkg" "testing" "core" "x86_64" + $(dirname $0)/db-move "$pkg" 'testing' 'core' 'x86_64' done # vim: set ts=4 sw=4 noet ft=sh: diff --git a/testing2extra b/testing2extra index 12795b4..9b62788 100755 --- a/testing2extra +++ b/testing2extra @@ -7,7 +7,7 @@ fi for pkg in $@; do echo "==> Moving package '$pkg'" - $(dirname $0)/db-move "$pkg" "testing" "extra" "i686" + $(dirname $0)/db-move "$pkg" 'testing' 'extra' 'i686' done # vim: set ts=4 sw=4 noet ft=sh: diff --git a/testing2extra-any b/testing2extra-any index 2455381..5bbee58 100755 --- a/testing2extra-any +++ b/testing2extra-any @@ -7,7 +7,7 @@ fi for pkg in $@; do echo "==> Moving package '$pkg'" - $(dirname $0)/db-move "$pkg" "testing" "extra" "any" + $(dirname $0)/db-move "$pkg" 'testing' 'extra' 'any' done # vim: set ts=4 sw=4 noet ft=sh: diff --git a/testing2extra64 b/testing2extra64 index b555210..25d91f6 100755 --- a/testing2extra64 +++ b/testing2extra64 @@ -7,7 +7,7 @@ fi for pkg in $@; do echo "==> Moving package '$pkg'" - $(dirname $0)/db-move "$pkg" "testing" "extra" "x86_64" + $(dirname $0)/db-move "$pkg" 'testing' 'extra' 'x86_64' done # vim: set ts=4 sw=4 noet ft=sh: diff --git a/testing2x b/testing2x index 7720033..3a60da2 100755 --- a/testing2x +++ b/testing2x @@ -5,10 +5,10 @@ case "$0" in *64) - _arch="x86_64" + _arch='x86_64' ;; *) - _arch="i686" + _arch='i686' ;; esac WORKDIR="$TMPDIR/testing2x.$UID" @@ -20,7 +20,7 @@ cleanup() { } ctrl_c() { - echo "Interrupted" >&2 + echo 'Interrupted' >&2 cleanup 0 } -- 1.7.0.2 --

5 6

[arch-dev-public] [PATCH 3/7] Update db-move to support multiple pkgs
by Ghost1227 11 Mar '10

11 Mar '10

--- db-move | 142 +++++++++++++++++++++++++++++++++------------------------------ 1 files changed, 74 insertions(+), 68 deletions(-) diff --git a/db-move b/db-move index d385f12..04ce7ca 100755 --- a/db-move +++ b/db-move @@ -8,10 +8,12 @@ fi . "$(dirname $0)/db-functions" . "$(dirname $0)/config" -packagebase="$1" -repofrom="$2" -repoto="$3" -_arch="$4" +#Parse off args from the BACK of the list +# this adds support for multiple package names +args=($@) +_arch="${args[${#args[@]}-1]}" && unset args[${#args[@]}-1] +repoto="${args[${#args[@]}-1]}" && unset args[${#args[@]}-1] +repofrom="${args[${#args[@]}-1]}" && unset args[${#args[@]}-1] ftppath_from="$FTP_BASE/$repofrom/os/" ftppath_to="$FTP_BASE/$repoto/os/" @@ -41,85 +43,89 @@ die() { cleanup 1 } -trap ctrl_c 2 -trap cleanup 0 +for pkgbase in ${args[@]}; do + echo "==> Moving package '$pkgbase'" -repo_lock $repoto $_arch -repo_lock $repofrom $_arch + trap ctrl_c 2 + trap cleanup 0 -/bin/mkdir -p "$WORKDIR" + repo_lock $repoto $_arch + repo_lock $repofrom $_arch -cd "$WORKDIR" -/usr/bin/svn checkout -N $SVNREPO checkout -cd checkout + /bin/mkdir -p "$WORKDIR" -/usr/bin/svn up -q $packagebase -if [ -d "$packagebase/repos/$svnrepo_from" ]; then - . "$packagebase/repos/$svnrepo_from/$BUILDSCRIPT" + cd "$WORKDIR" + /usr/bin/svn checkout -N $SVNREPO checkout + cd checkout - for i in ${pkgname[@]}; do - _pkgfile="$i-$pkgver-$pkgrel-$_arch$PKGEXT" - getpkgfile "$ftppath_from/${_arch}/"$_pkgfile >/dev/null - done + /usr/bin/svn up -q $packagebase + if [ -d "$packagebase/repos/$svnrepo_from" ]; then + . "$packagebase/repos/$svnrepo_from/$BUILDSCRIPT" - if [ -d "$packagebase/repos/$svnrepo_to" ]; then - echo ' Removing existing package from subversion' - /usr/bin/svn rm --force -q "$packagebase/repos/$svnrepo_to" - /usr/bin/svn commit -q -m "$(basename $0): $packagebase removed by $(id -un) for move to $repoto" - fi + for i in ${pkgname[@]}; do + _pkgfile="$i-$pkgver-$pkgrel-$_arch$PKGEXT" + getpkgfile "$ftppath_from/${_arch}/"$_pkgfile >/dev/null + done - echo ' Moving svn entries' - /usr/bin/svn mv -r HEAD "$packagebase/repos/$svnrepo_from" "$packagebase/repos/$svnrepo_to" - /usr/bin/svn commit -m "$(basename $0): moved $packagebase from [$repofrom] to [$repoto] ($_arch)" + if [ -d "$packagebase/repos/$svnrepo_to" ]; then + echo ' Removing existing package from subversion' + /usr/bin/svn rm --force -q "$packagebase/repos/$svnrepo_to" + /usr/bin/svn commit -q -m "$(basename $0): $packagebase removed by $(id -un) for move to $repoto" + fi - echo ' Moving package file and updating DBs' - cd "$WORKDIR" - [ -d build/ ] || mkdir build - cd build/ + echo ' Moving svn entries' + /usr/bin/svn mv -r HEAD "$packagebase/repos/$svnrepo_from" "$packagebase/repos/$svnrepo_to" + /usr/bin/svn commit -m "$(basename $0): moved $packagebase from [$repofrom] to [$repoto] ($_arch)" - if [ "${_arch}" == 'any' ]; then - arches='i686 x86_64' - else - arches="${_arch}" - fi + echo ' Moving package file and updating DBs' + cd "$WORKDIR" + [ -d build/ ] || mkdir build + cd build/ - for architecture in $arches; do - # copy the db file into our working area - if [ -f "$ftppath_from/$architecture/$repofrom$DBEXT" ]; then - /bin/cp "$ftppath_from/$architecture/$repofrom$DBEXT" . - /usr/bin/repo-remove -q "$repofrom$DBEXT" ${pkgname[@]} || die "Error in repo-remove" - #use '*' to move the old DB too - mv $repofrom$DBEXT* "$ftppath_from/$architecture" - echo ' Package files will be cleaned up automatically' + if [ "${_arch}" == 'any' ]; then + arches='i686 x86_64' + else + arches="${_arch}" fi - if [ -f "$ftppath_to/$architecture/$repoto$DBEXT" ]; then - /bin/cp "$ftppath_to/$architecture/$repoto$DBEXT" . - fi + for architecture in $arches; do + # copy the db file into our working area + if [ -f "$ftppath_from/$architecture/$repofrom$DBEXT" ]; then + /bin/cp "$ftppath_from/$architecture/$repofrom$DBEXT" . + /usr/bin/repo-remove -q "$repofrom$DBEXT" ${pkgname[@]} || die "Error in repo-remove" + #use '*' to move the old DB too + mv $repofrom$DBEXT* "$ftppath_from/$architecture" + echo ' Package files will be cleaned up automatically' + fi - for i in ${pkgname[@]}; do - _pkgfile="$i-$pkgver-$pkgrel-$_arch$PKGEXT" - _cpkgfile=$(getpkgfile "$ftppath_from/$architecture/"$_pkgfile) - [ $? -gt 0 ] && die - /bin/cp $_cpkgfile . - /usr/bin/repo-add -q "$repoto$DBEXT" $_pkgfile || die "Error in repo-add $_pkgfile" - done - #use '*' to move the old DB too - mv $repoto$DBEXT* $ftppath_to/$architecture - for i in ${pkgname[@]}; do - _pkgfile=$(getpkgfile "$i-$pkgver-$pkgrel-$_arch"$PKGEXT) - [ $? -gt 0 ] && die - if [ "${_arch}" == "any" ]; then - mv ${_pkgfile} $ftppath_to/any - ln -s ../any/${_pkgfile} $ftppath_to/$architecture/ - else - mv ${_pkgfile} $ftppath_to/$architecture + if [ -f "$ftppath_to/$architecture/$repoto$DBEXT" ]; then + /bin/cp "$ftppath_to/$architecture/$repoto$DBEXT" . fi + + for i in ${pkgname[@]}; do + _pkgfile="$i-$pkgver-$pkgrel-$_arch$PKGEXT" + _cpkgfile=$(getpkgfile "$ftppath_from/$architecture/"$_pkgfile) + [ $? -gt 0 ] && die + /bin/cp $_cpkgfile . + /usr/bin/repo-add -q "$repoto$DBEXT" $_pkgfile || die "Error in repo-add $_pkgfile" + done + #use '*' to move the old DB too + mv $repoto$DBEXT* $ftppath_to/$architecture + for i in ${pkgname[@]}; do + _pkgfile=$(getpkgfile "$i-$pkgver-$pkgrel-$_arch"$PKGEXT) + [ $? -gt 0 ] && die + if [ "${_arch}" == "any" ]; then + mv ${_pkgfile} $ftppath_to/any + ln -s ../any/${_pkgfile} $ftppath_to/$architecture/ + else + mv ${_pkgfile} $ftppath_to/$architecture + fi + done done - done -else - die "Error: $packagebase is not in repo $repofrom" -fi + else + die "Error: $packagebase is not in repo $repofrom" + fi +done cleanup -- 1.7.0.2

3 2

[arch-dev-public] [PATCH 6/7] Remove FTP_OS_SUFFIX variable
by Ghost1227 11 Mar '10

11 Mar '10

--- config | 1 - misc-scripts/ftpdir-cleanup | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/config b/config index a563f35..57ae64b 100644 --- a/config +++ b/config @@ -1,6 +1,5 @@ FTP_BASE="/srv/ftp" -FTP_OS_SUFFIX="os" SVNREPO="file:///srv/svn-packages" diff --git a/misc-scripts/ftpdir-cleanup b/misc-scripts/ftpdir-cleanup index da2f95b..d35b511 100755 --- a/misc-scripts/ftpdir-cleanup +++ b/misc-scripts/ftpdir-cleanup @@ -15,7 +15,7 @@ dest=$2 ${CLEANUP_DRYRUN} && echo 'dry run mode is active' -ftppath_base="$FTP_BASE/$reponame/$FTP_OS_SUFFIX" +ftppath_base="$FTP_BASE/$reponame/os" for arch in ${ARCHES[@]}; do -- 1.7.0.2 --

3 3

[arch-dev-public] [PATCH 7/7] Change ftpdir-cleanup scripts for package pooling
by Ghost1227 11 Mar '10

11 Mar '10

--- cron-jobs/ftpdir-cleanup | 33 +++++++++++++++++++++++++++++++++ misc-scripts/ftpdir-cleanup | 12 ++++-------- 2 files changed, 37 insertions(+), 8 deletions(-) diff --git a/cron-jobs/ftpdir-cleanup b/cron-jobs/ftpdir-cleanup index 8fa8cbc..c21c9d3 100755 --- a/cron-jobs/ftpdir-cleanup +++ b/cron-jobs/ftpdir-cleanup @@ -34,6 +34,39 @@ for repo in $repos; do $(dirname $0)/../misc-scripts/ftpdir-cleanup $repo $CLEANUP_DESTDIR done +to_cleanup='' +for _arch in ${ARCHES[@]}; do + poolpath="$FTP_BASE/packages/os/$_arch/" + cd $poolpath + for pkg in *$PKGEXT; do + [ -f "$pkg" ] || continue # in case we get a file named "*.pkg.tar.gz" + LINKS="$(/bin/ls $FTP_BASE/*/os/$_arch/$pkg 2>/dev/null)" + if [ -n "$LINKS" ]; then + found=0 + for lnk in $LINKS; do + if [ -h "$lnk" ]; then + found=1 + break + fi + done + # No links found, clean it up + if [ $found -eq 0 ]; then + to_cleanup="$to_cleanup $poolpath/$pkg" + fi + fi + done +done + +if [ -n "$to_cleanup" ]; then + echo ' The following packages are no longer in any repo' + echo " They will be moved to $CLEANUP_DESTDIR" + for f in $to_cleanup; do + echo " $(basename "$f")" + done + echo '' + mv "$f" "$CLEANUP_DESTDIR" +fi + cleanup # vim: set ts=4 sw=4 noet ft=sh: diff --git a/misc-scripts/ftpdir-cleanup b/misc-scripts/ftpdir-cleanup index d35b511..109b4c8 100755 --- a/misc-scripts/ftpdir-cleanup +++ b/misc-scripts/ftpdir-cleanup @@ -1,12 +1,11 @@ #!/bin/bash if [ $# -ne 2 ]; then - echo "usage: $(basename $0) <reponame> <dest-dir>" + echo "usage: $(basename $0) <reponame>" exit 1 fi reponame=$1 -dest=$2 ############################################################ @@ -113,7 +112,6 @@ for arch in ${ARCHES[@]}; do if [ -n "$DELETEFILES" ]; then echo ' The following files are out of date' - echo " They will be moved to '$dest'" for f in $DELETEFILES; do echo " $f" done @@ -139,14 +137,13 @@ for arch in ${ARCHES[@]}; do if [ -n "$EXTRAFILES" ]; then echo ' The following files are in the repo but not the db' - echo " They will be moved to '$dest'" for f in $EXTRAFILES; do echo " $f" done fi if [ -n "${DELETEFILES}" ]; then - ${CLEANUP_DRYRUN} || mv ${DELETEFILES} "$dest" + ${CLEANUP_DRYRUN} || rm -f ${DELETEFILES} echo '' fi @@ -156,7 +153,7 @@ for arch in ${ARCHES[@]}; do fi if [ -n "${EXTRAFILES}" ]; then - ${CLEANUP_DRYRUN} || mv ${EXTRAFILES} "$dest" + ${CLEANUP_DRYRUN} || rm -f ${EXTRAFILES} echo '' fi @@ -186,7 +183,6 @@ fi if [ -n "$ARCHINDEPFILES" ]; then echo ' The following architecture independent packages' echo ' are not symlinked in the architecture repositories.' - echo " They will be moved to '$dest'" for f in $ARCHINDEPFILES; do echo " $f" done @@ -194,7 +190,7 @@ fi if [ -d "$ftppath_base/any" -a -n "${ARCHINDEPFILES}" ]; then cd "$ftppath_base/any" - ${CLEANUP_DRYRUN} || mv ${ARCHINDEPFILES} "$dest" + ${CLEANUP_DRYRUN} || rm -f ${ARCHINDEPFILES} echo '' fi -- 1.7.0.2

2 1