Skip to contentSkip to conversation

core/download fix local backend

PATCH New Yann E. MORIN 2 participants 2 messages Apr 4, 2018 – Apr 6, 2018

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 core/download fix local backend

Since c8ef0c03b0b (download: put most of the infra in dl-wrapper), the backend for local files is now named after the scheme, which is 'file' for a local file.

From the same commit on, the directory part and the basename are now passed separately, to let the backend reconstruct the full path when it needs to do so, which is the case for the 'file' backend too.

Finaly, ff559846fdc1 (support/download: Add support to pass options directly to downloaders) introduced a nasty error, as it made use of "${@}" when calling its internal function. Revert that mess now...

Cc Maxime Hadjinlian <[email protected]>
Cc Peter Korsgaard <[email protected]>
Cc Thomas Petazzoni <[email protected]>
Cc Arnout Vandecappelle <[email protected]>

---
Changes v2 -> v3:
- drop spurious "${@}"

Changes v1 -> v2:
- really fix it now: filename passed as other option

---
 support/download/{cp => file} | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
 rename support/download/{cp => file} (83%)
support/download/file renamed from support/download/cp +6 -3
similarity index 83%
rename from support/download/cp
rename to support/download/file
index 52fe2de83d..fefd6d271c 100755
@@ -2,13 +2,15 @@
 
 # We want to catch any unexpected failure, and exit immediately
 set -e
+set -x
 
 # Download helper for cp, to be called from the download wrapper script
 #
 # Options:
 #   -q          Be quiet.
 #   -o FILE     Copy to file FILE.
-#   -u FILE     Copy from file FILE.
+#   -f FILE     Copy from basename file FILE.
+#   -u DIR      Copy from FILE in DIR.
 #
 # Environment:
 #   LOCALFILES: the cp command to call
@@ -23,7 +25,8 @@ while getopts "${BR_BACKEND_DL_GETOPTS}" OPT; do
     case "${OPT}" in
     q)  verbose=;;
     o)  output="${OPTARG}";;
-    u)  source="${OPTARG}";;
+    f)  file="${OPTARG}";;
+    u)  dir="${OPTARG}";;
     :)  printf "option '%s' expects a mandatory argument\n" "${OPTARG}"; exit 1;;
     \?) printf "unknown option '%s'\n" "${OPTARG}" >&2; exit 1;;
     esac
@@ -37,4 +40,4 @@ _localfiles() {
     eval ${LOCALFILES} "${@}"
 }
 
-_localfiles ${verbose} "${@}""'${source}'" "'${output}'"
+_localfiles ${verbose} "'${dir}${file}'" "'${output}'"
Signature · 1 line
2.14.1
#1 lore raw

PATCH v3 1/1 core/download fix local backend

Quoted 20 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Yann" == Yann E MORIN <[email protected]> writes:

Since c8ef0c03b0b (download: put most of the infra in dl-wrapper), the backend for local files is now named after the scheme, which is 'file' for a local file.

From the same commit on, the directory part and the basename are now passed separately, to let the backend reconstruct the full path when it needs to do so, which is the case for the 'file' backend too.

Finaly, ff559846fdc1 (support/download: Add support to pass options directly to downloaders) introduced a nasty error, as it made use of "${@}" when calling its internal function. Revert that mess now...

Cc Maxime Hadjinlian <[email protected]>
Cc Peter Korsgaard <[email protected]>
Cc Thomas Petazzoni <[email protected]>
Cc Arnout Vandecappelle <[email protected]>
Quoted 6 lines

---
Changes v2 -> v3:
- drop spurious "${@}"

Changes v1 -> v2:
- really fix it now: filename passed as other option

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard