[Debburn-changes] r555 - in cdrkit/trunk: . debian wodim

[Eduard Bloch]

Author: blade
Date: 2006-12-04 11:57:40 +0100 (Mon, 04 Dec 2006)
New Revision: 555

Modified:
   cdrkit/trunk/Changelog
   cdrkit/trunk/debian/changelog
   cdrkit/trunk/wodim/wodim.c
Log:
    + more verbose abort message if track is specified with some maintainance
      command (closes: #369677)



Modified: cdrkit/trunk/Changelog
===================================================================
--- cdrkit/trunk/Changelog	2006-12-03 13:50:09 UTC (rev 554)
+++ cdrkit/trunk/Changelog	2006-12-04 10:57:40 UTC (rev 555)
@@ -1,6 +1,7 @@
 cdrkit (1.1.1) UNRELEASED; urgency=low
 
-  * 
+  * more verbose abort message if track is specified with some maintainance
+    command (#369677)
 
  -- Eduard Bloch <blade at debian.org>  Sat,  2 Dec 2006 23:05:33 +0100
 

Modified: cdrkit/trunk/debian/changelog
===================================================================
--- cdrkit/trunk/debian/changelog	2006-12-03 13:50:09 UTC (rev 554)
+++ cdrkit/trunk/debian/changelog	2006-12-04 10:57:40 UTC (rev 555)
@@ -1,6 +1,8 @@
 cdrkit (9:1.1.0-2) unstable; urgency=low
 
-  * 
+  * new ...
+    + more verbose abort message if track is specified with some maintainance
+    command (closes: #369677)
 
  -- Eduard Bloch <blade at debian.org>  Sat,  2 Dec 2006 23:05:18 +0100
 

Modified: cdrkit/trunk/wodim/wodim.c
===================================================================
--- cdrkit/trunk/wodim/wodim.c	2006-12-03 13:50:09 UTC (rev 554)
+++ cdrkit/trunk/wodim/wodim.c	2006-12-04 10:57:40 UTC (rev 555)
@@ -3731,8 +3731,10 @@
 	}
 	if (*flagsp & (F_LOAD|F_DLCK|F_SETDROPTS|F_MSINFO|F_TOC|F_PRATIP|F_FIX|F_VERSION|F_CHECKDRIVE|F_PRCAP|F_INQUIRY|F_SCANBUS|F_RESET|F_ABORT)) {
 		if (tracks != 0) {
-			errmsgno(EX_BAD, "No tracks allowed with this option\n");
-			susage(EX_BAD);
+       printf(stderr,
+             "No tracks allowed with -load, -lock, -setdropts, -msinfo, -toc, -atip, -fix,\n"
+             "-version, -checkdrive, -prcap, -inq, -scanbus, -reset and -abort options.\n" );
+       exit(EXIT_FAILURE);
 		}
 		return ispacket;
 	}