[NSIS-commits] SF.net SVN: nsis:[6536] NSIS/trunk/Source/build.cpp

[<and...@us...>]

Revision: 6536
          http://sourceforge.net/p/nsis/code/6536
Author:   anders_k
Date:     2014-08-07 12:31:51 +0000 (Thu, 07 Aug 2014)
Log Message:
-----------
Warn if !packhdr system() call returns non-zero

Modified Paths:
--------------
    NSIS/trunk/Source/build.cpp

Modified: NSIS/trunk/Source/build.cpp
===================================================================
--- NSIS/trunk/Source/build.cpp	2014-08-05 13:53:20 UTC (rev 6535)
+++ NSIS/trunk/Source/build.cpp	2014-08-07 12:31:51 UTC (rev 6536)
@@ -2528,12 +2528,15 @@
   }
   fwrite(m_exehead,1,m_exehead_size,tmpfile);
   fclose(tmpfile);
-  if (sane_system(build_packcmd) == -1)
+  int ec = sane_system(build_packcmd);
+  if (ec == -1)
   {
     _tremove(build_packname);
     ERROR_MSG(_T("Error: calling packer on \"%") NPRIs _T("\"\n"),build_packname);
     return PS_ERROR;
   }
+  if (ec != 0)
+    warning(_T("Packer returned %d, \"%") NPRIs _T("\" might still be unpacked\n"),ec,build_packname);
 
   int result = update_exehead(build_packname);
   _tremove(build_packname);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.