summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorStig Thormodsrud <stig@vyatta.com>2010-11-09 18:14:18 -0800
committerStig Thormodsrud <stig@vyatta.com>2010-11-09 18:14:18 -0800
commitcd9b0d5fa108fe3a24ea8c71cd6be7d0d39f240f (patch)
tree8e254269ecb72fd7fb77b5677974f5185687df0c /lib
parente8e887cb4e7ce38c5e0a0eca8069c0bb2225969d (diff)
parentb63ee9b6c597397f5c80a0b161a8638977f469cc (diff)
downloadvyatta-cfg-cd9b0d5fa108fe3a24ea8c71cd6be7d0d39f240f.tar.gz
vyatta-cfg-cd9b0d5fa108fe3a24ea8c71cd6be7d0d39f240f.zip
Merge branch 'mendocino' of http://git.vyatta.com/vyatta-cfg into mendocino
Diffstat (limited to 'lib')
-rwxr-xr-xlib/Vyatta/Config.pm11
1 files changed, 7 insertions, 4 deletions
diff --git a/lib/Vyatta/Config.pm b/lib/Vyatta/Config.pm
index e8fda29..28326dd 100755
--- a/lib/Vyatta/Config.pm
+++ b/lib/Vyatta/Config.pm
@@ -676,13 +676,16 @@ sub compareValueLists {
return %comp_hash;
}
+
sub outputError {
my ($location, $msg) = @_;
- print STDERR $msg . "\n";
if (defined($ENV{VYATTA_OUTPUT_ERROR_LOCATION})) {
- foreach my $elem (@$location) {
- print STDERR "errloc:[" . $elem . "]\n";
- }
+ foreach my $elem (@$location) {
+ print STDERR "_errloc_:[" . $elem . "]\n" . $msg . "\n";
+ }
+ }
+ else {
+ print STDERR $msg . "\n";
}
}