[SCM] debian-live branch, master, updated. 1.0_a48-1-67-gb814f79

Daniel Baumann daniel at debian.org
Tue Aug 12 20:51:11 UTC 2008


The following commit has been merged in the master branch:
commit 2c4cf93a9c8ce5da710c22b8fd98c890c4d9cf78
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Aug 12 22:36:48 2008 +0200

    Replacing remaining echo calls with proper echo functions.

diff --git a/functions/defaults.sh b/functions/defaults.sh
index dfcef21..a13de1b 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -96,8 +96,8 @@ Set_defaults ()
 		then
 			LH_BOOTSTRAP="cdebootstrap"
 		else
-			echo "E: Cannot find /usr/sbin/debootstrap or /usr/bin/cdebootstrap. Please install"
-			echo "E: debootstrap or cdebootstrap, or specify an alternative bootstrapping utility."
+			Echo_error "Cannot find /usr/sbin/debootstrap or /usr/bin/cdebootstrap. Please install"
+			Echo_error "E: debootstrap or cdebootstrap, or specify an alternative bootstrapping utility."
 			exit 1
 		fi
 	fi
@@ -159,7 +159,7 @@ Set_defaults ()
 		then
 			LH_FDISK="fdisk"
 		else
-			echo "E: Can't proces file /sbin/fdisk (FIXME)"
+			Echo_error "Can't proces file /sbin/fdisk"
 		fi
 	fi
 
@@ -175,7 +175,7 @@ Set_defaults ()
 		then
 			LH_LOSETUP="losetup"
 		else
-			echo "E: Can't process file /sbin/losetup (FIXME)"
+			Echo_error "Can't process file /sbin/losetup"
 		fi
 	fi
 
@@ -237,7 +237,7 @@ Set_defaults ()
 		then
 			LH_ARCHITECTURE="$(dpkg --print-architecture)"
 		else
-			echo "W: Can't process file /usr/bin/dpkg, setting architecture to i386"
+			Echo_warning "Can't process file /usr/bin/dpkg, setting architecture to i386"
 			LH_ARCHITECTURE="i386"
 		fi
 	fi

-- 
debian-live



More information about the debian-live-changes mailing list