osmith has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ci/+/31956 )
Change subject: obs: srcpkg.build: fix conflict_version regression
......................................................................
obs: srcpkg.build: fix conflict_version regression
During refactoring, conflict_version was changed to version here, which
was wrong. The packages need to depend on the conflict_version of the
meta package, version is the version of the package itself.
Fix for:
The following packages have unmet dependencies:
libosmo-netif-dev : Depends: osmocom-nightly (= 202303160009) but it is not
going to be installed
Depends: libosmocore but it is not going to be installed
Depends: libosmonetif11 (= 1.3.0.8.9e65.202303160009)
but it is not going to be installed
libosmocore-dev : Depends: osmocom-nightly (= 1.8.0.79-b394d.202303170006)
but it is not going to be installed
Depends: libosmocore but it is not going to be installed
Fixes: 0ed0e464 ("obs: don't pass conflict_version through functions")
Change-Id: I2326e3817c6f6887ef1196e603c3877768119a66
---
M scripts/obs/lib/srcpkg.py
1 file changed, 25 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/scripts/obs/lib/srcpkg.py b/scripts/obs/lib/srcpkg.py
index b230353..5dbc862 100644
--- a/scripts/obs/lib/srcpkg.py
+++ b/scripts/obs/lib/srcpkg.py
@@ -134,6 +134,7 @@
def build(project, gerrit_id=0):
+ conflict_version = lib.args.conflict_version
feed = lib.args.feed
lib.git.clone(project)
lib.git.clean(project)
@@ -151,9 +152,9 @@
if project in lib.config.projects_osmocom:
metapkg = f"osmocom-{feed}"
- lib.debian.control_add_depend(project, metapkg, version)
+ lib.debian.control_add_depend(project, metapkg, conflict_version)
if has_rpm_spec:
- lib.rpm_spec.add_depend(project, metapkg, version)
+ lib.rpm_spec.add_depend(project, metapkg, conflict_version)
lib.debian.changelog_add_entry_if_needed(project, version_epoch)
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/31956
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I2326e3817c6f6887ef1196e603c3877768119a66
Gerrit-Change-Number: 31956
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osm...@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith <osm...@sysmocom.de>
Gerrit-Reviewer: pespin <pes...@sysmocom.de>
Gerrit-MessageType: merged
