summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-11-28 11:39:37 +0100
committerGitHub <noreply@github.com>2019-11-28 11:39:37 +0100
commitaa95726c98385fb75bc70b6de7a86c09ed74abd5 (patch)
treec0ac6928834c066adcc599fa0c699382d7653502
parent2178875fa7975f00a4da15fef9809cd3fb74feba (diff)
parent7605387a70f06b34c22e1dda00092f32c94aaf66 (diff)
downloadpodman-aa95726c98385fb75bc70b6de7a86c09ed74abd5.tar.gz
podman-aa95726c98385fb75bc70b6de7a86c09ed74abd5.tar.bz2
podman-aa95726c98385fb75bc70b6de7a86c09ed74abd5.zip
Merge pull request #4579 from ssbarnea/fix/build
Improved build_rpm.sh
-rw-r--r--.gitignore4
-rw-r--r--contrib/build_rpm.sh2
2 files changed, 4 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 54b63518f..f14f08396 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
/.artifacts/
/_output/
/brew
-/conmon/conmon.o
+/conmon/
/docs/*.[158]
/docs/*.[158].gz
/docs/remote
@@ -27,3 +27,5 @@ podman-remote*.zip
podman*.tar.gz
.idea*
.vscode*
+contrib/spec/podman.spec
+*.rpm
diff --git a/contrib/build_rpm.sh b/contrib/build_rpm.sh
index 1132ef380..c79e49772 100644
--- a/contrib/build_rpm.sh
+++ b/contrib/build_rpm.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-set -x
+set -euxo pipefail
pkg_manager=`command -v dnf`
if [ -z "$pkg_manager" ]; then