pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_install/files Sync changes with src/:
details: https://anonhg.NetBSD.org/pkgsrc/rev/d3607b161609
branches: trunk
changeset: 487029:d3607b161609
user: agc <agc%pkgsrc.org@localhost>
date: Fri Jan 07 11:58:12 2005 +0000
description:
Sync changes with src/:
+ always echo the command which is about to be executed during a pkg_add
or pkg_delete, not just when verbose mode is on.
+ extract files on ftp pkg_adds with the 'p' flag to tar, to preserve
modes of entries in the binary package. (Addresses PR 28826 from
Tyler Retzlaff)
Bump version to 20050106
diffstat:
pkgtools/pkg_install/files/add/extract.c | 7 +++----
pkgtools/pkg_install/files/lib/ftpio.c | 6 +++---
pkgtools/pkg_install/files/lib/plist.c | 7 +++----
pkgtools/pkg_install/files/lib/version.h | 4 ++--
4 files changed, 11 insertions(+), 13 deletions(-)
diffs (100 lines):
diff -r ca3888fd8a46 -r d3607b161609 pkgtools/pkg_install/files/add/extract.c
--- a/pkgtools/pkg_install/files/add/extract.c Fri Jan 07 11:52:12 2005 +0000
+++ b/pkgtools/pkg_install/files/add/extract.c Fri Jan 07 11:58:12 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: extract.c,v 1.10 2004/12/29 12:16:56 agc Exp $ */
+/* $NetBSD: extract.c,v 1.11 2005/01/07 11:58:12 agc Exp $ */
#if HAVE_CONFIG_H
#include "config.h"
@@ -11,7 +11,7 @@
#if 0
static const char *rcsid = "FreeBSD - Id: extract.c,v 1.17 1997/10/08 07:45:35 charnier Exp";
#else
-__RCSID("$NetBSD: extract.c,v 1.10 2004/12/29 12:16:56 agc Exp $");
+__RCSID("$NetBSD: extract.c,v 1.11 2005/01/07 11:58:12 agc Exp $");
#endif
#endif
@@ -310,8 +310,7 @@
case PLIST_CMD:
format_cmd(cmd, sizeof(cmd), p->name, Directory, last_file);
PUSHOUT(Directory);
- if (Verbose)
- printf("extract: execute '%s'\n", cmd);
+ printf("Executing '%s'\n", cmd);
if (!Fake && system(cmd))
warnx("command '%s' failed", cmd);
break;
diff -r ca3888fd8a46 -r d3607b161609 pkgtools/pkg_install/files/lib/ftpio.c
--- a/pkgtools/pkg_install/files/lib/ftpio.c Fri Jan 07 11:52:12 2005 +0000
+++ b/pkgtools/pkg_install/files/lib/ftpio.c Fri Jan 07 11:58:12 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ftpio.c,v 1.13 2004/12/29 12:16:56 agc Exp $ */
+/* $NetBSD: ftpio.c,v 1.14 2005/01/07 11:58:12 agc Exp $ */
#if HAVE_CONFIG_H
#include "config.h"
@@ -8,7 +8,7 @@
#include <sys/cdefs.h>
#endif
#ifndef lint
-__RCSID("$NetBSD: ftpio.c,v 1.13 2004/12/29 12:16:56 agc Exp $");
+__RCSID("$NetBSD: ftpio.c,v 1.14 2005/01/07 11:58:12 agc Exp $");
#endif
/*-
@@ -1238,7 +1238,7 @@
errx(EXIT_FAILURE, "don't know how to decompress %s, sorry", pkg);
/* yes, this is gross, but needed for borken ftp(1) */
- (void) snprintf(cmd, sizeof(cmd), "get %s \"| ( cd %s; " TAR_CMD " %s %s -%sx -f - | tee /dev/stderr )\"\n",
+ (void) snprintf(cmd, sizeof(cmd), "get %s \"| ( cd %s; " TAR_CMD " %s %s -%sxp -f - | tee /dev/stderr )\"\n",
pkg, dir,
decompress_cmd != NULL ? "--use-compress-program" : "",
decompress_cmd != NULL ? decompress_cmd : "",
diff -r ca3888fd8a46 -r d3607b161609 pkgtools/pkg_install/files/lib/plist.c
--- a/pkgtools/pkg_install/files/lib/plist.c Fri Jan 07 11:52:12 2005 +0000
+++ b/pkgtools/pkg_install/files/lib/plist.c Fri Jan 07 11:58:12 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: plist.c,v 1.12 2004/12/29 12:16:56 agc Exp $ */
+/* $NetBSD: plist.c,v 1.13 2005/01/07 11:58:12 agc Exp $ */
#if HAVE_CONFIG_H
#include "config.h"
@@ -11,7 +11,7 @@
#if 0
static const char *rcsid = "from FreeBSD Id: plist.c,v 1.24 1997/10/08 07:48:15 charnier Exp";
#else
-__RCSID("$NetBSD: plist.c,v 1.12 2004/12/29 12:16:56 agc Exp $");
+__RCSID("$NetBSD: plist.c,v 1.13 2005/01/07 11:58:12 agc Exp $");
#endif
#endif
@@ -368,8 +368,7 @@
if (NoDeleteFiles)
break;
format_cmd(tmp, sizeof(tmp), p->name, Where, last_file);
- if (Verbose)
- printf("Execute `%s'\n", tmp);
+ printf("Executing `%s'\n", tmp);
if (!Fake && system(tmp)) {
warnx("unexec command for `%s' failed", tmp);
fail = FAIL;
diff -r ca3888fd8a46 -r d3607b161609 pkgtools/pkg_install/files/lib/version.h
--- a/pkgtools/pkg_install/files/lib/version.h Fri Jan 07 11:52:12 2005 +0000
+++ b/pkgtools/pkg_install/files/lib/version.h Fri Jan 07 11:58:12 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: version.h,v 1.38 2004/12/29 12:16:56 agc Exp $ */
+/* $NetBSD: version.h,v 1.39 2005/01/07 11:58:12 agc Exp $ */
/*
* Copyright (c) 2001 Thomas Klausner. All rights reserved.
@@ -33,6 +33,6 @@
#ifndef _INST_LIB_VERSION_H_
#define _INST_LIB_VERSION_H_
-#define PKGTOOLS_VERSION "20041226"
+#define PKGTOOLS_VERSION "20050106"
#endif /* _INST_LIB_VERSION_H_ */
Home |
Main Index |
Thread Index |
Old Index