summaryrefslogtreecommitdiff
authorandyq <andyq>2002-11-22 16:10:58 (UTC)
committer andyq <andyq>2002-11-22 16:10:58 (UTC)
commit8366956992e07a9fc77b9e126bb429b32fd4ad9a (patch) (side-by-side diff)
treec116bdc96674e6722bcb6c4201f90fdbdfc9699a
parent671116dfa34eef557060487324c9176bdb7da38e (diff)
downloadopie-8366956992e07a9fc77b9e126bb429b32fd4ad9a.zip
opie-8366956992e07a9fc77b9e126bb429b32fd4ad9a.tar.gz
opie-8366956992e07a9fc77b9e126bb429b32fd4ad9a.tar.bz2
added verbose_wget flag (doesn't work properly yet) and
made status file updating quicker
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/aqpkg/ipkg.cpp19
-rw-r--r--noncore/settings/aqpkg/ipkg.h1
2 files changed, 17 insertions, 3 deletions
diff --git a/noncore/settings/aqpkg/ipkg.cpp b/noncore/settings/aqpkg/ipkg.cpp
index 8de3c48..dad34b0 100644
--- a/noncore/settings/aqpkg/ipkg.cpp
+++ b/noncore/settings/aqpkg/ipkg.cpp
@@ -17,6 +17,7 @@
#include <fstream>
#include <iostream>
+#include <vector>
using namespace std;
#include <stdio.h>
@@ -81,6 +82,8 @@ bool Ipkg :: runIpkg( )
cmd += " -force-removal-of-essential-packages";
if ( flags & FORCE_OVERWRITE )
cmd += " -force-overwrite";
+ if ( flags & VERBOSE_WGET )
+ cmd += " -verbose_wget";
// Handle make links
// Rules - If make links is switched on, create links to root
@@ -189,7 +192,7 @@ void Ipkg :: removeStatusEntry()
ifstream in( statusFile );
ofstream out( outStatusFile );
- if ( !in.is_open() )
+ if ( !in.is_open() )
{
emit outputText( QString( "Couldn't open status file - " )+ statusFile );
return;
@@ -206,6 +209,7 @@ void Ipkg :: removeStatusEntry()
char v[1001];
QString key;
QString value;
+ vector<QString> lines;
do
{
in.getline( line, 1000 );
@@ -231,9 +235,18 @@ void Ipkg :: removeStatusEntry()
} while ( !in.eof() && QString( line ).stripWhiteSpace() != "" );
}
- out << line << endl;
+ lines.push_back( QString( line ) );
+// out << line << endl;
} while ( !in.eof() );
+ // Write lines out
+ vector<QString>::iterator it;
+ for ( it = lines.begin() ; it != lines.end() ; ++it )
+ {
+ cout << "Writing " << (const char *)(*it) << endl;
+ out << (const char *)(*it) << endl;
+ }
+
in.close();
out.close();
@@ -406,7 +419,7 @@ void Ipkg :: processLinkDir( const QString &file, const QString &destDir, const
d.mkdir( linkFile, true );
}
else
- emit outputText( QString( "Directory " ) + linkFile + " exists" );
+ emit outputText( QString( "Directory " ) + linkFile + " already exists" );
}
else
diff --git a/noncore/settings/aqpkg/ipkg.h b/noncore/settings/aqpkg/ipkg.h
index 55e9ff4..7099ca7 100644
--- a/noncore/settings/aqpkg/ipkg.h
+++ b/noncore/settings/aqpkg/ipkg.h
@@ -32,6 +32,7 @@
#define FORCE_REINSTALL 0x0004
#define FORCE_OVERWRITE 0x0008
#define MAKE_LINKS 0x0010
+#define VERBOSE_WGET 0x0020
class Ipkg : public QObject
{