[svn] r5935 - trunk/tools/mrepo

[packagers at lists.rpmforge.net]

Author: dag
Date: 2007-10-22 15:01:39 +0200 (Mon, 22 Oct 2007)
New Revision: 5935

Modified:
   trunk/tools/mrepo/youget
Log:
Fixed a problem with \0 terminated mcookie and partnernet

Modified: trunk/tools/mrepo/youget
===================================================================
--- trunk/tools/mrepo/youget	2007-10-22 11:39:57 UTC (rev 5934)
+++ trunk/tools/mrepo/youget	2007-10-22 13:01:39 UTC (rev 5935)
@@ -93,14 +93,14 @@
         if not self.username and not self.password:
             if self.credpath:
                 try:
-                    self.username = open(os.path.join(self.credpath, 'mcookie')).read().rstrip()
-                    self.password = open(os.path.join(self.credpath, 'partnernet')).read().rstrip()
+                    self.username = open(os.path.join(self.credpath, 'mcookie')).read().rstrip().rstrip('\0')
+                    self.password = open(os.path.join(self.credpath, 'partnernet')).read().rstrip().rstrip('\0')
                 except:
                     die(1, 'Credentials directory %s does not contain mcookie and partnernet files.' % op.credpath)
             elif os.path.isdir('/etc/ximian'):
                 try:
-                    self.username = open('/etc/ximian/mcookie').read().rstrip()
-                    self.password = open('/etc/ximian/partnernet').read().rstrip()
+                    self.username = open('/etc/ximian/mcookie').read().rstrip().rstrip('\0')
+                    self.password = open('/etc/ximian/partnernet').read().rstrip().rstrip('\0')
                 except:
                     die(1, 'Credentials directory /etc/ximian does not contain mcookie and partnernet files.')
 
@@ -220,6 +220,8 @@
 def mirroryou(url, path):
     'Mirror a channel from YOU'
 
+    info(2, 'Using username %s with password %s.' % (op.username, op.password))
+
     ### Download packagelist for this channel
     info(2, 'Downloading packagelist from %s' % url)
     host = urlparse.urlparse(url)[1]