diff mbox

[core] lib/oelite/baker.py: fix MANIFEST_ORIGIN_SRCURI if ssh protocol is implicit

Message ID 1384767712-17488-1-git-send-email-jabk@prevas.dk
State Superseded
Delegated to: Esben Haabendal
Headers show

Commit Message

Jacob Kjaergaard Nov. 18, 2013, 9:41 a.m. UTC
From: Jacob Kjaergaard <jacob.kjaergaard@prevas.dk>

git clone will interpret git@git.mygitserver.org:mygit.git as ssh if it
exist. This commits fixes implicitly given ssh protocol.
This is not error prone. If a @ is not given git may prompt for username, but it
fixes more cases.
---
 lib/oelite/baker.py |    5 +++++
 1 file changed, 5 insertions(+)

Comments

Jacob Kjaergaard Nov. 18, 2013, 6:38 p.m. UTC | #1
From: Jacob Kjaergaard <jacob.kjaergaard@prevas.dk>

argh. I think I was a bit too fast there. git ssh syntax does not like colons...

Jacob Kjaergaard (1):
  lib/oelite/baker.py: fix MANIFEST_ORIGIN_SRCURI if ssh protocol is
    implicit

 lib/oelite/baker.py |    7 +++++++
 1 file changed, 7 insertions(+)
diff mbox

Patch

diff --git a/lib/oelite/baker.py b/lib/oelite/baker.py
index dfb99d2..96ee267 100644
--- a/lib/oelite/baker.py
+++ b/lib/oelite/baker.py
@@ -201,6 +201,11 @@  class OEliteBaker:
                 if url.startswith('%s://'%(protocol)):
                     srcuri = 'git://%s'%(url[len(protocol)+3:])
                     break
+                if protocol == 'ssh':
+                    index = url.find('@');
+                    if index > 0:
+                        srcuri = 'git://%s'%(url)
+                        break
         self.config.set('MANIFEST_ORIGIN_URL', url)
         self.config.set_flag('MANIFEST_ORIGIN_URL', 'nohash', True)
         if srcuri is None: