Skip to contentSkip to conversation

fetch2/ssh.py: Fix url code for +

PATCH In review Robert Yang 2 participants 3 messages Apr 19, 2022 – Apr 21, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fetch2/ssh.py: Fix url code for +

Fixed when fetch from PREMIRRORS via ssh:

$ bitbake bonnie++ libsigc++-2.0 -cfetch

scp: /paht/to/downloads/libsigc%2B%2B-2.10.7.tar.xz: No such file or directory

---
 lib/bb/fetch2/ssh.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
lib/bb/fetch2/ssh.py +3 -2
index 484453088f..2836d7c884 100644
@@ -70,6 +70,7 @@ class SSH(FetchMethod):
                 "git:// prefix with protocol=ssh", urldata.url)
         m = __pattern__.match(urldata.url)
         path = m.group('path')
+        path = path.replace("%3A", ":").replace("%2B", "+")
         host = m.group('host')
         urldata.localpath = os.path.join(d.getVar('DL_DIR'),
                 os.path.basename(os.path.normpath(path)))
@@ -99,7 +100,7 @@ class SSH(FetchMethod):
 
         if path[0] != '~':
             path = '/%s' % path
-        path = path.replace("%3A", ":")
+        path = path.replace("%3A", ":").replace("%2B", "+")
 
         fr += ':%s' % path
 
@@ -139,7 +140,7 @@ class SSH(FetchMethod):
 
         if path[0] != '~':
             path = '/%s' % path
-        path = path.replace("%3A", ":")
+        path = path.replace("%3A", ":").replace("%2B", "+")
 
         cmd = 'ssh -o BatchMode=true %s %s [ -f %s ]' % (
             portarg,
Signature · 1 line
2.35.1
#1 lore raw
Quoted 32 lines · Robert Yang

Fixed when fetch from PREMIRRORS via ssh:

$ bitbake bonnie++ libsigc++-2.0 -cfetch

scp: /paht/to/downloads/libsigc%2B%2B-2.10.7.tar.xz: No such file or directory

---
 lib/bb/fetch2/ssh.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
lib/bb/fetch2/ssh.py +2 -1
index 484453088f..2836d7c884 100644
@@ -70,6 +70,7 @@ class SSH(FetchMethod):
                 "git:// prefix with protocol=ssh", urldata.url)
         m = __pattern__.match(urldata.url)
         path = m.group('path')
+        path = path.replace("%3A", ":").replace("%2B", "+")
         host = m.group('host')
         urldata.localpath = os.path.join(d.getVar('DL_DIR'),
                 os.path.basename(os.path.normpath(path)))
@@ -99,7 +100,7 @@ class SSH(FetchMethod):
 
         if path[0] != '~':
             path = '/%s' % path
-        path = path.replace("%3A", ":")
+        path = path.replace("%3A", ":").replace("%2B", "+")
 
         fr += ':%s' % path
 

lib/bb/fetch2/ssh.py class SSH(FetchMethod): · line 146

Quoted 8 lines
lib/bb/fetch2/ssh.py +1 -1
@@ -139,7 +140,7 @@ class SSH(FetchMethod):
 
         if path[0] != '~':
             path = '/%s' % path
-        path = path.replace("%3A", ":")
+        path = path.replace("%3A", ":").replace("%2B", "+")
 
         cmd = 'ssh -o BatchMode=true %s %s [ -f %s ]' % (
             portarg,

Do we need to be doing some kind of url decode on this?

Cheers,

Richard

#2 lore raw
Quoted 39 lines · Richard Purdie
Quoted 38 lines · Robert Yang

Fixed when fetch from PREMIRRORS via ssh:

$ bitbake bonnie++ libsigc++-2.0 -cfetch

scp: /paht/to/downloads/libsigc%2B%2B-2.10.7.tar.xz: No such file or directory

---
  lib/bb/fetch2/ssh.py | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
lib/bb/fetch2/ssh.py +3 -2
index 484453088f..2836d7c884 100644
@@ -70,6 +70,7 @@ class SSH(FetchMethod):
                  "git:// prefix with protocol=ssh", urldata.url)
          m = __pattern__.match(urldata.url)
          path = m.group('path')
+        path = path.replace("%3A", ":").replace("%2B", "+")
          host = m.group('host')
          urldata.localpath = os.path.join(d.getVar('DL_DIR'),
                  os.path.basename(os.path.normpath(path)))
@@ -99,7 +100,7 @@ class SSH(FetchMethod):
 
          if path[0] != '~':
              path = '/%s' % path
-        path = path.replace("%3A", ":")
+        path = path.replace("%3A", ":").replace("%2B", "+")
 
          fr += ':%s' % path
 
@@ -139,7 +140,7 @@ class SSH(FetchMethod):
 
          if path[0] != '~':
              path = '/%s' % path
-        path = path.replace("%3A", ":")
+        path = path.replace("%3A", ":").replace("%2B", "+")
 
Quoted 4 lines

lib/bb/fetch2/ssh.py class SSH(FetchMethod): · line 146

Quoted 2 lines
lib/bb/fetch2/ssh.py +0 -0
          cmd = 'ssh -o BatchMode=true %s %s [ -f %s ]' % (
              portarg,

Do we need to be doing some kind of url decode on this?

Yes, I think that's better, I've done a world fetch build after urllib.parse.unquote(path).

V2 is coming.

// Robert

Quoted 5 lines

Cheers,

Richard