Merge branch 'master' of git://git.qubes-os.org/marmarek/core into hvm
This commit is contained in:
		
						commit
						801590a373
					
				| @ -71,7 +71,6 @@ if [ "$DOIT" != "1" -a "$PKGS_FROM_CMDLINE" != "1" ]; then | |||||||
| fi | fi | ||||||
| 
 | 
 | ||||||
| if [ "$PKGS_FROM_CMDLINE" == 1 ]; then | if [ "$PKGS_FROM_CMDLINE" == 1 ]; then | ||||||
|     OPTS="$OPTS --resolve" |  | ||||||
|     GUI=0 |     GUI=0 | ||||||
| fi | fi | ||||||
| 
 | 
 | ||||||
| @ -81,11 +80,11 @@ set -e | |||||||
| 
 | 
 | ||||||
| if [ "$GUI" = 1 ]; then | if [ "$GUI" = 1 ]; then | ||||||
|     ( echo "1" |     ( echo "1" | ||||||
|     yumdownloader --destdir "$DOM0_UPDATES_DIR/packages" $OPTS $PKGLIST |     yumdownloader --resolve --destdir "$DOM0_UPDATES_DIR/packages" $OPTS $PKGLIST | ||||||
|     echo 100 ) | zenity --progress --pulsate --auto-close --auto-kill \ |     echo 100 ) | zenity --progress --pulsate --auto-close --auto-kill \ | ||||||
|          --text="Downloading updates for Dom0, please wait..." --title="Qubes Dom0 updates" |          --text="Downloading updates for Dom0, please wait..." --title="Qubes Dom0 updates" | ||||||
| else | else | ||||||
|     yumdownloader --destdir "$DOM0_UPDATES_DIR/packages" $OPTS $PKGLIST |     yumdownloader --resolve --destdir "$DOM0_UPDATES_DIR/packages" $OPTS $PKGLIST | ||||||
| fi | fi | ||||||
| 
 | 
 | ||||||
| if ls $DOM0_UPDATES_DIR/packages/*.rpm > /dev/null 2>&1; then | if ls $DOM0_UPDATES_DIR/packages/*.rpm > /dev/null 2>&1; then | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user
	 Joanna Rutkowska
						Joanna Rutkowska