From 10919038f000cd08be90091ad4c94fb47230e525 Mon Sep 17 00:00:00 2001 From: Stefano Belforte Date: Tue, 21 Jan 2020 14:31:29 -0600 Subject: [PATCH 1/3] typo: CLIENT vs. CLINET --- crab/crab-setup.sh.file | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/crab/crab-setup.sh.file b/crab/crab-setup.sh.file index 21237a75d0f..fe359d2a5ae 100644 --- a/crab/crab-setup.sh.file +++ b/crab/crab-setup.sh.file @@ -1,16 +1,16 @@ #!/bin/bash #CMSDIST_FILE_REVISION=1 case "X$1Y" in - XprodY|XdevY|XpreY) CRABCLINET_TYPE="$1" ;; - XY ) CRABCLINET_TYPE="prod" ;; + XprodY|XdevY|XpreY) CRABCLIENT_TYPE="$1" ;; + XY ) CRABCLIENT_TYPE="prod" ;; * ) echo "ERROR: Invalid CRAB type '$1' provided, valid values are prod, pre and dev." echo "Usage: $0 [prod|pre|dev]" return 1 ;; esac -export CRABCLINET_TYPE +export CRABCLIENT_TYPE crab_shared_dir="@CMS_PATH@/share/cms/crab/@CRAB_COMMON_VERSION@" -export PYTHONPATH="${crab_shared_dir}/lib/${CRABCLINET_TYPE}${PYTHONPATH:+:$PYTHONPATH}" -complete -F _UseCrab_${CRABCLINET_TYPE} -o filenames crab +export PYTHONPATH="${crab_shared_dir}/lib/${CRABCLIENT_TYPE}${PYTHONPATH:+:$PYTHONPATH}" +complete -F _UseCrab_${CRABCLIENT_TYPE} -o filenames crab unset crab_shared_dir From 75c5b020517ae35c3230251c2bd13ea27575425f Mon Sep 17 00:00:00 2001 From: Shahzad Malik Muzaffar Date: Wed, 22 Jan 2020 06:47:32 +0100 Subject: [PATCH 2/3] typo: rename CRABCLINET_TYPE to CRABCLIENT_TYPE --- crab/crab-setup.csh.file | 12 ++++++------ crab/crab.sh.file | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/crab/crab-setup.csh.file b/crab/crab-setup.csh.file index 13a10db7659..f39c3e13ccb 100644 --- a/crab/crab-setup.csh.file +++ b/crab/crab-setup.csh.file @@ -1,26 +1,26 @@ #!/bin/tcsh #CMSDIST_FILE_REVISION=1 -setenv CRABCLINET_TYPE "" +setenv CRABCLIENT_TYPE "" switch ("X$1Y") case XprodY: case XpreY: case XdevY: - setenv CRABCLINET_TYPE "$1" + setenv CRABCLIENT_TYPE "$1" breaksw case XY: - setenv CRABCLINET_TYPE "prod" + setenv CRABCLIENT_TYPE "prod" breaksw default: echo "ERROR: Invalid CRAB type '$1' provided. Valid values are prod, pre and dev." echo "Usage: $0 [prod|pre|dev]" breaksw endsw -if (${?CRABCLINET_TYPE}) then +if (${?CRABCLIENT_TYPE}) then set crab_shared_dir="@CMS_PATH@/share/cms/crab/@CRAB_COMMON_VERSION@" if (${?PYTHONPATH}) then - setenv PYTHONPATH "${crab_shared_dir}/lib/${CRABCLINET_TYPE}:$PYTHONPATH" + setenv PYTHONPATH "${crab_shared_dir}/lib/${CRABCLIENT_TYPE}:$PYTHONPATH" else - setenv PYTHONPATH "${crab_shared_dir}/lib/${CRABCLINET_TYPE}" + setenv PYTHONPATH "${crab_shared_dir}/lib/${CRABCLIENT_TYPE}" endif unset crab_shared_dir endif diff --git a/crab/crab.sh.file b/crab/crab.sh.file index d9048a01f85..49a5f9564b1 100755 --- a/crab/crab.sh.file +++ b/crab/crab.sh.file @@ -8,8 +8,8 @@ #Use crab-prod for default crab command crab_pkg=$(basename $0) if [ "${crab_pkg}" = "crab" ] ; then - if [ "$CRABCLINET_TYPE" = "" ] ; then CRABCLINET_TYPE="prod" ; fi - crab_pkg="crab-${CRABCLINET_TYPE}" + if [ "$CRABCLIENT_TYPE" = "" ] ; then CRABCLIENT_TYPE="prod" ; fi + crab_pkg="crab-${CRABCLIENT_TYPE}" fi #Search for latest crab version for cmsos From bbfd9a31a69c4481962516a2e3052f5ba08235de Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Wed, 22 Jan 2020 09:04:39 +0100 Subject: [PATCH 3/3] [BuildRules] Do not build a shared library/plugin if content of BuildFile are empty --- scram-project-build.file | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scram-project-build.file b/scram-project-build.file index e62b50ebde3..6dc564b24f2 100644 --- a/scram-project-build.file +++ b/scram-project-build.file @@ -64,7 +64,7 @@ Requires: glibc %endif %if "%{?configtag:set}" != "set" -%define configtag V05-08-74 +%define configtag V05-08-75 %endif %if "%{?cvssrc:set}" != "set"