Hello community,
here is the log from the commit of package containment-rpm-docker for
openSUSE:Factory checked in at 2018-04-06 17:49:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/containment-rpm-docker (Old)
and /work/SRC/openSUSE:Factory/.containment-rpm-docker.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "containment-rpm-docker"
Fri Apr 6 17:49:11 2018 rev:3 rq:593916 version:1.3.4+git_r80_62ea80a
Changes:
--------
---
/work/SRC/openSUSE:Factory/containment-rpm-docker/containment-rpm-docker.changes
2018-03-09 10:46:11.327558209 +0100
+++
/work/SRC/openSUSE:Factory/.containment-rpm-docker.new/containment-rpm-docker.changes
2018-04-06 17:51:33.187136164 +0200
@@ -1,0 +2,9 @@
+Wed Mar 28 09:03:30 UTC 2018 - [email protected]
+
+- Commit c2e30cc by David Cassany [email protected]
+ Make local builds possible
+
+ This commit makes local OBS builds of images wrapped in RPMs possible.
+
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ containment-rpm-docker.spec ++++++
--- /var/tmp/diff_new_pack.722eb7/_old 2018-04-06 17:51:34.283096541 +0200
+++ /var/tmp/diff_new_pack.722eb7/_new 2018-04-06 17:51:34.283096541 +0200
@@ -17,7 +17,7 @@
Name: containment-rpm-docker
-Version: 1.3.4+git_r78_fa6af2c
+Version: 1.3.4+git_r80_62ea80a
Release: 0
Summary: Wraps OBS/kiwi-built images in rpms
License: MIT
++++++ master.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/containment-rpm-docker-master/kiwi_post_run
new/containment-rpm-docker-master/kiwi_post_run
--- old/containment-rpm-docker-master/kiwi_post_run 2018-03-05
14:41:29.000000000 +0100
+++ new/containment-rpm-docker-master/kiwi_post_run 2018-03-28
11:03:37.000000000 +0200
@@ -15,7 +15,7 @@
BUILD_DISTURL=
# To get BUILD_DISTURL
-. /.buildenv
+test -f /.buildenv && . /.buildenv
cd $IMAGE_DIR
@@ -82,7 +82,12 @@
NAME="${CONTAINER_NAME}-image"
VERSION="${PKG_VERSION}"
-RELEASE=$(expr match "$PACKAGES" '.*-Build\(.*\).packages')
+RELEASE=$(echo "$PACKAGES" | sed 's/.*-Build\(.*\).packages/\1/')
+
+if [ -z "$RELEASE" ]; then
+ echo "Could not parse release number, setting it to zero"
+ RELEASE=0
+fi
# For some time our images where named <name>-docker-image,
# now they have been renamed to <name>-image.
