You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by fr...@apache.org on 2017/04/20 18:39:58 UTC
[09/44] incubator-trafficcontrol git commit: fix perl5lib;
require https module at the right point
fix perl5lib; require https module at the right point
(cherry picked from commit a276c36eb88242a630a16c5d3f04ed354e69b275)
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/21270652
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/21270652
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/21270652
Branch: refs/heads/2.0.x
Commit: 212706525d155c544624c8cfb2c5bae58bf3d2a5
Parents: f5bdcf0
Author: Dan Kirkwood <da...@gmail.com>
Authored: Wed Apr 12 12:10:28 2017 -0600
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Wed Apr 19 15:35:18 2017 -0600
----------------------------------------------------------------------
traffic_ops/install/bin/postinstall | 2 +-
traffic_ops/install/lib/ProfileCleanup.pm | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/21270652/traffic_ops/install/bin/postinstall
----------------------------------------------------------------------
diff --git a/traffic_ops/install/bin/postinstall b/traffic_ops/install/bin/postinstall
index b113224..70e39d9 100755
--- a/traffic_ops/install/bin/postinstall
+++ b/traffic_ops/install/bin/postinstall
@@ -14,7 +14,7 @@
# limitations under the License.
#
-use lib qw(/opt/traffic_ops/install/lib);
+use lib qw(/opt/traffic_ops/install/lib /opt/traffic_ops/app/local/lib/perl5);
$ENV{PATH} = "/opt/traffic_ops/install/bin:$ENV{PATH}";
use strict;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/21270652/traffic_ops/install/lib/ProfileCleanup.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/install/lib/ProfileCleanup.pm b/traffic_ops/install/lib/ProfileCleanup.pm
index d9828cc..f9ffa01 100644
--- a/traffic_ops/install/lib/ProfileCleanup.pm
+++ b/traffic_ops/install/lib/ProfileCleanup.pm
@@ -179,6 +179,9 @@ sub profiles_exist {
InstallUtils::logger( "Checking profiles at $tmurl using username " . $config->{"username"}, "info" );
my $uri = $parameters->{'tm.url'};
+
+ # This module gets installed during BuildPerlDeps portion, so require here when it's available.
+ require 'LWP/Protocol/https.pm';
my $toCookie = get_traffic_ops_cookie( $parameters->{'tm.url'}, $config->{"username"}, $config->{"password"} );
my $profileEndpoint = "/api/1.2/profiles.json";