osmocom
/
osmo-ci
mirror of https://gerrit.osmocom.org/osmo-ci
10
0
Fork 1
Code Releases Activity

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
This commit is contained in:
Oliver Smith 2023-03-17 11:18:20 +01:00
parent 8d137c66a7
commit 3ccebc4514
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/obs/lib/srcpkg.py
View File

@ -134,6 +134,7 @@ def write_commit_txt(project):
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 @@ def build(project, gerrit_id=0):
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)