mirror of
ssh://git.janware.com/janware/proj/jw-pkg
synced 2026-04-24 17:23:36 +02:00
jw.pkg.build.lib: Move to jw.pkg.lib
In preparation of reorganizing the tree below cmds, move the lib subdirectory a level up. Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
parent
eb2dd919a1
commit
2e69639362
5 changed files with 4 additions and 4 deletions
|
|
@ -5,7 +5,7 @@ from argparse import Namespace, ArgumentParser
|
||||||
from urllib.parse import urlparse
|
from urllib.parse import urlparse
|
||||||
|
|
||||||
from ..Cmd import Cmd
|
from ..Cmd import Cmd
|
||||||
from ..lib.util import run_cmd
|
from ...lib.util import run_cmd
|
||||||
|
|
||||||
class CmdGetAuthInfo(Cmd): # export
|
class CmdGetAuthInfo(Cmd): # export
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@ import re, os
|
||||||
from argparse import Namespace, ArgumentParser
|
from argparse import Namespace, ArgumentParser
|
||||||
|
|
||||||
from ..Cmd import Cmd
|
from ..Cmd import Cmd
|
||||||
from ..lib.util import get_username, get_password, run_curl
|
from ...lib.util import get_username, get_password, run_curl
|
||||||
|
|
||||||
class CmdListRepos(Cmd): # export
|
class CmdListRepos(Cmd): # export
|
||||||
|
|
||||||
|
|
@ -31,7 +31,7 @@ class CmdListRepos(Cmd): # export
|
||||||
match url.scheme:
|
match url.scheme:
|
||||||
case 'ssh':
|
case 'ssh':
|
||||||
if re.match(r'ssh://.*git\.janware\.com/', args.base_url):
|
if re.match(r'ssh://.*git\.janware\.com/', args.base_url):
|
||||||
from jw.pkg.build.lib.SSHClient import SSHClientCmd as SSHClient
|
from jw.pkg.lib.SSHClient import SSHClientCmd as SSHClient
|
||||||
ssh = SSHClient(hostname=url.hostname)
|
ssh = SSHClient(hostname=url.hostname)
|
||||||
if username is not None:
|
if username is not None:
|
||||||
ssh.set_username(username)
|
ssh.set_username(username)
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
TOPDIR = ../../../../../..
|
TOPDIR = ../../../../..
|
||||||
|
|
||||||
include $(TOPDIR)/make/proj.mk
|
include $(TOPDIR)/make/proj.mk
|
||||||
include $(JWBDIR)/make/py-mod.mk
|
include $(JWBDIR)/make/py-mod.mk
|
||||||
Loading…
Add table
Add a link
Reference in a new issue