You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by da...@apache.org on 2017/01/27 22:12:54 UTC
[1/2] incubator-trafficcontrol git commit: Fixes crash from requiring
module name before function calls
Repository: incubator-trafficcontrol
Updated Branches:
refs/heads/master b2a0443ab -> 43cfb5a19
Fixes crash from requiring module name before function calls
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/68ec6fb6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/68ec6fb6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/68ec6fb6
Branch: refs/heads/master
Commit: 68ec6fb697f9ba4f92fbff0d4bb473dd087bb8e4
Parents: b2a0443
Author: PeterRyder <pe...@gmail.com>
Authored: Fri Jan 27 14:10:37 2017 -0500
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Fri Jan 27 15:12:37 2017 -0700
----------------------------------------------------------------------
traffic_ops/install/bin/postinstall | 16 ++++++++--------
traffic_ops/install/lib/InstallUtils.pm | 4 ++--
2 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/68ec6fb6/traffic_ops/install/bin/postinstall
----------------------------------------------------------------------
diff --git a/traffic_ops/install/bin/postinstall b/traffic_ops/install/bin/postinstall
index 97f5028..7e13007 100755
--- a/traffic_ops/install/bin/postinstall
+++ b/traffic_ops/install/bin/postinstall
@@ -30,10 +30,10 @@ use Data::Dumper qw(Dumper);
use Scalar::Util qw(looks_like_number);
use Getopt::Long;
-use InstallUtils;
-use BuildPerlDeps;
+use InstallUtils qw{ :all };
+use BuildPerlDeps qw{ :all };
use GenerateCert qw{ :all };
-use ProfileCleanup;
+use ProfileCleanup qw{ :all };
# paths of the output configuration files
my $databaseConfFile = "/opt/traffic_ops/app/conf/production/database.conf";
@@ -122,10 +122,10 @@ sub getField {
# if hidden then dont show password in terminal
if ($hidden) {
- return promptPasswordVerify($question);
+ return InstallUtils::promptPasswordVerify($question);
}
else {
- return promptUser( $question, $config_answer );
+ return InstallUtils::promptUser( $question, $config_answer );
}
}
@@ -157,7 +157,7 @@ sub getConfig {
$config{ $var->{"config_var"} } = $answer;
if ( !$hidden ) {
- InstallUtils::logger( "$question: $answer", "info" );
+ InstallUtils::logger( "$question: $answer", "info" );
}
}
return %config;
@@ -351,10 +351,10 @@ sub sanityCheckConfig {
else {
InstallUtils::logger( "Prompting user for answer", "info" );
if ($hidden) {
- $answer = promptPasswordVerify($question);
+ $answer = InstallUtils::promptPasswordVerify($question);
}
else {
- $answer = promptUser( $question, $defaultValue->{$question} );
+ $answer = InstallUtils::promptUser( $question, $defaultValue->{$question} );
}
}
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/68ec6fb6/traffic_ops/install/lib/InstallUtils.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/install/lib/InstallUtils.pm b/traffic_ops/install/lib/InstallUtils.pm
index 7ba24d5..57f2e14 100644
--- a/traffic_ops/install/lib/InstallUtils.pm
+++ b/traffic_ops/install/lib/InstallUtils.pm
@@ -165,10 +165,10 @@ sub promptUser {
my ( $promptString, $defaultValue, $noEcho ) = @_;
if ($defaultValue) {
- print $promptString, " [", $defaultValue, "]: ";
+ print $promptString, " [", $defaultValue, "]: ";
}
else {
- print $promptString, ": ";
+ print $promptString, ": ";
}
if ( defined $noEcho && $noEcho ) {
[2/2] incubator-trafficcontrol git commit: This closes #238
Posted by da...@apache.org.
This closes #238
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/43cfb5a1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/43cfb5a1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/43cfb5a1
Branch: refs/heads/master
Commit: 43cfb5a191f8e3191c241446fa9516dfd0c27feb
Parents: 68ec6fb
Author: Dan Kirkwood <da...@gmail.com>
Authored: Fri Jan 27 15:12:58 2017 -0700
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Fri Jan 27 15:12:58 2017 -0700
----------------------------------------------------------------------
----------------------------------------------------------------------