summaryrefslogtreecommitdiff
authordrw <drw>2003-03-28 01:36:47 (UTC)
committer drw <drw>2003-03-28 01:36:47 (UTC)
commit169a544a1cbd17a6ff3295eba6a9e403fdc299d8 (patch) (side-by-side diff)
tree3dced402e0316212fbffed6194f234ea3d65f0eb
parent9e561f9fdd2bef09d21904aba0a74faa39165c04 (diff)
downloadopie-169a544a1cbd17a6ff3295eba6a9e403fdc299d8.zip
opie-169a544a1cbd17a6ff3295eba6a9e403fdc299d8.tar.gz
opie-169a544a1cbd17a6ff3295eba6a9e403fdc299d8.tar.bz2
Oops...undoing last update.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/aqpkg/server.cpp5
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
@@ -144,55 +144,54 @@ void Server :: readLocalIpks( Server *local )
buildLocalPackages( local );
}
void Server :: readPackageFile( Server *local, bool clearAll, bool installingToRoot, Destination *dest )
{
ifstream in( packageFile );
if ( !in.is_open() )
return;
char line[1001];
char k[21];
char v[1001];
QString key;
QString value;
if ( clearAll )
cleanUp();
Package *currPackage = 0;
bool newPackage = true;
do
{
in.getline( line, 1000 );
if ( in.eof() )
- break;
+ continue;
k[0] = '\0';
v[0] = '\0';
- if ( sscanf( line, "%[^:]: %[^\n]", k, v ) < 2 )
- break;
+ sscanf( line, "%[^:]: %[^\n]", k, v );
key = k;
value = v;
key = key.stripWhiteSpace();
value = value.stripWhiteSpace();
if ( key == "Package" && newPackage )
{
newPackage = false;
currPackage = getPackage( value );
if ( !currPackage )
{
Package *package = new Package( value );
packageList.append( package );
currPackage = package;
currPackage->setInstalledTo( dest );
if ( installingToRoot )
currPackage->setInstalledToRoot( true );
}
else
{
if (currPackage->getStatus().find( "deinstall" ) != -1 )
currPackage->setInstalledTo( dest );
}