From 67c14bfdac6ccc4d2b36fc12e9c2f8235a61c1c3 Mon Sep 17 00:00:00 2001
From: Mihai Patrascoiu <mihai.patrascoiu@cern.ch>
Date: Wed, 15 Sep 2021 15:44:29 +0200
Subject: [PATCH] Small changes to build setup: - Add print info function to
build script - Minor fixes to repo manager script
---
ci/common-rpm-build.sh | 10 ++++++++++
packaging/gfal2-repo-manager.py | 3 ++-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/ci/common-rpm-build.sh b/ci/common-rpm-build.sh
index 3bccae1..0544901 100755
--- a/ci/common-rpm-build.sh
+++ b/ci/common-rpm-build.sh
@@ -1,6 +1,14 @@
#!/usr/bin/env bash
set -e
+function print_info {
+ printf "======================\n"
+ printf "Distribution:\t%s\n" "$(rpm --eval "%{dist}" | cut -d. -f2)"
+ printf "Branch:\t\t%s\n" "${BRANCH}"
+ printf "Release:\t%s\n" "${RELEASE}"
+ printf "======================\n"
+}
+
TIMESTAMP=`date +%y%m%d%H%M`
GITREF=`git rev-parse --short HEAD`
BRANCH=`git name-rev $GITREF --name-only`
@@ -10,6 +18,8 @@ if [[ $BRANCH == tags/* ]]; then
RELEASE=
fi
+print_info
+
RPMBUILD=${PWD}/build
SRPMS=${RPMBUILD}/SRPMS
diff --git a/packaging/gfal2-repo-manager.py b/packaging/gfal2-repo-manager.py
index 98d944b..a13713d 100755
--- a/packaging/gfal2-repo-manager.py
+++ b/packaging/gfal2-repo-manager.py
@@ -32,6 +32,7 @@ def add_dependency(parser, when_present, dependency):
parser.error("argument --{0} is required when --{1} is present".format(dependency, when_present))
def declare_required(parser, args, choice):
+ choice = choice.replace("-", "_")
if not hasattr(args, choice):
parser.error("argument --{0} is required".format(choice))
@@ -126,7 +127,7 @@ class Repository(object):
raise ValueError("Cannot mix packages of different platforms in the same invocation: {0}".format(list(platforms)))
archs = set([x.arch for x in packages])
- archs.remove(None)
+ archs.discard(None)
if len(archs) != 1:
raise ValueError("Cannot mix packages of different architectures in the same invocation: {0}".format(list(archs)))
--
GitLab