Compare commits

..

3 Commits

Author SHA1 Message Date
clrbuilder 26582bd9f2 Update packages file for version 23370
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-06-29 19:42:57 +00:00
clrbuilder c6a2d6fabd Update packages file for version 23350
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-06-29 12:03:01 +00:00
Patrick McCarty 2d8fc9a155 koji: exit early if spec has uncommitted changes
When running 'make koji', the tooling will attempt to create a new git
tag with a name constructed from the spec file's NVR.

However, if there are uncommitted changes to the Name, Version, or
Release fields (collectively, NVR) in that file, the new tag's name will
not match the NVR in the spec file referenced by commit HEAD.

Protect against the mismatch by exiting early from a 'make koji' if any
spec file modifications are not yet committed to the repo, and alert the
user what the problem is.

Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>
2018-06-27 17:46:25 -07:00
2 changed files with 41 additions and 0 deletions
+4
View File
@@ -293,6 +293,10 @@ koji: prekoji-checks kojidef
echo "Error: Must be on the master branch to submit to koji" >&2; \
exit 1; \
fi; \
if ! git diff --quiet HEAD ${SPECFILE}; then \
echo "Error: All changes to ${SPECFILE} must be committed first" >&2; \
exit 1; \
fi; \
if git rev-parse --verify --quiet origin/master > /dev/null; then \
git pull --rebase; \
fi
+37
View File
@@ -117,6 +117,8 @@ R-TeachingDemos
R-VGAM
R-VGAMdata
R-VIM
R-WikidataR
R-WikipediR
R-XML
R-abind
R-acepack
@@ -173,6 +175,7 @@ R-corrplot
R-cowplot
R-crayon
R-crosstalk
R-crul
R-curl
R-cvTools
R-data.table
@@ -210,11 +213,13 @@ R-ellipse
R-energy
R-estimability
R-evaluate
R-evd
R-expint
R-expm
R-fastICA
R-fastcluster
R-fastmatch
R-fauxpas
R-fda
R-ff
R-fields
@@ -262,6 +267,7 @@ R-hms
R-htmlTable
R-htmltools
R-htmlwidgets
R-httpcode
R-httpuv
R-httr
R-hunspell
@@ -492,10 +498,14 @@ R-tm
R-topicmodels
R-treatSens
R-tree
R-triebeard
R-trimcluster
R-truncdist
R-truncnorm
R-tseries
R-tsne
R-urca
R-urltools
R-utf8
R-uuid
R-vcd
@@ -504,7 +514,9 @@ R-viridis
R-viridisLite
R-visNetwork
R-webshot
R-webutils
R-whisker
R-wikitaxa
R-withr
R-xml2
R-xtable
@@ -1127,6 +1139,7 @@ kata-shim
kbd
kernel-install
kexec-tools
keychain
keyring
keyutils
khal
@@ -1520,21 +1533,28 @@ pecan
pep8
perftest
perl
perl-Algorithm-C3
perl-Archive-Extract
perl-B-Hooks-EndOfScope
perl-CPAN-Meta-Check
perl-Capture-Tiny
perl-Class-Accessor
perl-Class-C3
perl-Class-Data-Inheritable
perl-Class-Inspector
perl-Class-Singleton
perl-Class-Tiny
perl-Clone
perl-Crypt-SSLeay
perl-DBI
perl-DateTime
perl-DateTime-Locale
perl-DateTime-TimeZone
perl-Devel-Confess
perl-Devel-GlobalDestruction
perl-Devel-StackTrace
perl-Digest-CRC
perl-Digest-HMAC
perl-Digest-MD5
perl-Dist-CheckConflicts
perl-Encode-Locale
@@ -1546,6 +1566,7 @@ perl-ExtUtils-Config
perl-ExtUtils-Helpers
perl-ExtUtils-InstallPaths
perl-File-Copy-Recursive
perl-File-FcntlLock
perl-File-Listing
perl-File-MMagic
perl-File-ShareDir
@@ -1563,6 +1584,7 @@ perl-IO-Interactive-Tiny
perl-IO-Socket-SSL
perl-IO-stringy
perl-IPC-Run
perl-IPC-System-Simple
perl-Importer
perl-LWP-MediaTypes
perl-LWP-Protocol-https
@@ -1583,11 +1605,18 @@ perl-Module-ScanDeps
perl-Mozilla-CA
perl-Net-HTTP
perl-Net-SSLeay
perl-Package-Constants
perl-Package-Stash
perl-Package-Stash-XS
perl-Params-Classify
perl-Params-Validate
perl-Params-ValidationCompiler
perl-Path-Class
perl-Path-Tiny
perl-Perl4-CoreLibs
perl-PerlIO-gzip
perl-Pod-LaTeX
perl-Protocol-OSC
perl-Role-Tiny
perl-Scope-Guard
perl-Specio
@@ -1596,8 +1625,11 @@ perl-Sub-Identify
perl-Sub-Info
perl-Sub-Quote
perl-Sub-Uplevel
perl-Switch
perl-Sys-Hostname-Long
perl-TAP-Harness-Archive
perl-Term-Table
perl-TermReadKey
perl-Test-Deep
perl-Test-Exception
perl-Test-Fatal
@@ -1617,7 +1649,10 @@ perl-Test-utf8
perl-Test2-Suite
perl-Text-Autoformat
perl-Text-CSV_XS
perl-Text-Levenshtein
perl-Text-Reform
perl-Tie-IxHash
perl-TimeDate
perl-Try-Tiny
perl-URI
perl-Variable-Magic
@@ -1628,7 +1663,9 @@ perl-XML-SAX
perl-XML-SAX-Base
perl-XML-SAX-Expat
perl-XML-Simple
perl-YAML-LibYAML
perl-YAML-Tiny
perl-gettext
perl-libwww-perl
perl-namespace-autoclean
perl-namespace-clean