QubesOS/qubes-core-admin-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'qubesos/pr/43'

Browse Source 
* qubesos/pr/43:
  Fix some references to `yum` instead of `dnf`
This commit is contained in:
Marek Marczykowski-Górecki 2018-09-02 07:41:51 +02:00
commit b1c038e882
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dom0-updates/qubes-dom0-update
View File

@ -13,10 +13,10 @@ if [ "$1" = "--help" ]; then
echo "it checks for updates for installed packages" echo "it checks for updates for installed packages"
echo "" echo ""
echo "Usage: $0 [--clean] [--check-only] [--gui] [<pkg list>]" echo "Usage: $0 [--clean] [--check-only] [--gui] [<pkg list>]"
echo " --clean clean yum cache before doing anything" echo " --clean clean dnf cache before doing anything"
echo " --check-only only check for updates (no install)" echo " --check-only only check for updates (no install)"
echo " --gui use gpk-update-viewer for update selection" echo " --gui use gpk-update-viewer for update selection"
echo " --action=... use specific yum action, instead of automatic install/update" echo " --action=... use specific dnf action, instead of automatic install/update"
echo " <pkg list> download (and install if run by root) new packages" echo " <pkg list> download (and install if run by root) new packages"
echo " in dom0 instead of updating" echo " in dom0 instead of updating"
exit exit
@ -32,7 +32,7 @@ QVMRUN_OPTS=
CLEAN= CLEAN=
TEMPLATE= TEMPLATE=
TEMPLATE_BACKUP= TEMPLATE_BACKUP=
# Filter out some yum options and collect packages list # Filter out some dnf options and collect packages list
while [ $# -gt 0 ]; do while [ $# -gt 0 ]; do
case "$1" in case "$1" in
--enablerepo=*|\ --enablerepo=*|\
@ -134,7 +134,7 @@ if [ "$GUI" == "1" ]; then
done done
if [ -z "$guiapp" ]; then if [ -z "$guiapp" ]; then
message1="You don't have any supported yum frontend installed." message1="You don't have any supported dnf frontend installed."
message2="Install (using qubes-dom0-update) one of: $apps" message2="Install (using qubes-dom0-update) one of: $apps"
if [ "$KDE_FULL_SESSION" ]; then if [ "$KDE_FULL_SESSION" ]; then
@ -185,7 +185,7 @@ while pidof -x qubes-receive-updates >/dev/null; do sleep 0.5; done
if [ -r /var/lib/qubes/updates/errors ]; then if [ -r /var/lib/qubes/updates/errors ]; then
echo "*** ERROR while receiving updates:" >&2 echo "*** ERROR while receiving updates:" >&2
cat /var/lib/qubes/updates/errors >&2 cat /var/lib/qubes/updates/errors >&2
echo "--> if you want to use packages that were downloaded correctly, use yum directly now" >&2 echo "--> if you want to use packages that were downloaded correctly, use dnf directly now" >&2
exit 1 exit 1
fi fi
@ -221,7 +221,7 @@ elif [ -f /var/lib/qubes/updates/repodata/repomd.xml ]; then
$guiapp $guiapp
else else
dnf check-update dnf check-update
if [ $? -eq 100 ]; then # Run yum with options if [ $? -eq 100 ]; then # Run dnf with options
dnf $YUM_OPTS $YUM_ACTION dnf $YUM_OPTS $YUM_ACTION
fi fi
fi fi