author | drw <drw> | 2003-03-28 01:36:47 (UTC) |
---|---|---|
committer | drw <drw> | 2003-03-28 01:36:47 (UTC) |
commit | 169a544a1cbd17a6ff3295eba6a9e403fdc299d8 (patch) (unidiff) | |
tree | 3dced402e0316212fbffed6194f234ea3d65f0eb | |
parent | 9e561f9fdd2bef09d21904aba0a74faa39165c04 (diff) | |
download | opie-169a544a1cbd17a6ff3295eba6a9e403fdc299d8.zip opie-169a544a1cbd17a6ff3295eba6a9e403fdc299d8.tar.gz opie-169a544a1cbd17a6ff3295eba6a9e403fdc299d8.tar.bz2 |
Oops...undoing last update.
-rw-r--r-- | noncore/settings/aqpkg/server.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/noncore/settings/aqpkg/server.cpp b/noncore/settings/aqpkg/server.cpp index 06b0863..d4fa439 100644 --- a/noncore/settings/aqpkg/server.cpp +++ b/noncore/settings/aqpkg/server.cpp | |||
@@ -152,39 +152,38 @@ void Server :: readPackageFile( Server *local, bool clearAll, bool installingToR | |||
152 | 152 | ||
153 | char line[1001]; | 153 | char line[1001]; |
154 | char k[21]; | 154 | char k[21]; |
155 | char v[1001]; | 155 | char v[1001]; |
156 | QString key; | 156 | QString key; |
157 | QString value; | 157 | QString value; |
158 | 158 | ||
159 | if ( clearAll ) | 159 | if ( clearAll ) |
160 | cleanUp(); | 160 | cleanUp(); |
161 | Package *currPackage = 0; | 161 | Package *currPackage = 0; |
162 | 162 | ||
163 | bool newPackage = true; | 163 | bool newPackage = true; |
164 | do | 164 | do |
165 | { | 165 | { |
166 | in.getline( line, 1000 ); | 166 | in.getline( line, 1000 ); |
167 | if ( in.eof() ) | 167 | if ( in.eof() ) |
168 | break; | 168 | continue; |
169 | 169 | ||
170 | k[0] = '\0'; | 170 | k[0] = '\0'; |
171 | v[0] = '\0'; | 171 | v[0] = '\0'; |
172 | 172 | ||
173 | if ( sscanf( line, "%[^:]: %[^\n]", k, v ) < 2 ) | 173 | sscanf( line, "%[^:]: %[^\n]", k, v ); |
174 | break; | ||
175 | 174 | ||
176 | key = k; | 175 | key = k; |
177 | value = v; | 176 | value = v; |
178 | key = key.stripWhiteSpace(); | 177 | key = key.stripWhiteSpace(); |
179 | value = value.stripWhiteSpace(); | 178 | value = value.stripWhiteSpace(); |
180 | if ( key == "Package" && newPackage ) | 179 | if ( key == "Package" && newPackage ) |
181 | { | 180 | { |
182 | newPackage = false; | 181 | newPackage = false; |
183 | 182 | ||
184 | currPackage = getPackage( value ); | 183 | currPackage = getPackage( value ); |
185 | if ( !currPackage ) | 184 | if ( !currPackage ) |
186 | { | 185 | { |
187 | Package *package = new Package( value ); | 186 | Package *package = new Package( value ); |
188 | packageList.append( package ); | 187 | packageList.append( package ); |
189 | currPackage = package; | 188 | currPackage = package; |
190 | currPackage->setInstalledTo( dest ); | 189 | currPackage->setInstalledTo( dest ); |