[oe-commits] org.oe.dev zaurus-updater: have consistent error messages
koen commit
openembedded-commits at lists.openembedded.org
Fri Nov 23 19:11:12 UTC 2007
zaurus-updater: have consistent error messages
Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 3afb6317433537de597c1ebfc45a58487a538ff5
ViewMTN: http://monotone.openembedded.org/revision/info/3afb6317433537de597c1ebfc45a58487a538ff5
Files:
1
packages/zaurus-updater/zaurus-updater/updater.sh
packages/zaurus-updater/zaurus-updater.bb
Diffs:
#
# mt diff -r5e44ca0fbf18c98547d452fc98cef3371e4e9fc4 -r3afb6317433537de597c1ebfc45a58487a538ff5
#
#
#
# patch "packages/zaurus-updater/zaurus-updater/updater.sh"
# from [c0efdd12ede0381c80ff763c2f9999b8d6d722f8]
# to [9f8ab285d27ddaa7507c45b7ec4fe3b82c1b8b8e]
#
# patch "packages/zaurus-updater/zaurus-updater.bb"
# from [d8d6f55921f4ab9b5f5103bfc8d86a2485f2ac56]
# to [11c4539830f684b4da49831b50d6afd4032b4413]
#
============================================================
--- packages/zaurus-updater/zaurus-updater/updater.sh c0efdd12ede0381c80ff763c2f9999b8d6d722f8
+++ packages/zaurus-updater/zaurus-updater/updater.sh 9f8ab285d27ddaa7507c45b7ec4fe3b82c1b8b8e
@@ -20,6 +20,8 @@
# - size check unbreak
# - c760/c860 has bigger rootfs - use it
#
+# 2007.11.23 Koen Kooi
+# - consistent error messages
DATAPATH=$1
TMPPATH=/tmp/update
@@ -72,7 +74,7 @@ check_for_hdd()
{
IDE1=`get_dev_pcmcia_slot 1`
if [ "$IDE1" = "" ]; then
- echo "Error!! There is no microdrive. Retrying..."
+ echo "Error: There is no microdrive. Retrying..."
while [ "$IDE1" = "" ]; do
IDE1=`get_dev_pcmcia_slot 1`
done
@@ -95,7 +97,7 @@ check_for_tar()
done
if [ ! -e $TARBIN ]; then
- echo 'ERRROR: Please place a valid copy of tar as "gnu-tar" on your card.'
+ echo 'Error: Please place a valid copy of tar as "gnu-tar" on your card.'
echo 'Please reset'
while true
do
@@ -114,13 +116,13 @@ do_rootfs_extraction()
mke2fs $MKE2FSOPT /dev/${IDE1}1 > /dev/null 2>&1
e2fsck -p /dev/${IDE1}1 > /dev/null
if [ "$?" != "0" ]; then
- echo "ERROR: Unable to create filesystem on microdrive!"
+ echo "Error Unable to create filesystem on microdrive!"
exit "$?"
fi
mount -t $LINUXFMT -o noatime /dev/${IDE1}1 /hdd1
if [ "$?" != "0" ]; then
- echo "ERROR: Unable to mount microdrive!"
+ echo "Error: Unable to mount microdrive!"
exit "$?"
fi
@@ -128,7 +130,7 @@ do_rootfs_extraction()
echo 'Now extracting...'
gzip -dc $DATAPATH/$TARGETFILE | $TARBIN xf -
if [ "$?" != "0" ]; then
- echo "ERROR: Unable to extract root filesystem archive!"
+ echo "Error: Unable to extract root filesystem archive!"
exit "$?"
fi
@@ -144,7 +146,7 @@ do_flashing()
{
if [ $DATASIZE -gt `printf "%d" $MTD_PART_SIZE` ]
then
- echo "ERROR: File is too big to flash!"
+ echo "Error: File is too big to flash!"
return
fi
@@ -197,7 +199,7 @@ do_flashing()
then
next_addr=`/sbin/nandcp -a $ADDR $TMPDATA $TARGET_MTD 2>/dev/null | fgrep "mtd address" | cut -d- -f2 | cut -d\( -f1`
if [ "$next_addr" = "" ]; then
- echo "ERROR: flash write"
+ echo "Error: flash write"
rm $TMPDATA > /dev/null 2>&1
RESULT=3
break;
============================================================
--- packages/zaurus-updater/zaurus-updater.bb d8d6f55921f4ab9b5f5103bfc8d86a2485f2ac56
+++ packages/zaurus-updater/zaurus-updater.bb 11c4539830f684b4da49831b50d6afd4032b4413
@@ -1,7 +1,7 @@ LICENSE = "zaurus-updater"
DESCRIPTION = "Encrypted shellscript for the Zaurus ROM update"
DEPENDS = "encdec-updater-native"
LICENSE = "zaurus-updater"
-PR = "r11"
+PR = "r12"
PACKAGES = ""
PACKAGE_ARCH = "${MACHINE_ARCH}"
More information about the Openembedded-commits
mailing list