Ensure bundled provides versions don't include dashes

mizdebsk · mizdebsk · commit 2b739e8e8302 · 2025-02-04T10:57:58.000+01:00
diff --git a/downstream.sh b/downstream.sh
@@ -132,7 +132,7 @@ function save_patches()
 
 function bundled_provides()
 {
-    echo "bundled(${rpm_name:-$p}) = $version"
+    echo "bundled(${rpm_name:-$p}) = ${rpm_version}"
 }
 
 function source_list()
@@ -171,6 +171,7 @@ for p; do
     . project/$p.properties
     sub_version ref
     sub_version url
+    rpm_version=${version//-/.}
     if [[ "$cmd" = clone ]] || [[ "$cmd" = prep ]]; then
         echo >&2
         echo "=============================================" >&2

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ function save_patches()`
`132`	`132`
`133`	`133`	`function bundled_provides()`
`134`	`134`	`{`
`135`		`- echo "bundled(${rpm_name:-$p}) = $version"`
	`135`	`+ echo "bundled(${rpm_name:-$p}) = ${rpm_version}"`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`function source_list()`
`@@ -171,6 +171,7 @@ for p; do`
`171`	`171`	`. project/$p.properties`
`172`	`172`	`sub_version ref`
`173`	`173`	`sub_version url`
	`174`	`+ rpm_version=${version//-/.}`
`174`	`175`	`if [[ "$cmd" = clone ]] \|\| [[ "$cmd" = prep ]]; then`
`175`	`176`	`echo >&2`
`176`	`177`	`echo "=============================================" >&2`