Commitdf5c1cb

committed

FIX regression by#519 on reading stdout/stderr of cmds

1 parentb3b9c02 commitdf5c1cbCopy full SHA for df5c1cb

File tree

+10

-4

lines changed

+10

-4

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -38,9 +38,10 @@ environment:`
`38`	`38`	`install:`
`39`	`39`	`-set PATH=%PYTHON%;%PYTHON%\Scripts;%GIT_PATH%;%PATH%`
`40`	`40`
`41`		`-## Printarchitecture, python & git used for debugging.`
	`41`	`+## Printconfiguration for debugging.`
`42`	`42`	`#`
`43`	`43`	`-\|`
	`44`	`+ echo %PATH%`
`44`	`45`	`uname -a`
`45`	`46`	`where git git-daemon python pip pip3 pip34`
`46`	`47`	`python --version`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -539,7 +539,8 @@ def execute(self, command,`
`539`	`539`	`cmd_not_found_exception=OSError`
`540`	`540`	`# end handle`
`541`	`541`
`542`		`-log.debug("Popen(%s, cwd=%s, universal_newlines=%s",command,cwd,universal_newlines)`
	`542`	`+log.debug("Popen(%s, cwd=%s, universal_newlines=%s, shell=%s)",`
	`543`	`+command,cwd,universal_newlines,shell)`
`543`	`544`	`try:`
`544`	`545`	`proc=Popen(command,`
`545`	`546`	`env=env,`

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -899,8 +899,12 @@ def _clone(cls, git, url, path, odb_default_type, progress, **kwargs):`
`899`	`899`	`try:`
`900`	`900`	`proc=git.clone(url,path,with_extended_output=True,as_process=True,`
`901`	`901`	`v=True,**add_progress(kwargs,git,progress))`
`902`		`-progress_handler=progressandprogress.new_message_handler()orNone`
`903`		`-handle_process_output(proc,None,progress_handler,finalize_process)`
	`902`	`+ifprogress:`
	`903`	`+handle_process_output(proc,None,progress.new_message_handler(),finalize_process)`
	`904`	`+else:`
	`905`	`+ (stdout,stderr)=proc.communicate()# FIXME: Will block of outputs are big!`
	`906`	`+finalize_process(proc,stderr=stderr)`
	`907`	`+# end handle progress`
`904`	`908`	`finally:`
`905`	`909`	`ifprev_cwdisnotNone:`
`906`	`910`	`os.chdir(prev_cwd)`

Comments

(0)