extras-repoclosure PackageOwners.py,1.17,1.18

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/fedora/extras-repoclosure
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9700

Modified Files:
	PackageOwners.py 
Log Message:
FAS auth was changed again: adapt the patch was applied to EPEL repoclosure in FI cvs


Index: PackageOwners.py
===================================================================
RCS file: /cvs/fedora/extras-repoclosure/PackageOwners.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- PackageOwners.py	2 Jun 2008 12:30:55 -0000	1.17
+++ PackageOwners.py	16 Jun 2008 04:10:00 -0000	1.18
@@ -210,7 +210,10 @@
                 time.sleep(self.retrysecs)
             try:
                 opener = FancyURLopener()
-                f = opener.open(url)
+                if self.username:
+                    f = opener.open(url, data='user_name=%s&password=%s&login=Login' % (self.username, self.password))
+                else:
+                    f = opener.open(url)
                 rc = 0
                 if 'www-authenticate' in f.headers:
                     rc = 1
@@ -235,16 +238,7 @@
 
 
     def _downloadfrompkgdb(self):
-        # Construct an URL that makes FancyURLopener use authentication
-        # with the first request and not just in return to 401.
-        authinfo = ''
-        if self.username:
-            authinfo = self.username
-            if self.password:
-                authinfo += ':'+self.password
-            authinfo += '@'
-        fas2authurl = 'https://%sadmin.fedoraproject.org/accounts/group/dump/' % authinfo
-
+        fas2authurl = 'https://admin.fedoraproject.org/accounts/group/dump/'
         fasdump = self._getlinesfromurl(fas2authurl)
         self.usermap = {}
         for line in fasdump: