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

Merge pull request #2416 from coolo/add_debug_to_pkglist

Browse Source 
Add error message in case upload fails
This commit is contained in:
Stephan Kulow 2020-03-10 10:49:02 +01:00 committed by GitHub
commit e25d3bfb3d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkglistgen/update_repo_handler.py
View File

@ -17,6 +17,7 @@ from lxml import etree as ET
from osc import conf from osc import conf
import osc.core import osc.core
from urllib.error import HTTPError
from osclib.cache_manager import CacheManager from osclib.cache_manager import CacheManager
import requests import requests
@ -128,7 +129,11 @@ def parse_susetags(repo, baseurl):
f.write(content.read()) f.write(content.read())
f.flush() f.flush()
os.lseek(f.fileno(), 0, os.SEEK_SET) os.lseek(f.fileno(), 0, os.SEEK_SET)
try:
repo.add_susetags(f, defvendorid, None, solv.Repo.REPO_NO_INTERNALIZE | solv.Repo.SUSETAGS_RECORD_SHARES) repo.add_susetags(f, defvendorid, None, solv.Repo.REPO_NO_INTERNALIZE | solv.Repo.SUSETAGS_RECORD_SHARES)
except TypeError:
logger.error(f"Failed to add susetags for {url}")
return False
return True return True
return False return False
@ -230,6 +235,10 @@ def update_project(apiurl, project):
os.unlink(solv_file) os.unlink(solv_file)
url = osc.core.makeurl(apiurl, ['source', project, '000update-repos', path + '.xz']) url = osc.core.makeurl(apiurl, ['source', project, '000update-repos', path + '.xz'])
try:
osc.core.http_PUT(url, data=open(packages_file + '.xz', 'rb').read()) osc.core.http_PUT(url, data=open(packages_file + '.xz', 'rb').read())
except HTTPError:
logger.error(f"Failed to upload to {url}")
sys.exit(1)
del pool del pool