importtest/git-importer
4
0
Fork 0
forked from adamm/git-importer
Code Pull Requests Activity

resolve links if there's conflict

Browse Source
This commit is contained in:
Adam Majer
2025-12-11 11:16:57 +01:00
parent 94e57852a0
commit aa9ba6fadb
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/obs.py
View File

@@ -141,7 +141,7 @@ class OBS:
return User().parse(root, userid)
def files(self, project, package, revision):
root = self._xml(f"source/{project}/{package}", rev=revision, expand=1)
root = self._xml(f"source/{project}/{package}", rev=revision, expand=1, linkrev="base")
return [
(e.get("name"), int(e.get("size")), e.get("md5"))
for e in root.findall("entry")
@@ -152,7 +152,7 @@ class OBS:
url = osc.core.makeurl(
self.url,
["source", project, package, name],
{"rev": revision, "expand": 1},
{"rev": revision, "expand": 1, "linkrev": "base"},
)
return osc.core.http_GET(url)
except HTTPError as e:
@@ -160,7 +160,7 @@ class OBS:
url = osc.core.makeurl(
self.url,
["source", project, package, name],
{"rev": revision, "expand": 1, "deleted": 1},
{"rev": revision, "expand": 1, "deleted": 1, "linkrev": "base"},
)
return osc.core.http_GET(url)
@@ -191,7 +191,7 @@ class OBS:
logging.debug(f"Use cached {project}/{package}/{name}")
def list(self, project, package, srcmd5, linkrev):
params = {"rev": srcmd5, "expand": "1"}
params = {"rev": srcmd5, "expand": "1", "linkrev": "base"}
if linkrev:
params["linkrev"] = linkrev