-rw-r--r-- | noncore/settings/aqpkg/datamgr.cpp | 16 |
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 | |||
@@ -80,19 +80,12 @@ void DataManager :: loadServers() | |||
80 | { | 80 | { |
81 | cout << "Couldn't open " << ipkg_conf << "! err = " << fp << endl; | 81 | cout << "Couldn't open " << ipkg_conf << "! err = " << fp << endl; |
82 | return; | 82 | return; |
83 | } | 83 | } |
84 | else | 84 | else |
85 | { | 85 | { |
86 | { | ||
87 | cout << "Before ipkg.conf read" << endl; | ||
88 | vector<Server>::iterator it; | ||
89 | for ( it = serverList.begin() ; it != serverList.end() ; ++it ) | ||
90 | cout << "servername - " << it->getServerName() << endl; | ||
91 | } | ||
92 | |||
93 | while ( fgets( line, sizeof line, fp) != NULL ) | 86 | while ( fgets( line, sizeof line, fp) != NULL ) |
94 | { | 87 | { |
95 | lineStr = line; | 88 | lineStr = line; |
96 | if ( lineStr.startsWith( "src" ) || lineStr.startsWith( "#src" ) || lineStr.startsWith( "# src" ) ) | 89 | if ( lineStr.startsWith( "src" ) || lineStr.startsWith( "#src" ) || lineStr.startsWith( "# src" ) ) |
97 | { | 90 | { |
98 | char alias[20]; | 91 | char alias[20]; |
@@ -101,14 +94,12 @@ void DataManager :: loadServers() | |||
101 | 94 | ||
102 | // Looks a little wierd but read up to the r of src (throwing it away), | 95 | // Looks a little wierd but read up to the r of src (throwing it away), |
103 | // then read up to the next space and throw that away, the alias | 96 | // then read up to the next space and throw that away, the alias |
104 | // is next. | 97 | // is next. |
105 | // Should Handle #src, # src, src, and combinations of | 98 | // Should Handle #src, # src, src, and combinations of |
106 | sscanf( lineStr, "%*[^r]%*[^ ] %s %s", alias, url ); | 99 | sscanf( lineStr, "%*[^r]%*[^ ] %s %s", alias, url ); |
107 | cout << "Adding alias " << alias << " to list" << endl; | ||
108 | cout << lineStr << endl; | ||
109 | Server s( alias, url ); | 100 | Server s( alias, url ); |
110 | serverList.push_back( s ); | 101 | serverList.push_back( s ); |
111 | 102 | ||
112 | if ( lineStr.startsWith( "src" ) ) | 103 | if ( lineStr.startsWith( "src" ) ) |
113 | setActiveServer( alias ); | 104 | setActiveServer( alias ); |
114 | } | 105 | } |
@@ -118,19 +109,12 @@ void DataManager :: loadServers() | |||
118 | char path[50]; | 109 | char path[50]; |
119 | sscanf( lineStr, "%*[^ ] %s %s", alias, path ); | 110 | sscanf( lineStr, "%*[^ ] %s %s", alias, path ); |
120 | Destination d( alias, path ); | 111 | Destination d( alias, path ); |
121 | destList.push_back( d ); | 112 | destList.push_back( d ); |
122 | } | 113 | } |
123 | } | 114 | } |
124 | { | ||
125 | cout << "After ipkg.conf read" << endl; | ||
126 | vector<Server>::iterator it; | ||
127 | for ( it = serverList.begin() ; it != serverList.end() ; ++it ) | ||
128 | cout << "servername - " << it->getServerName() << endl; | ||
129 | } | ||
130 | |||
131 | } | 115 | } |
132 | fclose( fp ); | 116 | fclose( fp ); |
133 | 117 | ||
134 | // Go through the server destination list and add root, cf and card if they | 118 | // Go through the server destination list and add root, cf and card if they |
135 | // don't already exist | 119 | // don't already exist |
136 | /* AQ - commented out as if you don't have a CF or SD card in then | 120 | /* AQ - commented out as if you don't have a CF or SD card in then |