Re: [PATCH] Setup 1.7 command line install/download in setup.exe

[Ralph Hempel <rhempel@bmts.com>]

[-- Attachment #1: Type: text/plain, Size: 341 bytes --]

Corinna Vinschen wrote:
> On Dec  5 11:24, Ralph Hempel wrote:
>> Some time ago, I mentioned on this list that the -D -L command
>> line options for setup.exe (1.7) don't operate quite the same as the
>> radio buttons on the setup dialog.
>> [...]
> 
> The patch misses a ChangeLog entry...

OK, here's the patch and the changelog...

Ralph

[-- Attachment #2: setup-downloadinstall.changelog --]
[-- Type: text/plain, Size: 91 bytes --]

2008-09-03  Ralph Hempel

	* source.cc: Add support for both -D and -L on command line
	

[-- Attachment #3: setup-downloadinstall.diff --]
[-- Type: text/x-diff, Size: 385 bytes --]

--- setup-clean/source.cc	2008-08-12 16:32:08.000000000 -0400
+++ setup/source.cc	2008-09-03 09:29:28.593750000 -0400
@@ -86,7 +86,9 @@
 void
 SourcePage::OnActivate ()
 {
-  if (DownloadOption)
+  if (DownloadOption && LocalOption)
+    source = IDC_SOURCE_NETINST;
+  else if (DownloadOption)
     source = IDC_SOURCE_DOWNLOAD;
   else if (LocalOption)
     source = IDC_SOURCE_CWD;