Repository: incubator-trafficcontrol Updated Branches: refs/heads/master b36993a68 -> a276c36eb
fix perl5lib; require https module at the right point Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/a276c36e Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/a276c36e Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/a276c36e Branch: refs/heads/master Commit: a276c36eb88242a630a16c5d3f04ed354e69b275 Parents: e15ae7d Author: Dan Kirkwood <dang...@gmail.com> Authored: Wed Apr 12 12:10:28 2017 -0600 Committer: Jeremy Mitchell <mitchell...@gmail.com> Committed: Wed Apr 12 13:09:31 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/a276c36e/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/a276c36e/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";
