From: Ben Gras <ben@minix3.org>
Date: Thu, 11 Jan 2007 14:35:29 +0000 (+0000)
Subject: In some configurations of non-working networking, packman will hang a
X-Git-Tag: v3.1.3~119
X-Git-Url: http://zhaoyanbai.com/repos/?a=commitdiff_plain;h=8b3ddfc19f68c8ae53dc92b241df615a62c71e29;p=minix.git

In some configurations of non-working networking, packman will hang a
very long time or forever retrieving the packages list. It's tricky to
test connectivity automatically, so ask every time.  Reported by
Stanislav Kapustin <kapustin_stanislav@hotmail.com>.
---

diff --git a/commands/scripts/packman.sh b/commands/scripts/packman.sh
index 71a21ab12..8274da008 100644
--- a/commands/scripts/packman.sh
+++ b/commands/scripts/packman.sh
@@ -127,13 +127,9 @@ rm -f $TMPDIR/.*	# Remove any remaining .postinstall script or .list*
 
 netpackages=""
 if ( : </dev/tcp ) 2>/dev/null
-then	if [ -f $LISTFILE ]
-	then	echo -n "Update package list from network? (Y/n) "
-		read y
-	else	echo "No package list found - retrieving initial version."
-		y=y
-	fi
-	if [ "$y" != n -a "$y" != n ]
+then	echo -n "Update package list from network? (Y/n) "
+	read y
+	if [ "$y" != n -a "$y" != N ]
 	then	echo "Fetching package list from $LISTURL."
 		urlget $LISTURL >$TMPF && mv $TMPF $LISTFILE || echo "Update not successful."
 	fi