Compare commits

..

10 Commits

Author SHA1 Message Date
clrbuilder 865997ad69 Update packages file for version 30450
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2019-07-19 08:02:20 +00:00
clrbuilder 70bfbe8c17 Update packages file for version 30440
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2019-07-18 08:02:19 +00:00
Patrick McCarty 3b1e4e5558 pullrebase: skip rebase if current branch is up-to-date
Any attempt at rebasing is unnecessary when the current branch is
up-to-date with the remote, so skip the rebase in this case.

Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>
2019-07-17 12:54:04 -07:00
clrbuilder 2465219907 Update packages file for version 30420
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2019-07-17 16:15:58 +00:00
clrbuilder 77775f060c Update packages file for version 30410
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2019-07-16 18:03:37 +00:00
clrbuilder 67406f7be2 Update packages file for version 30400
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2019-07-16 10:01:43 +00:00
clrbuilder 9bece241c0 Update packages file for version 30380
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2019-07-15 10:02:02 +00:00
clrbuilder 602cc9563f Update packages file for version 30360
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2019-07-13 17:54:20 +00:00
George T Kramer 02b5ad93e3 Place koji user configuration in user folder
Avoid placing koji.conf in a system-level directory

Signed-off-by: George T Kramer <george.t.kramer@intel.com>
2019-07-11 17:10:09 -07:00
clrbuilder fb40533923 Update packages file for version 30320
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2019-07-11 12:02:13 +00:00
3 changed files with 21 additions and 10 deletions
+4
View File
@@ -143,6 +143,10 @@ pullrebase:
echo "No commits exist in remote. Continuing."; \
exit 0; \
fi; \
if [ "$$(git rev-list FETCH_HEAD | head -n 1)" = "$$(git rev-list HEAD | head -n 1)" ]; then \
echo "Current branch up-to-date. Continuing."; \
exit 0; \
fi; \
echo "Rebasing to origin/master"; \
if git status --porcelain | grep -q '^.[^?]'; \
then \
+15 -8
View File
@@ -1007,6 +1007,7 @@ appstream
appstream-glib
apr
apr-util
arandr
arc-theme
argcomplete
argon2
@@ -1119,6 +1120,7 @@ boto
boto3
botocore
bovo
brasero
breathe
breeze
breeze-gtk
@@ -1307,7 +1309,7 @@ compat-icu4c-soname63
compat-ilmbase-soname23
compat-intel-gmmlib-soname1
compat-ipset-soname10
compat-ldc-soname84
compat-iptables-soname0.1.0
compat-libgit2-soname27
compat-libical-soname2
compat-libidn-soname11
@@ -1327,10 +1329,6 @@ compat-opencv-soname33
compat-opencv-soname34
compat-openexr-soname23
compat-openssl-soname-10
compat-poppler-soname78
compat-poppler-soname82
compat-poppler-soname83
compat-poppler-soname86
compat-proj-soname13
compat-protobuf-soname14
compat-protobuf-soname15
@@ -1522,6 +1520,7 @@ dmidecode
dmlc-core
dnf
dnf-plugins-core
dns-lexicon
dnsmasq
dnspython
doc8
@@ -1992,6 +1991,7 @@ itsdangerous
itstool
iw
ixion
jack2
jansson
jaraco.functools
jarn.viewdoc
@@ -2105,6 +2105,7 @@ keditbookmarks
keepalived
keepassxc
kemoticons
kerberos
kernel-config
kernel-config-checker
kernel-install
@@ -2454,6 +2455,7 @@ libpeas
libpfm
libpinyin
libpipeline
libplacebo
libpng
libpsl
libpthread-stubs
@@ -2566,7 +2568,6 @@ linux-libc-headers
linux-lts2017
linux-lts2018
linux-mainline
linux-networktest
linux-oracle
linux-preempt-rt
linux-steam-integration
@@ -2633,7 +2634,6 @@ mariadb
mash
materia-theme
matplotlib
maven-dep
mc
mccabe
mcelog
@@ -2670,6 +2670,7 @@ mkfontdir
mkfontscale
mkl-dnn
mkosi
mlocate
mlt
mobile-broadband-provider-info
mock
@@ -3901,6 +3902,9 @@ phonon
phonon-vlc
phoronix-test-suite
php
php-APCu
php-gnupg
php-igbinary
php-imagick
php-mailparse
php-redis
@@ -4028,7 +4032,6 @@ pygtk
pygtkglext
pyhs100
pyinotify
pykerberos
pykwalify
pylama
pyliblzma
@@ -4108,6 +4111,7 @@ python-polib
python-rpm-legacypython
python-saharaclient
python-senlinclient
python-slip
python-slugify
python-subunit
python-swiftclient
@@ -4217,6 +4221,7 @@ repoze.lru
repoze.sphinx.autointerface
repoze.who
requests
requests-file
requests-kerberos
requests-mock
requests-ntlm
@@ -4389,6 +4394,7 @@ stow
strace
stress-ng
stunnel
su-exec
subunit
subunit2sql
subversion
@@ -4484,6 +4490,7 @@ tinyrpc
tinyxml2
tiptop
tk
tldextract
tmux
todoist
tokyocabinet
+2 -2
View File
@@ -145,9 +145,9 @@ if [ "$USE_KOJI" ]; then
cp "$CLIENTCA" ~/.koji/clientca.crt
cp "$SERVERCA" ~/.koji/serverca.crt
if [ ! -f /etc/koji.conf ]; then
if [ ! -f ~/.koji/config ]; then
echo "Setting up koji config . . ."
sudo cp projects/common/conf/koji.conf /etc
cp -f projects/common/conf/koji.conf ~/.koji/config
fi
fi