Fix segfault

CVS patchset: 2136
CVS date: 1998/05/27 02:17:21

diff --git a/CHANGES b/CHANGES
index 039a0e4..0abf60c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -14,6 +14,7 @@
        - set file states for --justdb packages to "not installed"
        - handle missing file states properly in -e code
        - install time wasn missing for --justdb packages
+       - missing parameter in an rpmError() caused segfault
 
 2.4.109 -> 2.5:
        - fixed return code bug in build code

diff --git a/build/TODO b/build/TODO
index 760c195..448050e 100644 (file)
--- a/build/TODO
+++ b/build/TODO
@@ -1,3 +1,11 @@
+>I just found an odd little bug in rpm 2.5, when  there is something like
+>
+>%doc readme
+>
+>in the %files list, then if readme doesn't exit, rpm will just put an empty
+>doc directory in the package.
+
+
 option to %setup to *not* do chown/chgrp/chmod
 
 > Most of my spec files have empty Distribution: and Vendor: tag because I

diff --git a/build/parseScript.c b/build/parseScript.c
index cf83a92..048ad3e 100644 (file)
--- a/build/parseScript.c
+++ b/build/parseScript.c
@@ -131,7 +131,7 @@ int parseScript(Spec spec, int parsePart)
            if (prog[0] != '/') {
                rpmError(RPMERR_BADSPEC,
                         "line %d: script program must begin "
-                        "with \'/\': %s", prog);
+                        "with \'/\': %s", spec->lineNum, prog);
                FREE(argv);
                poptFreeContext(optCon);
                return RPMERR_BADSPEC;