yudaike/openSUSE-release-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2072 from coolo/fix_rebuild

Browse Source 
Fix staging rebuild on python3
This commit is contained in:
Stephan Kulow 2019-05-29 10:12:58 +02:00 committed by GitHub
commit a9b9165bb6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
osclib/stagingapi.py
View File

@ -1,21 +1,10 @@
from __future__ import print_function from io import StringIO
try:
# python2
from StringIO import StringIO
except ImportError:
from io import StringIO
from datetime import datetime from datetime import datetime
import dateutil.parser import dateutil.parser
import json import json
import logging import logging
import textwrap import textwrap
try: from urllib.error import HTTPError, URLError
from urllib.error import HTTPError, URLError
except ImportError:
#python 2.x
from urllib2 import HTTPError, URLError
import time import time
import re import re
@ -44,6 +33,7 @@ from osc.core import search
from osc.core import show_project_meta from osc.core import show_project_meta
from osc.core import show_project_sourceinfo from osc.core import show_project_sourceinfo
from osc.core import streamfile from osc.core import streamfile
from osc.util.helper import decode_it
from osclib.cache import Cache from osclib.cache import Cache
from osclib.core import devel_project_get from osclib.core import devel_project_get
@ -925,8 +915,7 @@ class StagingAPI(object):
# Modified from osc.core.print_buildlog() # Modified from osc.core.print_buildlog()
def buildlog_get(self, prj, package, repository, arch, offset=0, strip_time=False, last=False): def buildlog_get(self, prj, package, repository, arch, offset=0, strip_time=False, last=False):
# to protect us against control characters # to protect us against control characters
import string all_bytes = bytes.maketrans(b'', b'')
all_bytes = string.maketrans('', '')
remove_bytes = all_bytes[:8] + all_bytes[14:32] # accept tabs and newlines remove_bytes = all_bytes[:8] + all_bytes[14:32] # accept tabs and newlines
query = {'nostream': '1', 'start': '%s' % offset} query = {'nostream': '1', 'start': '%s' % offset}
@ -941,7 +930,7 @@ class StagingAPI(object):
offset += len(data) offset += len(data)
if strip_time: if strip_time:
data = buildlog_strip_time(data) data = buildlog_strip_time(data)
log.write(data.translate(all_bytes, remove_bytes)) log.write(decode_it(data.translate(all_bytes, remove_bytes)))
if start_offset == offset: if start_offset == offset:
break break