r2691 - dists/trunk/live-helper/helpers

matth-guest at alioth.debian.org matth-guest at alioth.debian.org
Sat Aug 4 21:58:04 UTC 2007


Author: matth-guest
Date: 2007-08-04 21:58:04 +0000 (Sat, 04 Aug 2007)
New Revision: 2691

Modified:
   dists/trunk/live-helper/helpers/lh_chroot_localization
Log:
fix bad logic


Modified: dists/trunk/live-helper/helpers/lh_chroot_localization
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_localization	2007-08-04 21:09:53 UTC (rev 2690)
+++ dists/trunk/live-helper/helpers/lh_chroot_localization	2007-08-04 21:58:04 UTC (rev 2691)
@@ -613,33 +613,33 @@
 	do
 		case "${LOCALIZATION}" in
 			iceape)
-				Check_installed chroot/usr/bin/iceape iceape || Check_package iceape-l10n-"${ICEAPE}"
+				Check_installed chroot/usr/bin/iceape iceape; [ $INSTALL_STATUS -eq 0 ] && Check_package "" iceweasel-l10n-"${ICEAPE}"
 				;;
 
 			icedove)
-				Check_installed chroot/usr/bin/icedove icedove || Check_package icedove-locale-"${ICEDOVE}"
+				Check_installed chroot/usr/bin/icedove icedove; [ $INSTALL_STATUS -eq 0 ] && Check_package "" icedove-locale-"${ICEDOVE}"
 				;;
 
 			iceweasel)
-				Check_installed chroot/usr/bin/iceweasel iceweasel || Check_package iceweasel-l10n-"${ICEWEASEL}" 
+				Check_installed chroot/usr/bin/iceweasel iceweasel; [ $INSTALL_STATUS -eq 0 ] && Check_package "" iceweasel-l10n-"${ICEWEASEL}" 
 				;;
 
 			kde)
-				Check_installed chroot/usr/bin/kstart kdebase-bin || Check_package kde-i18n-"${KDE}" 
+				Check_installed chroot/usr/bin/kstart kdebase-bin; [ $INSTALL_STATUS -eq 0 ] && Check_package "" kde-i18n-"${KDE}" 
 				;;
 
 			koffice)
-				Check_installed chroot/usr/bin/koconverter koffice || Check_package koffice-i18n-"${KOFFICE}"
+				Check_installed chroot/usr/bin/koconverter koffice; [ $INSTALL_STATUS -eq 0 ] && Check_package "" koffice-i18n-"${KOFFICE}"
 				;;
 
 			openoffice)
-				Check_installed chroot/usr/bin/ooffice openoffice.org-common || Check_package openoffice.org-l10n-"${OPENOFFICE}" 
+				Check_installed chroot/usr/bin/ooffice openoffice.org-common; [ $INSTALL_STATUS -eq 0 ] && Check_package "" openoffice.org-l10n-"${OPENOFFICE}" 
 				;;
 		esac
 	done
 
-	Check_installed chroot/usr/bin/gwenview gwenview || Check_package gwenview-i18n 
-	Check_installed chroot/usr/bin/k3b k3b || Check_package k3b-i18n
+	Check_installed chroot/usr/bin/gwenview gwenview; [ $INSTALL_STATUS -eq 0 ] && Check_package "" gwenview-i18n 
+	Check_installed chroot/usr/bin/k3b k3b; [ $INSTALL_STATUS -eq 0 ] && Check_package "" k3b-i18n
 
 	# Restoring cache
 	Restore_cache cache/packages_localization




More information about the debian-live-changes mailing list