From: kiko%async.com.br <>
Date: Wed, 14 Apr 2004 01:52:50 +0000 (+0000)
Subject: Add a slightly hackish approach to test against values in .netrc that
X-Git-Tag: bugzilla-2.18rc1~92
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f57f60fd4e4cfce2351507f721c8eabc3ea33c3b;p=thirdparty%2Fbugzilla.git

Add a slightly hackish approach to test against values in .netrc that
diverge from the specified url by a trailing slash -- we *know* they're
not the same thing, but it seems people want us to think they are!
---

diff --git a/contrib/bugzilla-submit/bugzilla-submit b/contrib/bugzilla-submit/bugzilla-submit
index 3e721f41cc..d24fc38433 100755
--- a/contrib/bugzilla-submit/bugzilla-submit
+++ b/contrib/bugzilla-submit/bugzilla-submit
@@ -107,6 +107,16 @@ def get_credentials(bugzilla):
     except IOError, e:
         error("missing .netrc file %s" % str(e).split()[-1])
     ret = credentials.authenticators(authenticate_on)
+    if not ret:
+        # Okay, the literal string passed in failed. Just to make sure,
+        # try adding/removing a slash after the address and looking
+        # again. We don't know what format was used in .netrc, which is
+        # why this rather hackish approach is necessary.
+        if bugzilla[-1] == "/":
+            authenticate_on = '"' + bugzilla[:-1] + '"'
+        else:
+            authenticate_on = '"' + bugzilla + '/"'
+        ret = credentials.authenticators(authenticate_on)
     if not ret:
         # Apparently, an invalid machine URL will cause credentials == None
         error("no credentials for Bugzilla instance at %s" % bugzilla)