From d715fee5cedfe3871766df5532d21b0ee99caf7824ad8162686546d3fbb337b5 Mon Sep 17 00:00:00 2001
From: Containers Team <containers-bugowner@suse.de>
Date: Fri, 14 Dec 2018 12:46:34 +0000
Subject: [PATCH] Updated from councourse CI

OBS-URL: https://build.opensuse.org/package/show/devel:kubic:containers/kubic-etcd-image?expand=0&rev=4
---
 kubic-etcd-image.changes | 11 +++++++++++
 pre_checkin.sh           |  3 ++-
 root.obscpio             |  2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/kubic-etcd-image.changes b/kubic-etcd-image.changes
index bf46c4b..362c2f1 100644
--- a/kubic-etcd-image.changes
+++ b/kubic-etcd-image.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Dec 14 12:46:22 UTC 2018 - Containers Team <containers-bugowner@suse.de>
+
+- Commit 6649435 by David Cassany dcassany@suse.de 
+
+  Do not fail if no new change log entries are found
+
+  This commit makes pre_checkin.sh script to exit 0 if no new changelog 
+  entries are found (when using --mkchanges flag). This way the CI does not
+  report a failre when it is executed having nothing new to commit at OBS.
+
 -------------------------------------------------------------------
 Wed Dec 12 09:21:19 UTC 2018 - Containers Team <containers-bugowner@suse.de>
 
diff --git a/pre_checkin.sh b/pre_checkin.sh
index e0e0677..9b48765 100644
--- a/pre_checkin.sh
+++ b/pre_checkin.sh
@@ -6,6 +6,7 @@
 
 log()       { echo ">>> $@" ; }
 abort()     { log "FATAL: $@" ; exit 1 ; }
+endScript() { log "EXITING: $@" ; exit 0 ; }
 usage()     {
     cat <<USAGE
 usage:
@@ -39,7 +40,7 @@ make_changes_file() {
             ${previous_commit} -- pre_checkin.sh \
             "${image}" | sed "1 s/- \(.*$\)/\1/")
     popd 1> /dev/null
-    [ -z "${changes_log}" ] && abort "Missing new changelog entries"
+    [ -z "${changes_log}" ] && endScript "Missing new changelog entries"
     osc vc ${changes_file} -m "${changes_log}"
 }
 
diff --git a/root.obscpio b/root.obscpio
index fe7c4a3..5fc9df2 100644
--- a/root.obscpio
+++ b/root.obscpio
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e7b8b24078087555c38a79799841701026dfb612efb7e66f17bfe8a5c00b4123
+oid sha256:67ec9c0c7326f2489c891dfaaf27c997e9a5becb5d3a91aa27a8d32d9a0949ab
 size 2057