summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/aqpkg/datamgr.cpp16
1 files changed, 0 insertions, 16 deletions
diff --git a/noncore/settings/aqpkg/datamgr.cpp b/noncore/settings/aqpkg/datamgr.cpp
index b6e6e37..bb86766 100644
--- a/noncore/settings/aqpkg/datamgr.cpp
+++ b/noncore/settings/aqpkg/datamgr.cpp
@@ -74,69 +74,53 @@ void DataManager :: loadServers()
QString ipkg_conf = IPKG_CONF;
FILE *fp;
fp = fopen( ipkg_conf, "r" );
char line[130];
QString lineStr;
if ( fp == NULL )
{
cout << "Couldn't open " << ipkg_conf << "! err = " << fp << endl;
return;
}
else
{
- {
- cout << "Before ipkg.conf read" << endl;
- vector<Server>::iterator it;
- for ( it = serverList.begin() ; it != serverList.end() ; ++it )
- cout << "servername - " << it->getServerName() << endl;
- }
-
while ( fgets( line, sizeof line, fp) != NULL )
{
lineStr = line;
if ( lineStr.startsWith( "src" ) || lineStr.startsWith( "#src" ) || lineStr.startsWith( "# src" ) )
{
char alias[20];
char url[100];
// Looks a little wierd but read up to the r of src (throwing it away),
// then read up to the next space and throw that away, the alias
// is next.
// Should Handle #src, # src, src, and combinations of
sscanf( lineStr, "%*[^r]%*[^ ] %s %s", alias, url );
- cout << "Adding alias " << alias << " to list" << endl;
- cout << lineStr << endl;
Server s( alias, url );
serverList.push_back( s );
if ( lineStr.startsWith( "src" ) )
setActiveServer( alias );
}
else if ( lineStr.startsWith( "dest" ) )
{
char alias[20];
char path[50];
sscanf( lineStr, "%*[^ ] %s %s", alias, path );
Destination d( alias, path );
destList.push_back( d );
}
}
- {
- cout << "After ipkg.conf read" << endl;
- vector<Server>::iterator it;
- for ( it = serverList.begin() ; it != serverList.end() ; ++it )
- cout << "servername - " << it->getServerName() << endl;
- }
-
}
fclose( fp );
// Go through the server destination list and add root, cf and card if they
// don't already exist
/* AQ - commented out as if you don't have a CF or SD card in then
* this causes IPKG to try to create directories on non existant devices
* (which of course fails), gives a nasty error message and can cause ipkg
* to seg fault.
*
vector<Destination>::iterator dit;
bool foundRoot = false;