[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_install/files/lib Treat FTP error 450 lik...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0a181204c676
branches:  trunk
changeset: 501865:0a181204c676
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sun Oct 30 21:27:47 2005 +0000

description:
Treat FTP error 450 like 550, otherwise pkg_add from a proftpd server
can hang.

Submitted-by: Eirik Nygaard

diffstat:

 pkgtools/pkg_install/files/lib/ftpio.c   |  6 +++---
 pkgtools/pkg_install/files/lib/version.h |  4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (44 lines):

diff -r 73e8c4dd062b -r 0a181204c676 pkgtools/pkg_install/files/lib/ftpio.c
--- a/pkgtools/pkg_install/files/lib/ftpio.c    Sun Oct 30 21:05:50 2005 +0000
+++ b/pkgtools/pkg_install/files/lib/ftpio.c    Sun Oct 30 21:27:47 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ftpio.c,v 1.17 2005/06/02 10:31:11 wiz Exp $   */
+/*     $NetBSD: ftpio.c,v 1.18 2005/10/30 21:27:47 joerg 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.17 2005/06/02 10:31:11 wiz Exp $");
+__RCSID("$NetBSD: ftpio.c,v 1.18 2005/10/30 21:27:47 joerg Exp $");
 #endif
 
 /*-
@@ -688,7 +688,7 @@
                                (int)(s-pattern), pattern, tmpname);
        }
 
-       rc = ftp_cmd(buf, "\n(550|226).*\n"); /* catch errors */
+       rc = ftp_cmd(buf, "\n(550|450|226).*\n"); /* catch errors */
        if (rc != 226) {
                if (Verbose)
                        warnx("nlist failed!");
diff -r 73e8c4dd062b -r 0a181204c676 pkgtools/pkg_install/files/lib/version.h
--- a/pkgtools/pkg_install/files/lib/version.h  Sun Oct 30 21:05:50 2005 +0000
+++ b/pkgtools/pkg_install/files/lib/version.h  Sun Oct 30 21:27:47 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: version.h,v 1.47 2005/07/18 09:14:04 hubertf Exp $     */
+/*     $NetBSD: version.h,v 1.48 2005/10/30 21:27:47 joerg 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 "20050718"
+#define PKGTOOLS_VERSION "20051030"
 
 #endif /* _INST_LIB_VERSION_H_ */