From: Michael Prokop <mika@grml.org>
Date: Mon, 2 Mar 2009 21:05:22 +0000 (+0100)
Subject: Simplify warning message for addons
X-Git-Tag: v0.9.2^0
X-Git-Url: https://git.grml.org/?p=grml2usb.git;a=commitdiff_plain;h=3d76d27db540095900c011d91a7a7496fd594702;hp=f4fc10bf2026ad09b69280f3d57f826bbaf26cfd

Simplify warning message for addons
---

diff --git a/grml2usb b/grml2usb
index f232c8d..c3d7beb 100755
--- a/grml2usb
+++ b/grml2usb
@@ -1031,8 +1031,7 @@ def copy_addons(iso_mount, target):
     # grub all-in-one image
     allinoneimg = search_file('allinone.img', iso_mount)
     if allinoneimg is None:
-        logging.warn("Warning: allinone.img not found - can not install it...")
-        logging.warn(" |-> that's fine if you don't need it")
+        logging.warn("Warning: allinone.img not found (that's fine if you don't need it")
     else:
         logging.debug("cp %s %s" % (allinoneimg, addons + '/allinone.img'))
         proc = subprocess.Popen(["cp", allinoneimg, addons + 'allinone.img'])
@@ -1041,8 +1040,7 @@ def copy_addons(iso_mount, target):
     # bsd imag
     bsdimg = search_file('bsd4grml', iso_mount)
     if bsdimg is None:
-        logging.warn("Warning: bsd4grml not found - can not install it...")
-        logging.warn(" |-> that's fine if you don't need it")
+        logging.warn("Warning: bsd4grml not found (that's fine if you don't need it")
     else:
         logging.debug("cp -a %s %s" % (bsdimg, addons + '/'))
         proc = subprocess.Popen(["cp", "-a", bsdimg, addons + '/'])
@@ -1051,8 +1049,7 @@ def copy_addons(iso_mount, target):
     # freedos image
     balderimg = search_file('balder10.imz', iso_mount)
     if balderimg is None:
-        logging.warn("Warning: balder10.imz not found - can not install it...")
-        logging.warn(" |-> that's fine if you don't need it")
+        logging.warn("Warning: balder10.imz not found (that's fine if you don't need it")
     else:
         logging.debug("cp %s %s" % (balderimg, addons + '/balder10.imz'))
         proc = subprocess.Popen(["cp", balderimg, addons + 'balder10.imz'])
@@ -1061,8 +1058,7 @@ def copy_addons(iso_mount, target):
     # memdisk image
     memdiskimg = search_file('memdisk', iso_mount)
     if memdiskimg is None:
-        logging.warn("Warning: memdisk not found - can not install it...")
-        logging.warn(" |-> that's fine if you don't need it")
+        logging.warn("Warning: memdisk not found (that's fine if you don't need it")
     else:
         logging.debug("cp %s %s" % (memdiskimg, addons + '/memdisk'))
         proc = subprocess.Popen(["cp", memdiskimg, addons + 'memdisk'])
@@ -1071,8 +1067,7 @@ def copy_addons(iso_mount, target):
     # memtest86+ image
     memtestimg = search_file('memtest', iso_mount)
     if memtestimg is None:
-        logging.warn("Warning: memtest not found - can not install it...")
-        logging.warn(" |-> that's fine if you don't need it")
+        logging.warn("Warning: memtest not found (that's fine if you don't need it")
     else:
         logging.debug("cp %s %s" % (memtestimg, addons + '/memtest'))
         proc = subprocess.Popen(["cp", memtestimg, addons + 'memtest'])