Merge lp:~marcoceppi/charmrunner/graph-build-fix into lp:charmrunner

[Marco Ceppi]

[Kapil Thangavelu (hazmat)]

looks good to me.

=== modified file 'charmrunner/graph.py'
--- charmrunner/graph.py	2012-02-15 01:07:42 +0000
+++ charmrunner/graph.py	2013-04-26 20:44:22 +0000
@@ -138,8 +138,6 @@
         if (charm_id, interface) in graph.out_edges(charm_id):
             continue
 
-        providers[interface] = []
-
         for provider, providing in graph.in_edges(interface):
             if provider in BLACK_LIST:
                 continue
@@ -148,6 +146,8 @@
                     graph, provider,
                     requested=providing,
                     source=charm_id)):
+                if interface not in providers:
+                    providers[interface] = []
                 providers[interface].append(chain)
                 break  # pick the first solution
 

=== modified file 'charmrunner/server.py'
--- charmrunner/server.py	2013-03-08 16:27:15 +0000
+++ charmrunner/server.py	2013-04-26 20:44:22 +0000
@@ -63,7 +63,7 @@
             Rule('/plan/<series>/<name>',
                  defaults={'revno': None, 'owner': 'charmers'},
                  endpoint='plan'),
-            Rule('/plan/<series>/<name>-<revno>',
+            Rule('/plan/<series>/<name>:<revno>',
                  defaults={'owner': 'charmers'},
                  endpoint='plan')])
 
@@ -109,6 +109,7 @@
         plan_iter = get_test_plan(
             name, series=series, owner=owner, index=index)
         plan = next(plan_iter)
+
         return {'success': True,
                 'series': series,
                 'name': name,