Compare commits

...

8 Commits

Author SHA1 Message Date
clrbuilder ace60d849e Update packages file for version 22530
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-05-21 13:02:36 +00:00
clrbuilder a2759eca40 Update packages file for version 22520
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-05-20 14:28:39 +00:00
clrbuilder 7d0977c785 Update packages file for version 22450
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-05-17 02:48:06 +00:00
Patrick McCarty 9184a2fd62 user-setup: support abs/rel paths for cert options
Support both absolute and relative paths for the cert options, instead
of relative paths only, by using realpath(1) to resolve the arguments.

(Note that the script cannot reference the path arguments verbatim
because much of the script operates in the workspace's toplevel
directory, which is a different location than where the script is
invoked. In that situation, relative paths would not resolve.)

Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>
2018-05-15 14:50:09 -07:00
clrbuilder e80c6eb4bd Update packages file for version 22420
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-05-15 17:22:37 +00:00
clrbuilder 5cf5fd71cb Update packages file for version 22410
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-05-15 13:02:06 +00:00
clrbuilder 4b01a5a9cd Update packages file for version 22390
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-05-14 19:02:44 +00:00
Patrick McCarty 4910ef0882 koji: only pull --rebase if remote is initialized
After running 'make autospecnew', the freshly created repo only exists locally,
so the repo remote is not yet initialized. The 'git pull --rebase' (via 'make
koji') will then fail due to the uninitialized remote. Improve this case by
only rebasing when the remote is initialized.

Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>
2018-05-14 11:49:26 -07:00
3 changed files with 19 additions and 4 deletions
+3 -1
View File
@@ -286,8 +286,10 @@ koji: prekoji-checks kojidef
@if ! git branch | grep -q -E '^\* master'; then \
echo "Error: Must be on the master branch to submit to koji" >&2; \
exit 1; \
fi; \
if git rev-parse --verify --quiet origin/master > /dev/null; then \
git pull --rebase; \
fi
git pull --rebase
git tag $(SRPMVERS)
git push origin master refs/tags/$(SRPMVERS)
$(KOJI_CMD) build $$KOJI_NOWAIT $(KOJI_TAG) $(PKG_BASE_URL)/$(PKG_NAME)?#$(SRPMVERS)
+13
View File
@@ -225,6 +225,7 @@ R-formatR
R-fpc
R-futile.logger
R-futile.options
R-future
R-gam
R-gamm4
R-gbm
@@ -239,6 +240,7 @@ R-ggplot2movies
R-ggridges
R-git2r
R-glmnet
R-globals
R-glue
R-gmodels
R-gmp
@@ -277,6 +279,7 @@ R-labelled
R-laeken
R-lambda.r
R-lars
R-later
R-latticeExtra
R-lava
R-lazyeval
@@ -285,6 +288,7 @@ R-leaflet
R-leaps
R-lfe
R-libcoin
R-listenv
R-lle
R-lme4
R-lmtest
@@ -374,6 +378,7 @@ R-processx
R-prodlim
R-profileModel
R-progress
R-promises
R-proto
R-proxy
R-pryr
@@ -702,6 +707,7 @@ colord
colord-gtk
comedilib
compat-SDL2-soname1
compat-cryptsetup-soname4
compat-efivar-soname0
compat-fuse-soname2
compat-gegl
@@ -755,6 +761,7 @@ cups-filters
cups-pk-helper
curl
cve-check-tool
cxxfilt
cycler
dapl
darktable
@@ -776,6 +783,7 @@ diffoscope
diffstat
diffutils
dist-pam-configs
distro
dmenu
dmidecode
dnf
@@ -905,6 +913,7 @@ glib
glib-networking
glibc
glibmm
glmark2
global
glog
glslang
@@ -1283,6 +1292,7 @@ libxslt
libyami
libyami-utils
libzip
libzmq
linecache2
links
linux
@@ -1336,6 +1346,7 @@ meson
metacity
micro-config-drive
micro-config-drive-aws
micro-config-drive-oci
mido
minetest
minetest_game
@@ -1358,6 +1369,7 @@ mozjs52
mpc
mpfr
mpg123
mpi4py
msgpack-python
msmtp
msr-tools
@@ -1853,6 +1865,7 @@ testresources
testscenarios
testtools
texinfo
texlive
tflearn
thermal_daemon
thin-provisioning-tools
+3 -3
View File
@@ -36,15 +36,15 @@ while [ $# -gt 0 ]; do
;;
"--client-cert"|"-k")
shift
PEM="$PWD/$1"
PEM="$(realpath $1)"
;;
"--server-ca"|"-s")
shift
SERVERCA="$PWD/$1"
SERVERCA="$(realpath $1)"
;;
"--client-ca"|"-c")
shift
CLIENTCA="$PWD/$1"
CLIENTCA="$(realpath $1)"
;;
"--jobs"|"-j")
if echo "$2" | grep -qx "[1-9][0-9]*"; then