Fake buglet fix: if PLIST_SRC directly follows PLIST_CWD, ignore

the PLIST_CWD in creating the tar pipe.

This takes care of pkg_create -p PREFIX -s FAKE
where PREFIX does not exist at pkg creation time.

diff --git a/usr.sbin/pkg_install/create/perform.c b/usr.sbin/pkg_install/create/perform.c
index 02e6fc8..83ab6f8 100644 (file)
--- a/usr.sbin/pkg_install/create/perform.c
+++ b/usr.sbin/pkg_install/create/perform.c
@@ -1,7 +1,7 @@
-/*     $OpenBSD: perform.c,v 1.9 1999/07/28 12:35:00 espie Exp $       */
+/*     $OpenBSD: perform.c,v 1.10 2000/03/24 00:24:18 espie Exp $      */
 
 #ifndef lint
-static const char *rcsid = "$OpenBSD: perform.c,v 1.9 1999/07/28 12:35:00 espie Exp $";
+static const char *rcsid = "$OpenBSD: perform.c,v 1.10 2000/03/24 00:24:18 espie Exp $";
 #endif
 
 /*
@@ -288,6 +288,10 @@ make_dist(char *home, char *pkg, char *suffix, package_t *plist)
            fprintf(flist, "%s\n", p->name);
        }
        else if (p->type == PLIST_CWD || p->type == PLIST_SRC) {
+           /* XXX let PLIST_SRC override PLIST_CWD */
+           if (p->type == PLIST_CWD && p->next != NULL && 
+               p->next->type == PLIST_SRC)
+                   continue;
            if (flist) 
                fclose(flist);
            flist = 0;