Skip to contentSkip to conversation

dl-wrapper: Fix urlencode option never being sent to backend

PATCH New Damien Thébault 4 participants 7 messages Dec 7, 2018 – Dec 16, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 dl-wrapper: Fix urlencode option never being sent to backend

The urlencode parameter is lost in dl-wrapper, because we try to get it from backend instead of backend_urlencode.

We must get the urlencode information from backend_urlencode.

---
 support/download/dl-wrapper | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
support/download/dl-wrapper +1 -1
index bb70c98253..3315bd410e 100755
@@ -93,7 +93,7 @@ main() {
         esac
         uri=${uri#*+}
 
-        urlencode=${backend#*|}
+        urlencode=${backend_urlencode#*|}
         # urlencode must be "urlencode"
         [ "${urlencode}" != "urlencode" ] && urlencode=""
 
Signature · 1 line
2.19.1
#1 lore raw

PATCH 1/1 dl-wrapper: Fix urlencode option never being sent to backend

Damien, All,

On 2018-12-07 12:41 +0000, Damien Th?bault spake thusly:

Quoted 4 lines

The urlencode parameter is lost in dl-wrapper, because we try to get it from backend instead of backend_urlencode.

We must get the urlencode information from backend_urlencode.

What is this trying to fix, actually? We have no download issue in the autobuilders, as far as I can see... Do you have a test-case to share?

But true, this is incorrect, and was broken by commit 38de434123 (download: fix file:// BR2_PRIMARY_SITE (download cache)).

Regards,
Yann E. MORIN.

Quoted 24 lines
---
 support/download/dl-wrapper | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
support/download/dl-wrapper +1 -1
index bb70c98253..3315bd410e 100755
@@ -93,7 +93,7 @@ main() {
         esac
         uri=${uri#*+}
 
-        urlencode=${backend#*|}
+        urlencode=${backend_urlencode#*|}
         # urlencode must be "urlencode"
         [ "${urlencode}" != "urlencode" ] && urlencode=""
 
Signature · 5 lines
2.19.1
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#2 lore raw

PATCH 1/1 dl-wrapper: Fix urlencode option never being sent to backend

Quoted 10 lines · Yann E. MORIN

On 2018-12-07 12:41 +0000, Damien Th?bault spake thusly:

Quoted 5 lines

The urlencode parameter is lost in dl-wrapper, because we try to get it
from backend instead of backend_urlencode.

We must get the urlencode information from backend_urlencode.

What is this trying to fix, actually? We have no download issue in the autobuilders, as far as I can see... Do you have a test-case to share?

Hello Yann,

I have a build configured with a primary site and BR2_PRIMARY_SITE_ONLY=y that failed to download libopenssl patches from the mirror.

If the autobuilders are directly using the original URLs or are falling back to the original URLs they should work fine.

Quoted 1 line · Thomas Petazzoni

Applied to master, thanks.

Thank you !

Signature · 1 line
Damien Th?bault
#3 lore raw

PATCH 1/1 dl-wrapper: Fix urlencode option never being sent to backend

Hello,

Quoted 6 lines · Damien Th?bault

I have a build configured with a primary site and BR2_PRIMARY_SITE_ONLY=y that failed to download libopenssl patches from the mirror.

If the autobuilders are directly using the original URLs or are falling back to the original URLs they should work fine.

Thanks! We really need to add some test cases in support/testing/ for those "corner" cases, since they are not tested by the autobuilders or in the most usual situations, they tend to be forgotten, and therefore broken.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#4 lore raw

PATCH 1/1 dl-wrapper: Fix urlencode option never being sent to backend

In reply to Damien Thébault

Damien, All,

On 2018-12-10 08:03 +0000, Damien Th?bault spake thusly:

Quoted 6 lines · Yann E. MORIN
Quoted 5 lines

On 2018-12-07 12:41 +0000, Damien Th?bault spake thusly:

Quoted 4 lines

The urlencode parameter is lost in dl-wrapper, because we try to get it
from backend instead of backend_urlencode.

Quoted 8 lines
Quoted 5 lines
Quoted 1 line

We must get the urlencode information from backend_urlencode.

What is this trying to fix, actually? We have no download issue in the autobuilders, as far as I can see... Do you have a test-case to share?

I have a build configured with a primary site and BR2_PRIMARY_SITE_ONLY=y that failed to download libopenssl patches from the mirror.

OK, makes sense, thanks for the feedback. :-)

Regards,
Yann E. MORIN.

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#5 lore raw

PATCH 1/1 dl-wrapper: Fix urlencode option never being sent to backend

In reply to Damien Thébault

Hello,

Quoted 9 lines · Damien Th?bault

The urlencode parameter is lost in dl-wrapper, because we try to get it from backend instead of backend_urlencode.

We must get the urlencode information from backend_urlencode.

---
 support/download/dl-wrapper | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#6 lore raw

PATCH 1/1 dl-wrapper: Fix urlencode option never being sent to backend

In reply to Damien Thébault
Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Damien" == Damien Th?bault <[email protected]> writes:

The urlencode parameter is lost in dl-wrapper, because we try to get it from backend instead of backend_urlencode.

We must get the urlencode information from backend_urlencode.

Committed to 2018.08.x and 2018.11.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard