summaryrefslogtreecommitdiff
path: root/usr.sbin/pkg_add/OpenBSD/Add.pm
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2019-08-19 12:25:41 +0000
committerMarc Espie <espie@cvs.openbsd.org>2019-08-19 12:25:41 +0000
commitdf1cd4c8c6b2f86dbc0fd56e33ab834589d1e3b7 (patch)
treef9bb57f4ce3239a2ead27d1b73acae1bc7206d3f /usr.sbin/pkg_add/OpenBSD/Add.pm
parentf184101187571cffeb771416e4029d2810d17550 (diff)
-Pcdrom is nonsensical now, so error out properly on it.
Prompted and okay danj@
Diffstat (limited to 'usr.sbin/pkg_add/OpenBSD/Add.pm')
-rw-r--r--usr.sbin/pkg_add/OpenBSD/Add.pm6
1 files changed, 1 insertions, 5 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/Add.pm b/usr.sbin/pkg_add/OpenBSD/Add.pm
index 1ff26b855a5..eb93531e725 100644
--- a/usr.sbin/pkg_add/OpenBSD/Add.pm
+++ b/usr.sbin/pkg_add/OpenBSD/Add.pm
@@ -1,5 +1,5 @@
# ex:ts=8 sw=4:
-# $OpenBSD: Add.pm,v 1.182 2019/07/10 11:15:15 espie Exp $
+# $OpenBSD: Add.pm,v 1.183 2019/08/19 12:25:40 espie Exp $
#
# Copyright (c) 2003-2014 Marc Espie <espie@openbsd.org>
#
@@ -311,10 +311,6 @@ sub prepare_for_addition
{
my ($self, $state, $pkgname) = @_;
- if ($state->{cdrom_only} && $self->{cdrom} ne 'yes') {
- $state->errsay("Package #1 is not for cdrom", $pkgname);
- $state->{problems}++;
- }
if ($state->{ftp_only} && $self->{ftp} ne 'yes') {
$state->errsay("Package #1 is not for ftp", $pkgname);
$state->{problems}++;