bump target: Stash repo first

In order to prevent content that wasn't committed from working its way
into a build, stash prior to doing the rest of the bump.

Signed-off-by: William Douglas <william.douglas@intel.com>

Makefile.common

@@ -223,6 +223,7 @@ scanlicense:
 #help the variable BUMP_MSG is set, its value is used as the commit summary.
 #help Otherwise a generic commit summary is used.
 bump:
+	git stash
 	git pull --rebase
 	$(MAKE) bumpnogit
 	git add $(SPECFILE) release

licenses-extra

@@ -5,3 +5,4 @@ GFDL-1.3+
 MIT-Opengroup
 WXwindows
 w3c
+libpng-2.0

packages

@@ -26,6 +26,7 @@ LibreCAD
 Linux-PAM
 LuaJIT
 LyX
+MangoHud
 MarkupSafe
 ModemManager
 MuseScore
@@ -62,6 +63,8 @@ R-BMA
 R-BatchJobs
 R-BayesFactor
 R-BiasedUrn
+R-Biobase
+R-BiocGenerics
 R-BiocManager
 R-BoolNet
 R-BradleyTerry2
@@ -266,6 +269,7 @@ R-calibrator
 R-callr
 R-car
 R-carData
+R-cards
 R-caret
 R-cclust
 R-cellranger
@@ -885,6 +889,7 @@ R-sessioninfo
 R-setRNG
 R-sets
 R-sf
+R-sfd
 R-sfsmisc
 R-sgeostat
 R-shape
@@ -1158,7 +1163,10 @@ avahi
 awesome-wm
 awscli
 axel
+azure-c-logging
 azure-configs
+azure-macro-utils-c
+azure-umock-c
 babeltrace
 babl
 baloo
@@ -1336,6 +1344,7 @@ compat-glibmm-soname24
 compat-gnome-bluetooth-soname-13
 compat-gsl-soname27
 compat-gtksourceview-soname3
+compat-icu4c-rolling
 compat-json-c-soname4
 compat-libffi-soname6
 compat-libffi-soname7
@@ -1560,7 +1569,6 @@ freeglut
 freeipmi
 freetype
 fribidi
-fritzing-app
 frozen
 fs
 fsarchiver
@@ -1570,6 +1578,7 @@ fwupd
 fwupd-efi
 garcon
 gawk
+gbinder-python
 gc
 gcab
 gcc
@@ -1589,8 +1598,6 @@ gdm
 geany
 geany-plugins
 geary
-gedit
-gedit-plugins-gnome
 geeqie
 gegl
 gengetopt
@@ -1688,6 +1695,9 @@ goaccess
 gobject-introspection
 golang-github-cpuguy83-go-md2man
 goocanvas
+google-benchmark
+google-cloud-cpp
+google-crc32c
 googletest
 gparted
 gpaste
@@ -1751,6 +1761,7 @@ gzip
 hamlib
 haproxy
 hardinfo
+hardinfo2
 harfbuzz
 haveged
 hdf5
@@ -1761,6 +1772,7 @@ help2man
 hexchat
 hexedit
 hicolor-icon-theme
+highway
 hiredis-c
 hostname
 howdy
@@ -1772,7 +1784,6 @@ hub
 hugo
 hunspell
 hwloc
-hyperscan
 hyphen
 i2c-tools
 i3
@@ -2181,6 +2192,7 @@ libfontenc
 libfprint
 libfreehand
 libftdi1
+libgbinder
 libgcrypt
 libgd
 libgdata
@@ -2189,6 +2201,7 @@ libgee
 libgeotiff
 libgit2
 libgit2-glib
+libglibutil
 libglvnd
 libgnome-keyring
 libgnomekbd
@@ -2273,6 +2286,7 @@ libodfgen
 libogg
 libopenmpt
 libopenzwave
+libopusenc
 liborcus
 libosinfo
 libpagemaker
@@ -2418,6 +2432,7 @@ llvm
 llvm14
 llvm15
 llvm16
+llvm17
 lm-sensors
 lmdb
 logrotate
@@ -2439,6 +2454,7 @@ luarocks
 lutris
 luv
 lv2
+lxc
 lynx
 lz4
 lzlib
@@ -2489,6 +2505,7 @@ micro-config-drive-aws
 micro-config-drive-equinix
 micro-config-drive-oci
 milou
+mimalloc
 mimetreeparser
 minetest
 minetest_game
@@ -2525,6 +2542,7 @@ motd-update
 motif
 mozjs102
 mozjs115
+mozjs128
 mozjs91
 mpc
 mpfr
@@ -3088,6 +3106,7 @@ perl-IPC-ShareLite
 perl-IPC-Shareable
 perl-IPC-System-Simple
 perl-Image-Base
+perl-Image-ExifTool
 perl-Image-Info
 perl-Image-Size
 perl-Image-Xbm
@@ -3441,7 +3460,6 @@ perl-Test-Without-Module
 perl-Test-YAML
 perl-Test-utf8
 perl-Test2-Plugin-NoWarnings
-perl-Test2-Suite
 perl-Text-Autoformat
 perl-Text-Brew
 perl-Text-CSV
@@ -3713,12 +3731,14 @@ pypi-acme
 pypi-adal
 pypi-aiodns
 pypi-aiofiles
+pypi-aiohappyeyeballs
 pypi-aiohttp
 pypi-aiohttp_cors
 pypi-aiosignal
 pypi-aiosmtpd
 pypi-aiosqlite
 pypi-alabaster
+pypi-altair
 pypi-altgraph
 pypi-amqp
 pypi-aniso8601
