[csw-devel] SF.net SVN: gar:[21921] csw/mgar/gar/v2/lib

wahwah at users.sourceforge.net wahwah at users.sourceforge.net
Sat Sep 14 17:36:14 CEST 2013


Revision: 21921
          http://gar.svn.sourceforge.net/gar/?rev=21921&view=rev
Author:   wahwah
Date:     2013-09-14 15:36:14 +0000 (Sat, 14 Sep 2013)
Log Message:
-----------
pkgdb: Store inf. who added a package to the catg

There was a bug where getpass was unconditionally used to store who inserted
a package to a catalog. The 'who' variable should be used instead.

pkgdb: Remove a comment about a proxy.

The comment was wrong.

Modified Paths:
--------------
    csw/mgar/gar/v2/lib/python/checkpkg_lib.py
    csw/mgar/gar/v2/lib/web/releases_web.py

Modified: csw/mgar/gar/v2/lib/python/checkpkg_lib.py
===================================================================
--- csw/mgar/gar/v2/lib/python/checkpkg_lib.py	2013-09-14 15:36:09 UTC (rev 21920)
+++ csw/mgar/gar/v2/lib/python/checkpkg_lib.py	2013-09-14 15:36:14 UTC (rev 21921)
@@ -1185,7 +1185,7 @@
         osrel=sqo_osrel,
         catrel=sqo_catrel,
         srv4file=sqo_srv4,
-        created_by=getpass.getuser())
+        created_by=who)
 
   def RemoveSrv4(self, sqo_srv4, osrel, arch, catrel):
     sqo_osrel, sqo_arch, sqo_catrel = self.GetSqlobjectTriad(

Modified: csw/mgar/gar/v2/lib/web/releases_web.py
===================================================================
--- csw/mgar/gar/v2/lib/web/releases_web.py	2013-09-14 15:36:09 UTC (rev 21920)
+++ csw/mgar/gar/v2/lib/web/releases_web.py	2013-09-14 15:36:14 UTC (rev 21921)
@@ -204,8 +204,7 @@
           srv4_to_remove = pkg_in_catalog.srv4file
           c.RemoveSrv4(srv4_to_remove, osrel_name, arch_name, catrel_name)
 
-      # Retrieving logged in user name from the HTTP environment.
-      # This does not work on the buildfarm. :-(
+      # This is set by basic HTTP auth.
       username = web.ctx.env.get('REMOTE_USER')
 
       c.AddSrv4ToCatalog(srv4, osrel_name, arch_name, catrel_name, who=username)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the devel mailing list