1) removed reference to var.h (which disappeared)

2) when source files aren't found, it prints the complete path it was
   looking for

CVS patchset: 248
CVS date: 1996/01/30 03:49:00

diff --git a/build/build.c b/build/build.c
index 3f3de02..5613ad1 100644 (file)
--- a/build/build.c
+++ b/build/build.c
@@ -20,7 +20,6 @@
 #include "rpmlib.h"
 #include "messages.h"
 #include "stringbuf.h"
-#include "var.h"
 #include "misc.h"
 #include "pack.h"
 
@@ -502,8 +501,7 @@ static int checkSources(Spec s)
     while (source) {
        sprintf(buf, "%s/%s", getVar(RPMVAR_SOURCEDIR), source->source);
        if (access(buf, R_OK)) {
-           error(RPMERR_BADSPEC, "missing source or patch: %s",
-                 source->source);
+           error(RPMERR_BADSPEC, "missing source or patch: %s", buf);
            return RPMERR_BADSPEC;
        }
        source = source->next;
@@ -515,7 +513,7 @@ static int checkSources(Spec s)
        if (package->icon) {
            sprintf(buf, "%s/%s", getVar(RPMVAR_SOURCEDIR), package->icon);
            if (access(buf, R_OK)) {
-               error(RPMERR_BADSPEC, "missing icon: %s", package->icon);
+               error(RPMERR_BADSPEC, "missing icon: %s", buf);
                return RPMERR_BADSPEC;
            }
        }