[pkgsrc/pkgsrc-2006Q3]: pkgsrc/mk/bulk Pullup ticket 1950 - requested by rillig

[salo <salo%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7a9b12e47b9a
branches:  pkgsrc-2006Q3
changeset: 519242:7a9b12e47b9a
user:      salo <salo%pkgsrc.org@localhost>
date:      Sat Dec 09 08:15:22 2006 +0000

description:
Pullup ticket 1950 - requested by rillig
bulk build upload script fix

Revisions pulled up:
- pkgsrc/mk/bulk/upload                         1.35

   Module Name:         pkgsrc
   Committed By:        rillig
   Date:                Thu Dec  7 23:31:48 UTC 2006

   Modified Files:
        pkgsrc/mk/bulk: upload

   Log Message:
   Due to a misunderstanding of mine, preventing to upload restricted
   binary packages has not worked in the last few months. Now I fixed the
   rsync command line to use --files-from instead of --include-from, which
   does the right thing.

   Tested in a directory of about 20 binary packages, including one that is
   restricted. Everything worked as expected.

   Fixes PR 35199.

diffstat:

 mk/bulk/upload |  11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diffs (40 lines):

diff -r 50a9687f4f37 -r 7a9b12e47b9a mk/bulk/upload
--- a/mk/bulk/upload    Thu Dec 07 15:01:46 2006 +0000
+++ b/mk/bulk/upload    Sat Dec 09 08:15:22 2006 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: upload,v 1.34 2006/08/10 17:58:10 rillig Exp $
+# $NetBSD: upload,v 1.34.2.1 2006/12/09 08:15:22 salo Exp $
 
 #
 # Upload non-restricted binary pkgs to ftp server
@@ -187,6 +187,7 @@
 restricted_packages="$TMP/restricted_packages"
 old_packages="$TMP/old_packages"
 good_packages="$TMP/regular_packages"
+all_good_packages="$TMP/all_regular_packages"
 
 upload_general="$TMP"/upload_general
 upload_vulnerable="$TMP"/upload_vulnerable
@@ -235,6 +236,12 @@
 echo "upload> Checking for restricted and vulnerable packages"
 (cd All && env PKG_INFO="${pkg_info}" OUTDIR="${TMP}" PKGVULNDIR="${distdir}" sh "${pkgsrcdir}/mk/bulk/sort-packages")
 
+# Add the name of the package file, including all its symlinks to the
+# list of files to be uploaded.
+while read package; do
+       ls -1 */"$package"
+done < "$good_packages" > "$all_good_packages"
+
 if [ "${MKSUMS}" = "yes" -o "${MKSUMS}" = "YES" ]; then
 
        echo "upload> Calculating checksum files..."
@@ -295,7 +302,7 @@
 #! /bin/sh
 set -e
 cd "$packages"
-rsync $RSFLAGS --include-from="${good_packages}" --exclude-from="${old_packages}" . "$RSYNC_DST/"
+rsync $RSFLAGS --files-from="${all_good_packages}" --exclude-from="${old_packages}" . "$RSYNC_DST/"
 EOF
 chmod +x "$upload_general"