Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/marmarek/core

Conflicts:
	dom0/qvm-tools/qvm-backup-restore

common/qubes_download_dom0_updates.sh

@@ -4,14 +4,27 @@ DOM0_UPDATES_DIR=/var/lib/qubes/dom0-updates
 
 DOIT=0
 GUI=1
+CLEAN=0
+OPTS="--installroot $DOM0_UPDATES_DIR"
+PKGLIST=
 while [ -n "$1" ]; do
-    if [ "x--doit" = "x$1" ]; then
-        DOIT=1
-    elif [ "x--nogui" = "x$1" ]; then
-        GUI=0
-    else
-        break
-    fi
+    case "$1" in
+        --doit)
+            DOIT=1
+            ;;
+        --nogui)
+            GUI=0
+            ;;
+        --clean)
+            CLEAN=1
+            ;;
+        -*)
+            OPTS="$OPTS $1"
+            ;;
+        *)
+            PKGLIST="$PKGLIST $1"
+            ;;
+    esac
     shift
 done
 
@@ -23,11 +36,13 @@ fi
 mkdir -p $DOM0_UPDATES_DIR/etc
 cp /etc/yum.conf $DOM0_UPDATES_DIR/etc/
 
-PKGLIST="$*"
+if [ "x$CLEAN" = "1" ]; then
+    yum $OPTS clean all
+fi
 
 if [ "x$PKGLIST" = "x" ]; then
     echo "Checking for dom0 updates..."
-    PKGLIST=`yum --installroot $DOM0_UPDATES_DIR check-update -q | cut -f 1 -d ' '`
+    PKGLIST=`yum $OPTS check-update -q | cut -f 1 -d ' '`
 else
     PKGS_FROM_CMDLINE=1
 fi
@@ -38,13 +53,12 @@ if [ -z "$PKGLIST" ]; then
 fi
 
 if [ "$DOIT" != "1" -a "$PKGS_FROM_CMDLINE" != "1" ]; then
-    PKGCOUNT=`echo $PKGLIST|wc -w`
     zenity --question --title="Qubes Dom0 updates" \
-      --text="$PKGCOUNT updates for dom0 available. Do you want to download its now?" || exit 0
+      --text="There are updates for dom0 available, do you want to download them now?" || exit 0
 fi
 
 if [ "$PKGS_FROM_CMDLINE" == 1 ]; then
-    OPTS="--resolve"
+    OPTS="$OPTS --resolve"
     GUI=0
 fi
 
@@ -54,11 +68,11 @@ set -e
 
 if [ "$GUI" = 1 ]; then
     ( echo "1"
-    yumdownloader --destdir "$DOM0_UPDATES_DIR/packages" --installroot "$DOM0_UPDATES_DIR" $OPTS $PKGLIST
+    yumdownloader --destdir "$DOM0_UPDATES_DIR/packages" $OPTS $PKGLIST
     echo 100 ) | zenity --progress --pulsate --auto-close --auto-kill \
          --text="Downloading updates for Dom0, please wait..." --title="Qubes Dom0 updates"
 else
-    yumdownloader --destdir "$DOM0_UPDATES_DIR/packages" --installroot "$DOM0_UPDATES_DIR" $OPTS $PKGLIST
+    yumdownloader --destdir "$DOM0_UPDATES_DIR/packages" $OPTS $PKGLIST
 fi
 
 if ls $DOM0_UPDATES_DIR/packages/*.rpm > /dev/null 2>&1; then