gump-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r962763 - in /gump/live: ./ python/gump/actor/mvnrepoproxy/proxycontrol.py python/gump/core/update/bzr.py python/gump/core/update/darcs.py python/gump/core/update/hg.py
Date Sat, 10 Jul 2010 05:38:22 GMT
Author: bodewig
Date: Sat Jul 10 05:38:21 2010
New Revision: 962763

URL: http://svn.apache.org/viewvc?rev=962763&view=rev
Log:
merge support for multiple repository names, use it for java.net repository

Modified:
    gump/live/   (props changed)
    gump/live/python/gump/actor/mvnrepoproxy/proxycontrol.py
    gump/live/python/gump/core/update/bzr.py   (props changed)
    gump/live/python/gump/core/update/darcs.py   (props changed)
    gump/live/python/gump/core/update/hg.py   (props changed)

Propchange: gump/live/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jul 10 05:38:21 2010
@@ -1 +1 @@
-/gump/trunk:746160,746727,746892,747270,747272-747273,747656,748010,748018,748028,748661,748967,760784-761159,815848,953630-954169,955387,955837,956771,957107,957408,958453,958915,959344,959847,960260,960295,960297,960300,960303,961244
+/gump/trunk:746160,746727,746892,747270,747272-747273,747656,748010,748018,748028,748661,748967,760784-761159,815848,953630-954169,955387,955837,956771,957107,957408,958453,958915,959344,959847,960260,960295,960297,960300,960303,961244,961577

Modified: gump/live/python/gump/actor/mvnrepoproxy/proxycontrol.py
URL: http://svn.apache.org/viewvc/gump/live/python/gump/actor/mvnrepoproxy/proxycontrol.py?rev=962763&r1=962762&r2=962763&view=diff
==============================================================================
--- gump/live/python/gump/actor/mvnrepoproxy/proxycontrol.py (original)
+++ gump/live/python/gump/actor/mvnrepoproxy/proxycontrol.py Sat Jul 10 05:38:21 2010
@@ -29,12 +29,17 @@ from gump.core.run.actor import Abstract
 # list of tuples listing all repositories we want to mirror
 #   each tuple consists of a name, the path prefix that identifies the
 #   repository and the real repository URL without that prefix
-#   (properly escaped to be used in a Java .properties file
+#   (properly escaped to be used in a Java .properties file).
+# Since different mvn projects use different names for the same
+#  repository it is possible to have multiple listings for a single
+#  repo.  Each name has to be unique as has to be the combination of
+#  prefix and URL (i.e. each prefix must uniquely map to a real URL)
 PROXY_CONFIG = [
     ('central', '/maven2', 'http\://repo1.maven.org'),
     ('apache.snapshots', '/repo/m2-snapshot-repository',
      'http\://people.apache.org'),
-    ('maven2-repository.dev.java.net', '/maven/2', 'http\://download.java.net')
+    ('maven2-repository.dev.java.net', '/maven/2', 'http\://download.java.net'),
+    ('m2.dev.java.net', '/maven/2', 'http\://download.java.net')
     ]
 
 class MvnRepositoryProxyController(AbstractRunActor):
@@ -84,9 +89,12 @@ class MvnRepositoryProxyController(Abstr
  
         propsfile = tempfile.NamedTemporaryFile(mode = 'w+',
                                                 suffix = '.properties')
+        known_prefixes = {}
         log.info('Writing ' + propsfile.name)
         for (_name, prefix, url) in PROXY_CONFIG:
-            propsfile.write("%s=%s\n" % (prefix, url))
+            if prefix not in known_prefixes:
+                propsfile.write("%s=%s\n" % (prefix, url))
+                known_prefixes[prefix] = True
         propsfile.flush()
 
         try:

Propchange: gump/live/python/gump/core/update/bzr.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jul 10 05:38:21 2010
@@ -1 +1 @@
-/gump/trunk/python/gump/core/update/bzr.py:815848,953630-954169,955387,955837,956771,957107,957408,958453,958915,959344,959847,960260,960295,960297,960300,960303,961244
+/gump/trunk/python/gump/core/update/bzr.py:815848,953630-954169,955387,955837,956771,957107,957408,958453,958915,959344,959847,960260,960295,960297,960300,960303,961244,961577

Propchange: gump/live/python/gump/core/update/darcs.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jul 10 05:38:21 2010
@@ -1 +1 @@
-/gump/trunk/python/gump/core/update/darcs.py:815848,953630-954169,955387,955837,956771,957107,957408,958453,958915,959344,959847,960260,960295,960297,960300,960303,961244
+/gump/trunk/python/gump/core/update/darcs.py:815848,953630-954169,955387,955837,956771,957107,957408,958453,958915,959344,959847,960260,960295,960297,960300,960303,961244,961577

Propchange: gump/live/python/gump/core/update/hg.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jul 10 05:38:21 2010
@@ -1 +1 @@
-/gump/trunk/python/gump/core/update/hg.py:815848,953630-954169,955387,955837,956771,957107,957408,958453,958915,959344,959847,960260,960295,960297,960300,960303,961244
+/gump/trunk/python/gump/core/update/hg.py:815848,953630-954169,955387,955837,956771,957107,957408,958453,958915,959344,959847,960260,960295,960297,960300,960303,961244,961577



Mime
View raw message