diff options
author | knu <knu@FreeBSD.org> | 2002-08-04 21:20:09 +0000 |
---|---|---|
committer | knu <knu@FreeBSD.org> | 2002-08-04 21:20:09 +0000 |
commit | 8713084d10e07aa6eebbe10bab3d0daad03ade3f (patch) | |
tree | b1a6d425b155fa34050dab08670300f3af4a9827 | |
parent | 0bfe37b8a2dbf8d6dd3c7bf97b0c4e0b14439865 (diff) | |
download | FreeBSD-src-8713084d10e07aa6eebbe10bab3d0daad03ade3f.zip FreeBSD-src-8713084d10e07aa6eebbe10bab3d0daad03ade3f.tar.gz |
Drop support for the .tbz2 suffix. One would not want pkg_create(1)
to create "pkgname.tbz" when one specifies "pkgname.tbz2".
MFC after: 1 week
-rw-r--r-- | usr.sbin/pkg_install/create/perform.c | 4 | ||||
-rw-r--r-- | usr.sbin/pkg_install/create/pkg_create.1 | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/usr.sbin/pkg_install/create/perform.c b/usr.sbin/pkg_install/create/perform.c index 1691b33..df4b5a2 100644 --- a/usr.sbin/pkg_install/create/perform.c +++ b/usr.sbin/pkg_install/create/perform.c @@ -69,10 +69,6 @@ pkg_perform(char **pkgs) Zipper = BZIP2; pkg[len - 4] = '\0'; } - else if ((len > 5) && (!strcmp(&pkg[len - 5], ".tbz2"))) { - Zipper = BZIP2; - pkg[len - 5] = '\0'; - } } if (Zipper == BZIP2) { suf = "tbz"; diff --git a/usr.sbin/pkg_install/create/pkg_create.1 b/usr.sbin/pkg_install/create/pkg_create.1 index 5ae414f..b2d5133 100644 --- a/usr.sbin/pkg_install/create/pkg_create.1 +++ b/usr.sbin/pkg_install/create/pkg_create.1 @@ -285,9 +285,9 @@ archive is explicitly specified by the recognizeable suffix of Currently .Nm recognizes the following suffixes: -.Pa .tgz , .tar , .tbz +.Pa .tbz , .tgz and -.Pa .tbz2 . +.Pa .tar . .It Fl y Compatibility synonym for .Fl j . |