Tidyup get_cache and get_remote

Author: devcurmudgeon

ybd/assembly.py

@@ -30,15 +30,12 @@
 def assemble(defs, target):
     '''Assemble dependencies and contents recursively until target exists.'''
 
-    if cache.get_cache(defs, target):
-        return cache.cache_key(defs, target)
-
-    random.seed(datetime.datetime.now())
     component = defs.get(target)
-    if cache.get_remote_artifact(defs, component):
-        app.config['counter'] += 1
+    if cache.get_cache(defs, component) or cache.get_remote(defs, component):
         return cache.cache_key(defs, component)
 
+    random.seed(datetime.datetime.now())
+
     if component.get('arch') and component['arch'] != app.config['arch']:
         app.log(target, 'Skipping assembly for', component.get('arch'))
         return None

ybd/cache.py

@@ -172,7 +172,7 @@ def get_cache(defs, this):
     return False
 
 
-def get_remote_artifact(defs, this):
+def get_remote(defs, this):
     ''' If a remote cached artifact exists for this, retrieve it '''
     if app.config.get('kbas-url', 'http://foo.bar/') == 'http://foo.bar/':
         return False