| author | andyq <andyq> | 2002-11-22 16:10:58 (UTC) |
|---|---|---|
| committer | andyq <andyq> | 2002-11-22 16:10:58 (UTC) |
| commit | 8366956992e07a9fc77b9e126bb429b32fd4ad9a (patch) (side-by-side diff) | |
| tree | c116bdc96674e6722bcb6c4201f90fdbdfc9699a | |
| parent | 671116dfa34eef557060487324c9176bdb7da38e (diff) | |
| download | opie-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
| -rw-r--r-- | noncore/settings/aqpkg/ipkg.cpp | 19 | ||||
| -rw-r--r-- | noncore/settings/aqpkg/ipkg.h | 1 |
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 @@ -19,2 +19,3 @@ #include <iostream> +#include <vector> using namespace std; @@ -83,2 +84,4 @@ bool Ipkg :: runIpkg( ) cmd += " -force-overwrite"; + if ( flags & VERBOSE_WGET ) + cmd += " -verbose_wget"; @@ -191,3 +194,3 @@ void Ipkg :: removeStatusEntry() ofstream out( outStatusFile ); - if ( !in.is_open() ) + if ( !in.is_open() ) { @@ -208,2 +211,3 @@ void Ipkg :: removeStatusEntry() QString value; + vector<QString> lines; do @@ -233,5 +237,14 @@ void Ipkg :: removeStatusEntry() - 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(); @@ -408,3 +421,3 @@ void Ipkg :: processLinkDir( const QString &file, const QString &destDir, const else - emit outputText( QString( "Directory " ) + linkFile + " exists" ); + emit outputText( QString( "Directory " ) + linkFile + " already exists" ); 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 @@ -34,2 +34,3 @@ #define MAKE_LINKS 0x0010 +#define VERBOSE_WGET 0x0020 |