@@ -3858,6 +3878,7 @@ pypi-cons
 pypi-contextlib2
 pypi-contextvars
 pypi-contourpy
+pypi-controlnet_aux
 pypi-cookiecutter
 pypi-coverage
 pypi-coverage_enable_subprocess
@@ -3917,12 +3938,14 @@ pypi-docopt
 pypi-docstring_parser
 pypi-docstring_to_markdown
 pypi-docutils
+pypi-doit
 pypi-doxypypy
 pypi-doxyqml
 pypi-dpcontracts
 pypi-dulwich
 pypi-ecdsa
 pypi-editables
+pypi-einops
 pypi-elementpath
 pypi-enrich
 pypi-entrypoints
@@ -3973,6 +3996,7 @@ pypi-ftfy
 pypi-funcparserlib
 pypi-future
 pypi-gast
+pypi-gdown
 pypi-gevent
 pypi-geventhttpclient
 pypi-ghp_import
@@ -4119,6 +4143,9 @@ pypi-jupyterlab_link_share
 pypi-jupyterlab_pygments
 pypi-jupyterlab_server
 pypi-jupyterlab_widgets
+pypi-jupyterlite_core
+pypi-jupyterlite_pyodide_kernel
+pypi-jupyterlite_sphinx
 pypi-jxmlease
 pypi-kcc
 pypi-kerberos
@@ -4201,6 +4228,7 @@ pypi-mutagen
 pypi-mypy_extensions
 pypi-myst_nb
 pypi-myst_parser
+pypi-narwhals
 pypi-natsort
 pypi-nbclassic
 pypi-nbclient
@@ -4337,6 +4365,7 @@ pypi-pybind11
 pypi-pybtex
 pypi-pybtex_docutils
 pypi-pycares
+pypi-pyclip
 pypi-pyclipper
 pypi-pycodestyle
 pypi-pycollada
@@ -4609,6 +4638,7 @@ pypi-texttable
 pypi-threadpoolctl
 pypi-three_merge
 pypi-tifffile
+pypi-timm
 pypi-tinycss2
 pypi-tldextract
 pypi-tokenizers
@@ -4618,6 +4648,7 @@ pypi-tomli_w
 pypi-tomlkit
 pypi-toolz
 pypi-torchmetrics
+pypi-torchvision
 pypi-tornado
 pypi-tornado_xstatic
 pypi-tox
@@ -4796,8 +4827,10 @@ qemu
 qemu-guest-additions
 qgit
 qhull
+qmapshack
 qml-box2d
 qpdf
+qpl
 qqc2-desktop-style
 qrencode
 qscintilla
@@ -4895,7 +4928,6 @@ re2c
 readline
 rebootmgr
 recode
-redis-native
 redis2-nginx-module
 redland
 redsocks
@@ -4910,6 +4942,7 @@ rng-tools
 robin-map
 roboto
 rofi
+routino
 rpcbind
 rpcsvc-proto
 rpm
@@ -5085,6 +5118,7 @@ tig
 tigervnc
 time
 tini
+tinyxml2
 tiptop
 tk
 tmux
@@ -5135,7 +5169,10 @@ v4l-utils
 vala
 valgrind
 valijson
+valkey
+vapoursynth
 vbox-integration
+vectorscan
 vid.stab
 vifm
 vim
@@ -5148,12 +5185,14 @@ virt-manager
 virt-viewer
 vkd3d
 vlc
+volk
 volume_key
 vpnc
 vsqlite
 vte
 waffle
 wavpack
+waydroid
 wayland
 wayland-protocols
 waypipe
@@ -5167,10 +5206,12 @@ wget
 which
 whois
 wine
+winegui
 wireless-regdb-master
 wireplumber
 wireshark
 wl-clipboard
+wlrobs
 wlroots
 wmctrl
 woff2
@@ -5188,6 +5229,7 @@ xapian-core
 xastir
 xauth
 xbitmaps
+xboxdrv
 xcb-proto
 xcb-util-cursor
 xcb-util-xrm
@@ -5264,6 +5306,7 @@ xscreensaver
 xsel
 xset
 xsetroot
+xsimd
 xss-lock
 xterm
 xtrans

vendor.py

@@ -82,7 +82,11 @@ def update_cargo_vendor(path, name, git):
                    shell=True, check=True, stdout=subprocess.DEVNULL)
     repo = Repo(vendor_path)
     if not (len(repo.untracked_files) > 0 or repo.is_dirty()):
-        return False, ""
+        # Always use the newest tag as sometimes a new tag will
+        # be created but the package won't be updated to use it
+        # for a different failure reason.
+        tag = sorted(repo.tags, key=lambda x: x.name, reverse=True)[0]
+        return tag, cargo_vendors
     subprocess.run('git add .', cwd=vendor_path, shell=True, check=True,
                    stdout=subprocess.DEVNULL)
     subprocess.run('git commit -m "vendor update"', cwd=vendor_path,
@@ -139,7 +143,6 @@ def update_cargo_sources(name, tag, cargo_vendors):
 
 
 def main():
-    updated = False
     args = get_args()
 
     vtype = vendor_check()
@@ -150,13 +153,11 @@ def main():
     tdir = setup_content(args.url)
     if vtype == 'cargo':
         vdir = setup_cargo_vendor(tdir)
-        if vdir:
+        if not vdir:
+            print(args.archives)
+        else:
             tag, cargo_vendors = update_cargo_vendor(vdir, args.name, args.git)
-            if tag:
-                update_cargo_sources(args.name, tag, cargo_vendors)
-                updated = True
-    if not updated:
-        print(args.archives)
+            update_cargo_sources(args.name, tag, cargo_vendors)
     shutil.rmtree(tdir)