1) added RPMVAR_NETSHAREDPATH

2) don't exit w/ unknown options are in rpmrc files

CVS patchset: 1127
CVS date: 1996/10/21 02:18:54

diff --git a/lib/rpmrc.c b/lib/rpmrc.c
index 340601d..3175bda 100644 (file)
--- a/lib/rpmrc.c
+++ b/lib/rpmrc.c
@@ -79,6 +79,7 @@ struct option optionTable[] = {
     { "ftpport",               RPMVAR_FTPPORT,                 0 },
     { "ftpproxy",              RPMVAR_FTPPROXY,                0 },
     { "messagelevel",          RPMVAR_MESSAGELEVEL,            0 },
+    { "netsharedpath",         RPMVAR_NETSHAREDPATH,           0 },
     { "optflags",              RPMVAR_OPTFLAGS,                1 },
     { "packager",               RPMVAR_PACKAGER,                0 },
     { "pgp_name",               RPMVAR_PGP_NAME,                0 },
@@ -511,7 +512,7 @@ static int readRpmrc(FILE * f, char * fn, int readWhat) {
        if (!option) {
            error(RPMERR_RPMRC, "bad option '%s' at %s:%d\n", 
                        start, fn, linenum);
-           return 1;
+           continue;                   /* aborting here is rude */
        }
 
        if (readWhat == READ_OTHER) {