summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Plattner <aplattner@nvidia.com>2008-07-30 10:11:15 -0700
committerAaron Plattner <aplattner@nvidia.com>2008-07-30 10:11:15 -0700
commitc1a8ed7d7175ccd9b89ff38d724a602031e41a1c (patch)
treeac56552337ec70eaaf5a3f09d434ebf268410e04
parentb433706301b47d193be093fdd93bfc7ed8990b27 (diff)
173.14.12173.14.12
-rw-r--r--DRIVER_VERSION2
-rw-r--r--snarf.c6
-rw-r--r--update.c9
3 files changed, 16 insertions, 1 deletions
diff --git a/DRIVER_VERSION b/DRIVER_VERSION
index 624131d..5925946 100644
--- a/DRIVER_VERSION
+++ b/DRIVER_VERSION
@@ -1 +1 @@
-173.14.09
+173.14.12
diff --git a/snarf.c b/snarf.c
index 147fcb5..35d8e81 100644
--- a/snarf.c
+++ b/snarf.c
@@ -68,6 +68,12 @@ int snarf(Options *op, const char *url, int out_fd, uint32 flags)
UrlResource *rsrc = NULL;
int ret;
+ if (op->no_network) {
+ ui_error(op, "Unable to access file '%s', because the '--no-network' "
+ "commandline option was specified.", url);
+ return FALSE;
+ }
+
rsrc = url_resource_new();
rsrc->url = url_new();
rsrc->op = op;
diff --git a/update.c b/update.c
index 3615db5..ed491b2 100644
--- a/update.c
+++ b/update.c
@@ -284,6 +284,15 @@ static int get_latest_driver_version_and_filename(Options *op,
url = nvstrcat(op->ftp_site, "/XFree86/", INSTALLER_OS, "-",
INSTALLER_ARCH, "/latest.txt", NULL);
+ /* check for no_network option */
+
+ if (op->no_network) {
+ ui_error(op, "Unable to determine most recent NVIDIA %s-%s driver "
+ "version: cannot access '%s', because the '--no-network' "
+ "commandline option was specified.", INSTALLER_OS, INSTALLER_ARCH, url);
+ goto done;
+ }
+
if ((fd = mkstemp(tmpfile)) == -1) {
ui_error(op, "Unable to create temporary file (%s)", strerror(errno));
goto done;