--- a/src/modules/publish/dependencies.py	Wed Jan 20 15:05:44 2010 +0000
+++ b/src/modules/publish/dependencies.py	Wed Jan 20 16:09:18 2010 -0800
@@ -352,6 +352,8 @@
         files = file_dep.attrs[files_prefix]
         if isinstance(files, basestring):
                 files = [files]
+        if isinstance(rps, basestring):
+                rps = [rps]
         return [os.path.join(rp, f) for rp in rps for f in files]
 
 def find_package_using_delivered_files(delivered, file_dep, dep_vars,
@@ -432,12 +434,10 @@
         return [a for a, v in res if a not in multiple_path_errs], dep_vars, \
             errs
 
-def find_package(api_inst, delivered, installed, file_dep, pkg_vars):
+def find_package(delivered, installed, file_dep, pkg_vars):
         """Find the packages which resolve the dependency. It returns a list of
         dependency actions with the fmri tag resolved.
 
-        'api_inst' is an ImageInterface which references the current image.
-
         'delivered' is a dictionary mapping paths to a list of fmri, variants
         pairs.
 
@@ -528,7 +528,7 @@
                         pkg_deps[mp] = None
                         continue
                 pkg_res = [
-                    (d, find_package(api_inst, delivered_files, installed_files,
+                    (d, find_package(delivered_files, installed_files,
                         d, pkg_vars))
                     for d in mfst.gen_actions_by_type("depend")
                     if is_file_dependency(d)