summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Eden <yamakuzure@gmx.net>2013-11-25 09:08:22 +0100
committerSven Eden <yamakuzure@gmx.net>2013-11-25 09:08:22 +0100
commit583d6c70e4e06a60445a0f9e744914c96f14c79a (patch)
treeb27f2482ce4c3c73cb66ce91389e1ac78d61ace5
parentAdded error messages and reporting of those if the file parsing failes. (diff)
downloadufed-583d6c70e4e06a60445a0f9e744914c96f14c79a.tar.gz
ufed-583d6c70e4e06a60445a0f9e744914c96f14c79a.tar.bz2
ufed-583d6c70e4e06a60445a0f9e744914c96f14c79a.zip
ufed.pl/Portage.pm: Parsing error messages from eval are now chomp'ed
-rw-r--r--Portage.pm4
-rw-r--r--ufed.pl.in3
2 files changed, 4 insertions, 3 deletions
diff --git a/Portage.pm b/Portage.pm
index e9edaab..d3bed35 100644
--- a/Portage.pm
+++ b/Portage.pm
@@ -999,8 +999,8 @@ sub _read_sh {
}
}
};
- defined($@) and length($@) and
- die "Parse error in $fname\n - Error: \"$@\"\n";
+ defined($@) and length($@) and chomp $@
+ and die "Parse error in $fname\n - Error: \"$@\"\n";
}
_merge_env(\%env);
return %env if wantarray;
diff --git a/ufed.pl.in b/ufed.pl.in
index 37f7957..3d1e354 100644
--- a/ufed.pl.in
+++ b/ufed.pl.in
@@ -335,7 +335,8 @@ sub save_flags {
}
}
};
- defined($@) and length($@) and die "\nParse error when writing make.conf"
+ defined($@) and length($@) and chomp $@
+ and die "\nParse error when writing make.conf"
. " - did you modify it while ufed was running?\n"
. " - Error: \"$@\"\n";