Changeset 26494

Timestamp:

Dec 29, 2009, 11:07:56 AM (16 years ago)

Author:

bills

Message:

files given on command line take precedence over those in the
run metadata

File:

• trunk/ppImage/src/ppImageDefineFile.c (modified) (2 diffs)

trunk/ppImage/src/ppImageDefineFile.c

@@ -12 +12 @@
 
     if (!file) {
-        // look for the file on the RUN metadata
-        file = pmFPAfileDefineFromRun(&status, NULL, config, filerule);
+        // look for the file on the argument list
+        file = pmFPAfileDefineFromArgs(&status, config, filerule, argname);
         if (!status) {
             psError(PS_ERR_UNKNOWN, false, "failed to load file definition");
@@ -20 +20 @@
     }
     if (!file) {
-        // look for the file on the argument list
-        file = pmFPAfileDefineFromArgs(&status, config, filerule, argname);
+        // look for the file on the RUN metadata
+        file = pmFPAfileDefineFromRun(&status, NULL, config, filerule);
         if (!status) {
             psError(PS_ERR_UNKNOWN, false, "failed to load file definition");