Changeset 24240 for issm/trunk-jpl/src/m/os/issmscpin.py

Timestamp:

10/17/19 06:03:43 (5 years ago)

Author:

bdef

Message:

Adding a substeping framework in hydro and part of smb

File:

• issm/trunk-jpl/src/m/os/issmscpin.py (modified) (5 diffs)

issm/trunk-jpl/src/m/os/issmscpin.py

@@ -9 +9 @@
     """
     ISSMSCPIN get packages from host, using scp on unix, and pscp on windows
-
        usage: issmscpin(host, packages, path)
     """
@@ -15 +14 @@
     #first get hostname
     hostname = gethostname()
-
     #first be sure packages are not in the current directory, this could conflict with pscp on windows.
     #remove warnings in case the files do not exist
@@ -23 +21 @@
         except OSError as e:
             pass
-
     #if hostname and host are the same, do a simple copy
-    if m.strcmpi(hostname, host):
-
+    if hostname == host:
         for package in packages:
             try:
@@ -32 +28 @@
             except OSError as e:
                 pass
-
     else:
         if m.ispc():
@@ -41 +36 @@
             else:
                 raise OSError("issmscpin error message: could not find ISSM_DIR_WIN environment variable.")
-
             username = eval(input('Username: (quoted string) '))
             key = eval(input('Key: (quoted string) '))
-
             for package in packages:
                 try:
                     subprocess.check_call('%s/externalpackages/ssh/pscp.exe -l "%s" -pw "%s" %s:%s %s' % (ISSM_DIR, username, key, host, os.path.join(path, package), os.getcwd()), shell=True)
                 except CalledProcessError as e:
-                    raise CalledProcessError("issmscpin error message: could not call putty pscp.")
+                    raise CalledProcessError("issmscpin error message: could not call putty pscp due to ")
 
         else: