commit: f1db156a7d11e0bfb8d7b6a19f066c5d0b0fba5d Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org> AuthorDate: Fri Aug 15 22:08:42 2014 +0000 Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org> CommitDate: Fri Aug 15 22:08:42 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/layman.git;a=commit;h=f1db156a
svn.py: fixes svn sync output for python 3.x X-Gentoo-Bug: 520020 X-Gentoo-Bug-URL: https://bugs.gentoo.org/520020 --- layman/overlays/modules/svn/svn.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/layman/overlays/modules/svn/svn.py b/layman/overlays/modules/svn/svn.py index d5e598e..51bb487 100644 --- a/layman/overlays/modules/svn/svn.py +++ b/layman/overlays/modules/svn/svn.py @@ -166,13 +166,13 @@ class SvnOverlay(OverlaySource): ''' file_to_run = resolve_command(self.command(), self.output.error)[1] args = " ".join([file_to_run, " upgrade", target]) - pipe = Popen(args, shell=True, stdout=PIPE, stderr=PIPE) - if pipe: + stdout, stderr = Popen(args, shell=True, stdout=PIPE, stderr=PIPE).communicate() + if stdout: self.output.debug("SVN: check_upgrade()... have a valid pipe, " "running upgrade", 4) - upgrade_output = pipe.stdout.readline().strip('\n') + upgrade_output = stdout.readline().split('\n') if upgrade_output: self.output.debug(" output: %s" % upgrade_output, 4) self.output.debug("SVN: check_upgrade()... svn upgrade done", 4) - pipe.terminate() + stdout.terminate() return
