Commit ef9290b6 authored by Andrey Filippov's avatar Andrey Filippov

Fix legacy scp mode in version check script

parent 13c256b1
...@@ -12,3 +12,4 @@ projects.json ...@@ -12,3 +12,4 @@ projects.json
/scripts/.settings /scripts/.settings
/fpga-elphel /fpga-elphel
!/fpga-elphel/eclipse_workspace_setup !/fpga-elphel/eclipse_workspace_setup
__pycache__/
...@@ -65,8 +65,14 @@ def get_versions_from_target_quick(addr,tdir): ...@@ -65,8 +65,14 @@ def get_versions_from_target_quick(addr,tdir):
ldir = os.path.basename(tdir) ldir = os.path.basename(tdir)
if os.path.isdir(ldir): if os.path.isdir(ldir):
shout("rm -rf "+ldir) shout("rm -rf "+ldir)
shout("scp -r "+addr+":"+tdir+" .") scp_src = addr+":"+tdir
scp_cmd_legacy = "scp -O -r "+scp_src+" ."
scp_ret = subprocess.call(scp_cmd_legacy,shell=True)
if scp_ret != 0:
raise Exception("Failed to copy versions from target via scp -O. Check ssh/scp access to "+addr)
if not os.path.isdir(ldir):
raise Exception("Failed to read target versions: local directory '"+ldir+"' was not created")
remote_list = [] remote_list = []
...@@ -230,5 +236,3 @@ local_list = sorted(local_list, key=lambda x: x[0]) ...@@ -230,5 +236,3 @@ local_list = sorted(local_list, key=lambda x: x[0])
#print(local_list) #print(local_list)
deep_analysis(local_list,target_list) deep_analysis(local_list,target_list)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment