openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File osc.patch of Package osc (Revision 3c9fc154f1a7fca0c074219279f177b1)

Currently displaying revision 3c9fc154f1a7fca0c074219279f177b1 , Show latest

Index: osc-1.4.0/osc/core.py
===================================================================
--- osc-1.4.0.orig/osc/core.py
+++ osc-1.4.0/osc/core.py
@@ -38,6 +38,7 @@ from typing import Optional, Dict, Union
 from urllib.parse import urlsplit, urlunsplit, urlparse, quote_plus, urlencode, unquote
 from urllib.error import HTTPError
 from urllib.request import pathname2url
+from urllib3.exceptions import ProtocolError
 from xml.etree import ElementTree as ET
 
 try:
@@ -6882,7 +6883,7 @@ def get_prj_results(
             if i == "expansion error":
                 continue
             legend.append('%3s %-20s' % (j, i))
-        legend.append('  ? buildstatus not available (only new packages)')
+        legend.append('%3s %-20s' % ('?', 'unknown'))
 
         if vertical:
             for i in range(0, len(targets)):
@@ -7002,17 +7003,20 @@ def print_buildlog(
             for data in streamfile(u):
                 offset += len(data)
                 print_data(data, strip_time)
-        except IncompleteRead as e:
-            if retry_count >= 3:
+                retry_count = 0
+        except ProtocolError as e:
+            if retry_count >= 3 or not isinstance(e.args[1], IncompleteRead):
                 raise e
             retry_count += 1
-            data = e.partial
+            data = e.args[1].partial
             if len(data):
                 offset += len(data)
                 print_data(data, strip_time)
+                retry_count = 0
             continue
         if start_offset == offset:
             break
+        retry_count = 0
 
 
 def get_dependson(apiurl: str, project: str, repository: str, arch: str, packages=None, reverse=None):
@@ -7383,9 +7387,9 @@ def store_write_string(dir, file, string
         os.mkdir(os.path.join(dir, store, subdir))
     fname = os.path.join(dir, store, subdir, file)
     try:
-        f = open(fname + '.new', 'w')
-        if not isinstance(string, str):
-            string = decode_it(string)
+        f = open(fname + '.new', 'wb')
+        if isinstance(string, str):
+            string = string.encode()
         f.write(string)
         f.close()
         os.rename(fname + '.new', fname)

Places

File osc.patch of Package osc (Revision 3c9fc154f1a7fca0c074219279f177b1)

Places