From a6ac43cf28ddf0db720eb98f1ae0454c991821dd Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Mon, 24 Nov 2008 18:52:30 -0800 Subject: Need to fix some stuff from change to Vyatta:: I wanted to use Vyatta::Config::Output, but the perl part of the autoconf installer is to stupid to handle directory trees, so had to limit it to one directory per package. So name should have been Vyatta::ConfigOutput... --- lib/Vyatta/Config.pm | 6 +++--- scripts/vyatta-output-config.pl | 2 +- scripts/vyatta-save-config.pl | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/Vyatta/Config.pm b/lib/Vyatta/Config.pm index 7074d9c..9e57448 100755 --- a/lib/Vyatta/Config.pm +++ b/lib/Vyatta/Config.pm @@ -433,7 +433,7 @@ sub createActiveDOMTree { my $self = shift; - my $tree = new Vyatta::Config::DOMTree($self->{_active_dir_base} . $self->{_current_dir_level},"active"); + my $tree = new Vyatta::ConfigDOMTree($self->{_active_dir_base} . $self->{_current_dir_level},"active"); return $tree; } @@ -443,7 +443,7 @@ sub createChangesOnlyDOMTree { my $self = shift; - my $tree = new Vyatta::Config::DOMTree($self->{_changes_only_dir_base} . $self->{_current_dir_level}, + my $tree = new Vyatta::ConfigDOMTree($self->{_changes_only_dir_base} . $self->{_current_dir_level}, "changes_only"); return $tree; @@ -455,7 +455,7 @@ sub createNewConfigDOMTree { my $self = shift; my $level = $self->{_new_config_dir_base} . $self->{_current_dir_level}; - return new Vyatta::Config::DOMTree($level, "new_config"); + return new Vyatta::ConfigDOMTree($level, "new_config"); } diff --git a/scripts/vyatta-output-config.pl b/scripts/vyatta-output-config.pl index e47f718..a632297 100755 --- a/scripts/vyatta-output-config.pl +++ b/scripts/vyatta-output-config.pl @@ -21,7 +21,7 @@ use strict; use lib "/opt/vyatta/share/perl5"; -use Vyatta::Config::Output; +use Vyatta::ConfigOutput; if ($ARGV[0] eq '-all') { shift; diff --git a/scripts/vyatta-save-config.pl b/scripts/vyatta-save-config.pl index f33a693..dd53d51 100755 --- a/scripts/vyatta-save-config.pl +++ b/scripts/vyatta-save-config.pl @@ -21,7 +21,7 @@ use strict; use lib "/opt/vyatta/share/perl5"; -use Vyatta::Config::Output; +use Vyatta::ConfigOutput; my $etcdir = "/opt/vyatta/etc"; my $bootpath = $etcdir . "/config"; -- cgit v1.2.3