Mercurial > octave-dspies

changeset 12953:5cc3b7673d25 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
__xzip__: Fix regression about moving compressed files (bug #33993)
author Orion Poplawski <orion@cora.nwra.com>
date Thu, 11 Aug 2011 19:50:57 -0500
parents 818299a39ae1
children fb69561e5901
files scripts/miscellaneous/private/__xzip__.m
diffstat 1 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/miscellaneous/private/__xzip__.m	Thu Aug 11 14:05:46 2011 -0500
+++ b/scripts/miscellaneous/private/__xzip__.m	Thu Aug 11 19:50:57 2011 -0500
@@ -80,14 +80,16 @@
              commandname, status);
     endif
 
-    if (nargout > 0)
-      if (nargin == 5)
+    if (nargin == 5)
+      if (nargout > 0)
         entries = cellfun(
             @(x) fullfile (outdir, sprintf ("%s.%s", x, extension)),
             f, "uniformoutput", false);
-      else
-        movefile (cellfun(@(x) sprintf ("%s.%s", x, extension), f,
-                          "uniformoutput", false), cwd);
+      endif
+    else
+      movefile (cellfun(@(x) sprintf ("%s.%s", x, extension), f,
+                        "uniformoutput", false), cwd);
+      if (nargout > 0)
         ## FIXME this does not work when you try to compress directories
         entries  = cellfun(@(x) sprintf ("%s.%s", x, extension),
                            files, "uniformoutput", false);