[sword-svn] r2222 - trunk/utilities

[scribe at crosswire.org]

Author: scribe
Date: 2009-01-10 15:03:24 -0700 (Sat, 10 Jan 2009)
New Revision: 2222

Modified:
   trunk/utilities/installmgr.cpp
Log:
Fixed a bug which prevented refreshing remote sources
due to not confirming user disclaimer
Added version info to module output


Modified: trunk/utilities/installmgr.cpp
===================================================================
--- trunk/utilities/installmgr.cpp	2008-12-28 05:36:47 UTC (rev 2221)
+++ trunk/utilities/installmgr.cpp	2009-01-10 22:03:24 UTC (rev 2222)
@@ -139,7 +139,8 @@
 	SWModule *module;
 	for (ModMap::iterator it = mgr->Modules.begin(); it != mgr->Modules.end(); it++) {
 		module = it->second;
-		cout << "[" << module->Name() << "]  \t- " << module->Description() << "\n";
+		SWBuf version = module->getConfigEntry("Version");
+		cout << "[" << module->Name() << "]  \t(" << version << ")  \t- " << module->Description() << "\n";
 	}
 }
 
@@ -174,6 +175,10 @@
 		fprintf(stderr, "Couldn't find remote source [%s]\n", sourceName);
 		finish(-3);
 	}
+
+	// since a remote source is in the config files, we've already confirmed
+	installMgr->setUserDisclaimerConfirmed(true);
+
 	if (!installMgr->refreshRemoteSource(source->second))
 		cout << "Remote Source Refreshed\n";
 	else	cerr << "Error Refreshing Remote Source\n";