diff options
author | Marc Espie <espie@cvs.openbsd.org> | 2004-09-24 09:06:51 +0000 |
---|---|---|
committer | Marc Espie <espie@cvs.openbsd.org> | 2004-09-24 09:06:51 +0000 |
commit | ba785dab6248bcde04d4ff22282f7e0535cf6d53 (patch) | |
tree | d3b8a9f8fcc32795b7838fdc74429a6fee231a39 /usr.sbin | |
parent | 73809da9c56d21a311e53a9aa2d05de875b871c6 (diff) |
ditch `config' in the @sample messages, since this more or less covers
all files installed from templates.
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/pkg_add/pkg_add | 10 | ||||
-rw-r--r-- | usr.sbin/pkg_add/pkg_delete | 14 |
2 files changed, 12 insertions, 12 deletions
diff --git a/usr.sbin/pkg_add/pkg_add b/usr.sbin/pkg_add/pkg_add index 9ab2965371d..ec0b847a90f 100644 --- a/usr.sbin/pkg_add/pkg_add +++ b/usr.sbin/pkg_add/pkg_add @@ -1,7 +1,7 @@ #! /usr/bin/perl # ex:ts=8 sw=4: -# $OpenBSD: pkg_add,v 1.60 2004/09/21 22:17:49 espie Exp $ +# $OpenBSD: pkg_add,v 1.61 2004/09/24 09:06:50 espie Exp $ # # Copyright (c) 2003-2004 Marc Espie <espie@openbsd.org> # @@ -179,7 +179,7 @@ sub install } my $origname = $destdir.$orig->fullname(); if (-e $filename) { - print "The existing configuration file $filename has NOT been changed\n"; + print "The existing file $filename has NOT been changed\n"; if (defined $orig->{md5}) { require OpenBSD::md5; @@ -193,13 +193,13 @@ sub install } } else { if ($not) { - print "The configuration file $filename would be installed from $origname\n"; + print "The file $filename would be installed from $origname\n"; } else { if (!copy($origname, $filename)) { - print STDERR "Configuration file $filename could not be installed:\n\t$!\n"; + print STDERR "File $filename could not be installed:\n\t$!\n"; } $self->set_modes($filename); - print "The configuration file $filename has been installed from $origname\n"; + print "The file $filename has been installed from $origname\n"; } } } diff --git a/usr.sbin/pkg_add/pkg_delete b/usr.sbin/pkg_add/pkg_delete index 81da1d12e5b..a6595a790fc 100644 --- a/usr.sbin/pkg_add/pkg_delete +++ b/usr.sbin/pkg_add/pkg_delete @@ -1,6 +1,6 @@ #!/usr/bin/perl # ex:ts=8 sw=4: -# $OpenBSD: pkg_delete,v 1.47 2004/09/24 08:49:27 espie Exp $ +# $OpenBSD: pkg_delete,v 1.48 2004/09/24 09:06:50 espie Exp $ # # Copyright (c) 2003-2004 Marc Espie <espie@openbsd.org> # @@ -279,15 +279,15 @@ sub delete } my $origname = $state->{destdir}.$orig->fullname(); if (! -e $realname) { - print "Config file $realname does not exist\n"; + print "File $realname does not exist\n"; return; } if (! -f $realname) { - print "Config file $realname is not a file\n"; + print "File $realname is not a file\n"; return; } if (!defined $orig->{md5}) { - print "Problem: config file $name does not have an md5 checksum\n"; + print "Problem: file $name does not have an md5 checksum\n"; print "NOT deleting: $realname\n"; $self->log_pkgname($state); OpenBSD::Logger::log "rm $state->{destdirname}$name\n"; @@ -296,15 +296,15 @@ sub delete if ($state->{quick}) { unless ($state->{extra}) { - print "NOT'deleting config file $realname\n"; + print "NOT'deleting file $realname\n"; return; } } else { my $md5 = OpenBSD::md5::fromfile($realname); if ($md5 eq $orig->{md5}) { - print "Config file $realname identical to sample\n"; + print "File $realname identical to sample\n"; } else { - print "Config file $realname NOT identical to sample\n"; + print "File $realname NOT identical to sample\n"; unless ($state->{extra}) { print "NOT deleting $realname\n"; return; |