This is the mail archive of the
cygwin-apps
mailing list for the Cygwin project.
Re: [PATCH] Setup.exe: restore commandline localdir option.
Christopher Faylor wrote:
> I think the original semantics are quite a bit less surprising and the option
> should be checked first.
Figured that might be the case, so here it is the other way.
* localdir.cc (LocalDirSetting::LocalDirSetting): Restore -l option.
OK now?
cheers,
DaveK
Index: localdir.cc
===================================================================
RCS file: /cvs/cygwin-apps/setup/localdir.cc,v
retrieving revision 2.29
diff -p -u -r2.29 localdir.cc
--- localdir.cc 4 Nov 2009 15:14:51 -0000 2.29
+++ localdir.cc 4 Nov 2009 17:43:55 -0000
@@ -62,7 +62,9 @@ static ControlAdjuster::ControlInfo Loca
LocalDirSetting::LocalDirSetting ()
{
const char *fg_ret;
- if ((fg_ret = UserSettings::instance().get ("last-cache")))
+ if (std::string (LocalDirOption).size ())
+ local_dir = std::string (LocalDirOption);
+ else if ((fg_ret = UserSettings::instance().get ("last-cache")))
local_dir = std::string (fg_ret);
}