diff options
| -rw-r--r-- | pkgtools/rpm2pkg/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/rpm2pkg/files/rpm2pkg.c | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/pkgtools/rpm2pkg/Makefile b/pkgtools/rpm2pkg/Makefile index 2d0c0efa940..c485c743e69 100644 --- a/pkgtools/rpm2pkg/Makefile +++ b/pkgtools/rpm2pkg/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.52 2010/09/08 22:41:39 tron Exp $ +# $NetBSD: Makefile,v 1.53 2010/11/11 13:07:34 tron Exp $ -DISTNAME= rpm2pkg-3.1.5 +DISTNAME= rpm2pkg-3.1.6 CATEGORIES= pkgtools MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/rpm2pkg/files/rpm2pkg.c b/pkgtools/rpm2pkg/files/rpm2pkg.c index 406e6c6e8b3..ec970852723 100644 --- a/pkgtools/rpm2pkg/files/rpm2pkg.c +++ b/pkgtools/rpm2pkg/files/rpm2pkg.c @@ -1,4 +1,4 @@ -/* $NetBSD: rpm2pkg.c,v 1.17 2010/09/08 22:41:39 tron Exp $ */ +/* $NetBSD: rpm2pkg.c,v 1.18 2010/11/11 13:07:34 tron Exp $ */ /*- * Copyright (c) 2001-2010 The NetBSD Foundation, Inc. @@ -944,7 +944,8 @@ main(int argc, char **argv) } } - if ((Name = StripPrefix(Name, StripCount)) == NULL) { + if (Fields[CPIO_HDR_MODE] != 0 && + (Name = StripPrefix(Name, StripCount)) == NULL) { (void)fprintf(stderr, "%s: Leading path to strip too " "big (-s %d)\n", |