Compare commits

..

4 Commits

Author SHA1 Message Date
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
2 changed files with 7 additions and 1 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)
+4
View File
@@ -702,6 +702,7 @@ colord
colord-gtk
comedilib
compat-SDL2-soname1
compat-cryptsetup-soname4
compat-efivar-soname0
compat-fuse-soname2
compat-gegl
@@ -755,6 +756,7 @@ cups-filters
cups-pk-helper
curl
cve-check-tool
cxxfilt
cycler
dapl
darktable
@@ -1336,6 +1338,7 @@ meson
metacity
micro-config-drive
micro-config-drive-aws
micro-config-drive-oci
mido
minetest
minetest_game
@@ -1358,6 +1361,7 @@ mozjs52
mpc
mpfr
mpg123
mpi4py
msgpack-python
msmtp
msr-tools