tav avatar tav committed 5c272f6

Fixed stdout/stderr mixup.

Comments (0)

Files changed (3)

pypy/translator/platform/__init__.py

         args = cclist[1:] + args
         returncode, stdout, stderr = _run_subprocess(cc, args, self.c_environ,
                                                      cwd)
-        self._handle_error(returncode, stderr, stdout, outname)
+        self._handle_error(returncode, stdout, stderr, outname)
 
-    def _handle_error(self, returncode, stderr, stdout, outname):
+    def _handle_error(self, returncode, stdout, stderr, outname):
         if returncode != 0:
             errorfile = outname.new(ext='errors')
             errorfile.write(stderr, 'wb')

pypy/translator/platform/maemo.py

         log.execute('/scratchbox/login ' + cc + ' ' + ' '.join(args))
         args = [cc] + args
         returncode, stdout, stderr = _run_subprocess('/scratchbox/login', args)
-        self._handle_error(returncode, stderr, stdout, outname)
+        self._handle_error(returncode, stdout, stderr, outname)
     
     def execute(self, executable, args=[], env=None):
         if isinstance(args, str):

pypy/translator/platform/windows.py

 
         return exe_name
 
-    def _handle_error(self, returncode, stderr, stdout, outname):
+    def _handle_error(self, returncode, stdout, stderr, outname):
         if returncode != 0:
             # Microsoft compilers write compilation errors to stdout
             stderr = stdout + stderr
     def library_dirs_for_libffi(self):
         return []
 
-    def _handle_error(self, returncode, stderr, stdout, outname):
+    def _handle_error(self, returncode, stdout, stderr, outname):
         # Mingw tools write compilation errors to stdout
         super(MingwPlatform, self)._handle_error(
-            returncode, stderr + stdout, '', outname)
+            returncode, '', stderr + stdout, outname)
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.