aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Smith <osmith@sysmocom.de>2021-01-14 11:15:48 +0100
committerOliver Smith <osmith@sysmocom.de>2021-01-15 16:51:02 +0100
commit02fb9ca1e7c399b05fb7609c800d218c4e95af86 (patch)
tree79e5904e519bc9f94a0c5b36822b870b934b7e52
parent0771116a49cbaeeae1f93f6631abea5d8717de24 (diff)
OBS: conflict: move _deb to separate function
Prepare to add the _rpm function by moving the debian code to its own function and tweaking the comment above the function. Related: OS#4733 Change-Id: Ic8d55c432c6035e7ac855cf6869d2c86ace468df
-rw-r--r--scripts/common-obs-conflict.sh33
1 files changed, 21 insertions, 12 deletions
diff --git a/scripts/common-obs-conflict.sh b/scripts/common-obs-conflict.sh
index a3cde36..57679c3 100644
--- a/scripts/common-obs-conflict.sh
+++ b/scripts/common-obs-conflict.sh
@@ -2,20 +2,22 @@
# Create conflicting dummy packages in OBS (opensuse build service), so users can't mix packages
# built from different branches by accident
-# Create the source for a dummy package, that conflicts with another dummy package in the current
-# directory. Example of the structure that will be generated:
-# osmocom-nightly
-# └── debian
-# ├── changelog
-# ├── compat
-# ├── control
-# ├── copyright
-# ├── rules
-# └── source
-# └── format
+# Create the conflicting package for debian
+#
# $1: name of dummy package (e.g. "osmocom-nightly")
# $2-*: name of conflicting packages (e.g. "osmocom-latest")
-osmo_obs_prepare_conflict() {
+#
+# Generates the following directory structure:
+# osmocom-nightly
+# └── debian
+# ├── changelog
+# ├── compat
+# ├── control
+# ├── copyright
+# ├── rules
+# └── source
+# └── format
+osmo_obs_prepare_conflict_deb() {
local pkgname="$1"
shift
local pkgver="0.0.0"
@@ -83,3 +85,10 @@ EOF
cd "$oldpwd"
}
+
+# Create conflicting packages
+# $1: name of dummy package (e.g. "osmocom-nightly")
+# $2-*: name of conflicting packages (e.g. "osmocom-latest")
+osmo_obs_prepare_conflict() {
+ osmo_obs_prepare_conflict_deb "$@"
+}