patch for

https://bugzilla.mcs.anl.gov/globus/show_bug.cgi?id=7088
nimbusproject · Aug 13, 2010 · c829770 · c829770
1 parent bbfc089
commit c829770
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/control/src/python/workspacecontrol/defaults/imageprocurement/propagate_common.py b/control/src/python/workspacecontrol/defaults/imageprocurement/propagate_common.py
@@ -381,7 +381,6 @@ def _unpropagate(self, l_files):
 
             if not l_file._unpropagate_needed:
                 continue
-
             for keyword in self.adapters.keys():
                 schemestring = keyword + "://"
                 scheme_len = len(schemestring)
@@ -397,7 +396,7 @@ def _unpropagate(self, l_files):
                         return
 
                     adapter.unpropagate(l_file.path, l_file._unpropagation_target)
-                    
+
                     return
 
     def _blankspace(self, l_files):

diff --git a/service/service/java/source/src/org/globus/workspace/xen/XenUtil.java b/service/service/java/source/src/org/globus/workspace/xen/XenUtil.java
@@ -189,7 +189,7 @@ public static ArrayList constructUnpropagateCommand(VirtualMachine vm,
             logger.error(err);
             throw new IllegalArgumentException(err);
         }
-
+                                                             
         if (worksp == null) {
             logger.error(NO_WRKSP);
             throw new WorkspaceException(NO_WRKSP);
@@ -235,7 +235,7 @@ public static ArrayList constructUnpropagateCommand(VirtualMachine vm,
             if(nsTrans != null) {
                 img = nsTrans.translateExternaltoInternal(altTargets);
             }
-            cmd.add(altTargets);
+            cmd.add(img);
         }
 
         if (notificationInfo != null) {