#8564 mass-rebuild.py py3 changes
Merged 4 years ago by mohanboddu. Opened 4 years ago by mohanboddu.
mohanboddu/releng f31-mass-rebuild  into  master

file modified
+4 -4
@@ -1,4 +1,4 @@ 

- #!/usr/bin/python

+ #!/usr/bin/python3

  #

  # mass-rebuild.py - A utility to rebuild packages.

  #
@@ -42,7 +42,7 @@ 

  

      try:

          subprocess.check_call(cmd, env=env, cwd=cwd)

-     except subprocess.CalledProcessError, e:

+     except subprocess.CalledProcessError as e:

          sys.stderr.write('%s failed %s: %s\n' % (pkg, action, e))

          return 1

      return 0
@@ -57,8 +57,8 @@ 

  

      try:

          pid = subprocess.Popen(cmd, env=env, cwd=cwd,

-                                stdout=subprocess.PIPE)

-     except BaseException, e:

+                                stdout=subprocess.PIPE, encoding='utf8')

+     except BaseException as e:

          sys.stderr.write('%s failed %s: %s\n' % (pkg, action, e))

          return 0

      result = pid.communicate()[0].rstrip('\n')

Pull-Request has been merged by mohanboddu

4 years ago
Metadata