Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Import pkg_install-20090406:

Browse Source 
Remove premature return that broke dependency tracking for pkg_add -u.
Fixes PR 41143.
This commit is contained in:
joerg 2009-04-06 18:49:08 +00:00
parent 71920adca4
commit d595a1c226
6 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
external/bsd/pkg_install/dist/add/perform.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: perform.c,v 1.1.1.6 2009/03/08 14:51:34 joerg Exp $ */
/* $NetBSD: perform.c,v 1.1.1.7 2009/04/06 18:49:08 joerg Exp $ */
#if HAVE_CONFIG_H
#include "config.h"
#endif
@ -6,7 +6,7 @@
#if HAVE_SYS_CDEFS_H
#include <sys/cdefs.h>
#endif
__RCSID("$NetBSD: perform.c,v 1.1.1.6 2009/03/08 14:51:34 joerg Exp $");
__RCSID("$NetBSD: perform.c,v 1.1.1.7 2009/04/06 18:49:08 joerg Exp $");
/*-
* Copyright (c) 2003 Grant Beattie <grant@NetBSD.org>
@ -763,9 +763,6 @@ pkg_register_depends(struct pkg_task *pkg)
if (Fake)
return;
if (pkg->other_version != NULL)
return; /* XXX It's using the old dependencies. */
text = xasprintf("%s\n", pkg->pkgname);
text_len = strlen(text);

7
external/bsd/pkg_install/dist/add/pkg_add.1 vendored
View File

@ -1,4 +1,4 @@
.\" $NetBSD: pkg_add.1,v 1.1.1.4 2009/02/28 19:33:37 joerg Exp $
.\" $NetBSD: pkg_add.1,v 1.1.1.5 2009/04/06 18:49:08 joerg Exp $
.\"
.\" FreeBSD install - a package for the installation and maintenance
.\" of non-core utilities.
@ -32,7 +32,10 @@
.Op Fl p Ar prefix
.Op Fl W Ar viewbase
.Op Fl w Ar view
.Ar \fR[[ftp|http]://[\fIuser\fR[:\fIpassword]\fR@]\fIhost\fR[:\fIport\fR]][/\fIpath/\fR]pkg-name ...
.Ar Oo Oo Li ftp|http Oc Ns Li :// Ns Oo Ar user Oc Ns \
Oo Li \&: Ns Ar password Oc \
Ns Li @ Oc Ns Ar host Ns Oo Li \&: Ns Ar port Oc Ns \
Oo Li / Ns Ar path/ Oc Ns Ar pkg-name ...
.Sh DESCRIPTION
The
.Nm

5
external/bsd/pkg_install/dist/delete/pkg_delete.c vendored
View File

@ -34,7 +34,7 @@
#if HAVE_SYS_CDEFS_H
#include <sys/cdefs.h>
#endif
__RCSID("$NetBSD: pkg_delete.c,v 1.1.1.2 2009/03/02 22:31:20 joerg Exp $");
__RCSID("$NetBSD: pkg_delete.c,v 1.1.1.3 2009/04/06 18:49:10 joerg Exp $");
#if HAVE_ERR_H
#include <err.h>
@ -687,7 +687,7 @@ remove_pkg(const char *pkg)
printf("Attempting to delete package `%s'\n", pkg);
else if (delete_package(FALSE, prune_empty, &plist, unregister_only,
destdir) == FAIL) {
warnx("couldn't entirely delete package `%s'\n", pkg);
warnx("couldn't entirely delete package `%s'", pkg);
/*
* XXX It could be nice to error out here explicitly,
* XXX but this is problematic for missing or changed files.
@ -767,6 +767,7 @@ main(int argc, char *argv[])
TAILQ_INIT(&pkgs);
TAILQ_INIT(&sorted_pkgs);
setprogname(argv[0]);
while ((ch = getopt(argc, argv, "ADdFfNnORrVvK:P:p:")) != -1) {
switch (ch) {
case 'A':

4
external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in vendored
View File

@ -1,4 +1,4 @@
.\" $NetBSD: pkg_install.conf.5.in,v 1.1.1.2 2009/02/28 19:33:45 joerg Exp $
.\" $NetBSD: pkg_install.conf.5.in,v 1.1.1.3 2009/04/06 18:49:12 joerg Exp $
.\"
.\" Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
.\" All rights reserved.
@ -154,7 +154,7 @@ The user is always asked interactively when installing a package.
.El
.El
.Sh FILES
.Bl -tag
.Bl -tag -width ".Pa @SYSCONFDIR@/pkg_install.conf"
.It Pa @SYSCONFDIR@/pkg_install.conf
Default location for the file described in this manual page.
.El

6
external/bsd/pkg_install/dist/lib/pkg_io.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: pkg_io.c,v 1.1.1.5 2009/03/10 00:48:50 joerg Exp $ */
/* $NetBSD: pkg_io.c,v 1.1.1.6 2009/04/06 18:49:13 joerg Exp $ */
/*-
* Copyright (c) 2008 Joerg Sonnenberger <joerg@NetBSD.org>.
* All rights reserved.
@ -36,7 +36,7 @@
#include <sys/cdefs.h>
#endif
__RCSID("$NetBSD: pkg_io.c,v 1.1.1.5 2009/03/10 00:48:50 joerg Exp $");
__RCSID("$NetBSD: pkg_io.c,v 1.1.1.6 2009/04/06 18:49:13 joerg Exp $");
#include <archive.h>
#include <archive_entry.h>
@ -189,7 +189,7 @@ find_best_package(struct url *url, const char *pattern, struct url **best_url)
if (fetchList(&ue, url, url_pattern, fetch_flags)) {
char *base_url;
base_url = fetchStringifyURL(url);
warnx("Can't process %s%s: %s", base_url, url_pattern,
warnx("Can't process %s/%s: %s", base_url, url_pattern,
fetchLastErrString);
free(base_url);
free(url_pattern);

4
external/bsd/pkg_install/dist/lib/version.h vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: version.h,v 1.1.1.9 2009/03/10 00:48:52 joerg Exp $ */
/* $NetBSD: version.h,v 1.1.1.10 2009/04/06 18:49:14 joerg Exp $ */
/*
* Copyright (c) 2001 Thomas Klausner. All rights reserved.
@ -27,6 +27,6 @@
#ifndef _INST_LIB_VERSION_H_
#define _INST_LIB_VERSION_H_
#define PKGTOOLS_VERSION "20090309"
#define PKGTOOLS_VERSION "20090406"
#endif /* _INST_LIB_VERSION_H_ */