From: Huang Hao <hao.h.huang@intel.com>
Date: Fri, 12 Oct 2012 08:02:04 +0000 (+0800)
Subject: Remove trailing slash for proxy env.
X-Git-Tag: 0.2~20
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c5c7b796ad5d67c6bf5fb0e9e7d1c7d7443ae4e7;p=tools%2Fdepanneur.git

Remove trailing slash for proxy env.

Fix #467.

Change-Id: I3dd6957593b3b9645f08dc936afe439ee0acebd9
---

diff --git a/depanneur b/depanneur
index c98c167..fc78b3a 100755
--- a/depanneur
+++ b/depanneur
@@ -438,7 +438,7 @@ sub clean_cache {
 sub query_git_commit_rev {
     my ($base, $commit_id) = @_;
 
-    open(my $git, '-|', "git --git-dir $base/.git rev-parse $commit_id") || 
+    open(my $git, '-|', "git --git-dir $base/.git rev-parse $commit_id") ||
         die "query git commit reversion($commit_id) failed: $!";
     my $rev = readline($git);
     close($git);
@@ -910,9 +910,20 @@ sub build_package {
 
 }
 
-
+sub strip_trailing_slash_for_proxy_env {
+    for my $key ("http_proxy", "https_proxy") {
+        if (exists $ENV{$key} && $ENV{$key} =~ m#/$#) {
+            #build could fail if proxy url ends with '/'
+            #failed: 500 Can't connect to xxx:xxx
+            $ENV{$key} =~ s#/+$##;
+            debug("strip trailing slash for env $key");
+        }
+    }
+}
 
 # MAIN
+strip_trailing_slash_for_proxy_env;
+
 info("start building packages from: " . $package_path . " ($style)");
 
 if ($buildall || @packs == 0 ) {