Changeset 22169

Timestamp:

10/12/17 14:45:29 (7 years ago)

Author:

Mathieu Morlighem

Message:

CHG: better way of dealing with warnings

Location:

issm/trunk/src/m/os

Files:

• issmbbftpin.m (modified) (3 diffs)
• issmscpin.m (modified) (2 diffs)

issm/trunk/src/m/os/issmbbftpin.m

@@ -10 +10 @@
 
 %first be sure packages are not in the current directory, this could conflict with pscp on windows. 
-%get initial warning mode
-state=warning('query', 'all');
-%remove warnings in case the files do not exist
-warning off
 for i=1:numel(packages),
-        delete(packages{i});
+        if exist(packages{i},'file'),
+                delete(packages{i});
+        end
 end
-%back to initial warning state
-warning(state);
 
 %if hostname and host are the same, do a simple copy
@@ -31 +27 @@
         %build a string of the type: bbftp -s -u elarour -e 'setnbstream 8; cd /nobackupp10/elarour/Testing/Interactive3/; get Antarctica.outbin' pfe1.nas.nasa.gov
         command=['!bbftp -s -V -u ' login ' -e ''setnbstream 8; cd ' path '; '];
-        for i=1:length(packages),
+        for i=1:numel(packages),
                 command=[command 'get ' packages{i} ';'];
         end
@@ -40 +36 @@
         %check bbftp worked
         for i=1:numel(packages),
-                if ~exist(['./' packages{i}]),
+                if ~exist(['./' packages{i}],'file'),
                         error('scpin error message: could not call scp on *nix system');
                 end
         end
-
 end

issm/trunk/src/m/os/issmscpin.m

@@ -10 +10 @@
 
 %first be sure packages are not in the current directory, this could conflict with pscp on windows. 
-%get initial warning mode
-state=warning('query', 'all');
-%remove warnings in case the files do not exist
-warning off
 for i=1:numel(packages),
-        delete(packages{i});
+        if exist(packages{i},'file'),
+                delete(packages{i});
+        end
 end
-%back to initial warning state
-warning(state);
 
 %if hostname and host are the same, do a simple copy
@@ -50 +46 @@
 
         else
-                %just use standard unix scp
-                %string to copy multiple files using scp: 
+                %just use standard unix scp string to copy multiple files using scp: 
                 if numel(packages)==1,
                         string=packages{1};