diff options
| author | cperciva <cperciva@FreeBSD.org> | 2005-08-09 02:50:14 +0000 |
|---|---|---|
| committer | cperciva <cperciva@FreeBSD.org> | 2005-08-09 02:50:14 +0000 |
| commit | 98677d0cbe01a5d4581c6cc392bf3b353d9053d1 (patch) | |
| tree | be01fe0e830baa921cc13c2285983983091969b0 /usr.sbin/portsnap | |
| parent | 871cf7b33c81323ad25d44edcd68beb463c02b17 (diff) | |
| download | FreeBSD-src-98677d0cbe01a5d4581c6cc392bf3b353d9053d1.zip FreeBSD-src-98677d0cbe01a5d4581c6cc392bf3b353d9053d1.tar.gz | |
Add a missing EOL when printing "Latest snapshot on server is older
than what we already have" message. [1]
When operating with the undocumented --debug option, replace "xargs
phttpget" with "xargs -t phttpget", since that might conceivably help
debugging.
Noticed by: simon [1]
Diffstat (limited to 'usr.sbin/portsnap')
| -rw-r--r-- | usr.sbin/portsnap/portsnap/portsnap.sh | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/usr.sbin/portsnap/portsnap/portsnap.sh b/usr.sbin/portsnap/portsnap/portsnap.sh index d73965b..2b48385 100644 --- a/usr.sbin/portsnap/portsnap/portsnap.sh +++ b/usr.sbin/portsnap/portsnap/portsnap.sh @@ -75,6 +75,7 @@ init_params() { QUIETREDIR="" QUIETFLAG="" STATSREDIR="" + XARGST="" NDEBUG="" DDSTATS="" INDEXONLY="" @@ -95,6 +96,7 @@ parse_cmdline() { STATSREDIR="/dev/stderr" QUIETFLAG=" " NDEBUG=" " + XARGST="-t" DDSTATS=".." ;; -f) @@ -435,7 +437,7 @@ fetch_update_tagsanity() { echo "older than what we already have!" echo -n "Cowardly refusing to downgrade from " date -r ${OLDSNAPSHOTDATE} - echo -n "to `date -r ${SNAPSHOTDATE}`." + echo "to `date -r ${SNAPSHOTDATE}`." return 1 fi } @@ -612,7 +614,7 @@ fetch_update() { echo ${NDEBUG} "metadata patches.${DDSTATS}" tr '|' '-' < patchlist | lam -s "tp/" - -s ".gz" | - xargs ${PHTTPGET} ${SERVERNAME} \ + xargs ${XARGST} ${PHTTPGET} ${SERVERNAME} \ 2>${STATSREDIR} | fetch_progress echo "done." @@ -646,7 +648,7 @@ fetch_update() { echo -n "Fetching `wc -l < filelist | tr -d ' '` " echo ${NDEBUG} "metadata files... " lam -s "f/" - -s ".gz" < filelist | - xargs ${PHTTPGET} ${SERVERNAME} \ + xargs ${XARGST} ${PHTTPGET} ${SERVERNAME} \ 2>${QUIETREDIR} while read Y; do @@ -672,7 +674,7 @@ fetch_update() { echo -n "Fetching `wc -l < patchlist | tr -d ' '` " echo ${NDEBUG} "patches.${DDSTATS}" tr '|' '-' < patchlist | lam -s "bp/" - | - xargs ${PHTTPGET} ${SERVERNAME} \ + xargs ${XARGST} ${PHTTPGET} ${SERVERNAME} \ 2>${STATSREDIR} | fetch_progress echo "done." @@ -703,7 +705,7 @@ fetch_update() { echo -n "Fetching `wc -l < filelist | tr -d ' '` " echo ${NDEBUG} "new ports or files... " lam -s "f/" - -s ".gz" < filelist | - xargs ${PHTTPGET} ${SERVERNAME} \ + xargs ${XARGST} ${PHTTPGET} ${SERVERNAME} \ 2>${QUIETREDIR} while read Y; do |
