author | andyq <andyq> | 2002-10-16 23:07:28 (UTC) |
---|---|---|
committer | andyq <andyq> | 2002-10-16 23:07:28 (UTC) |
commit | 196a3f566bdc5bd6188f2265e05adbdb519a6e09 (patch) (side-by-side diff) | |
tree | 522f3da8a87ca68b1b29d86a5b47f25dddddb6bd /noncore/settings/aqpkg | |
parent | 98bf2fd8027b5e10a82c0f4bde27d7977b919bcc (diff) | |
download | opie-196a3f566bdc5bd6188f2265e05adbdb519a6e09.zip opie-196a3f566bdc5bd6188f2265e05adbdb519a6e09.tar.gz opie-196a3f566bdc5bd6188f2265e05adbdb519a6e09.tar.bz2 |
Now handles commented out servers nicely
-rw-r--r-- | noncore/settings/aqpkg/datamgr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/noncore/settings/aqpkg/datamgr.cpp b/noncore/settings/aqpkg/datamgr.cpp index 7c49621..d929c39 100644 --- a/noncore/settings/aqpkg/datamgr.cpp +++ b/noncore/settings/aqpkg/datamgr.cpp @@ -65,49 +65,49 @@ Destination *DataManager :: getDestination( const char *name ) void DataManager :: loadServers() { // First add our local server - not really a server but // the local config (which packages are installed) serverList.push_back( Server( LOCAL_SERVER, "" ) ); serverList.push_back( Server( LOCAL_IPKGS, "" ) ); // Read file from /etc/ipkg.conf 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 { while ( fgets( line, sizeof line, fp) != NULL ) { lineStr = line; - if ( lineStr.startsWith( "src" ) ) //|| lineStr.startsWith( "#src" ) || lineStr.startsWith( "# src" ) ) + 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 ); Server s( alias, url ); if ( lineStr.startsWith( "src" ) ) s.setActive( true ); else s.setActive( false ); serverList.push_back( s ); } else if ( lineStr.startsWith( "dest" ) ) { char alias[20]; char path[50]; sscanf( lineStr, "%*[^ ] %s %s", alias, path ); |