--- mysql_install_db	2013-02-06 16:46:05.000000000 +0000
+++ mysql_install_db.lmorgado-16197542	2013-02-06 16:42:17.000000000 +0000
@@ -402,7 +402,8 @@
 
 if ( $opt->{srcdir} and $opt->{basedir} )
 {
-  error("Specify either --basedir or --srcdir, not both");
+  error($opt,
+	"Specify either --basedir or --srcdir, not both");
 }
 if ( $opt->{srcdir} )
 {
@@ -440,8 +441,8 @@
   $copy_cfg_file =~ s/my.cnf/my-new.cnf/;
   # Too early to print warning here, the user may not notice
 }
-open (TEMPL, $cfg_template) or error("Could not open config template");
-open (CFG, "> $copy_cfg_file") or error("Could not open config file");
+open (TEMPL, $cfg_template) or error($opt, "Could not open config template");
+open (CFG, "> $copy_cfg_file") or error($opt, "Could not open config file");
 while (<TEMPL>)
 {
   # Remove lines beginning with # *** which are template comments