author | tille <tille> | 2002-07-15 16:03:13 (UTC) |
---|---|---|
committer | tille <tille> | 2002-07-15 16:03:13 (UTC) |
commit | dcea0e50a00ed9efb988ded5abf5d39de1bea393 (patch) (unidiff) | |
tree | a0deba1e0a736c8ae6bae5dcd73b457ed27962d8 /noncore | |
parent | ecf2a873be3274bb30be0c659b7db6ef8a43be84 (diff) | |
download | opie-dcea0e50a00ed9efb988ded5abf5d39de1bea393.zip opie-dcea0e50a00ed9efb988ded5abf5d39de1bea393.tar.gz opie-dcea0e50a00ed9efb988ded5abf5d39de1bea393.tar.bz2 |
oipkg works with ipkg 0.99.20
-rw-r--r-- | noncore/unsupported/oipkg/opie-oipkg.control | 2 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/pmipkg.cpp | 8 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/pmipkg.h | 1 |
3 files changed, 2 insertions, 9 deletions
diff --git a/noncore/unsupported/oipkg/opie-oipkg.control b/noncore/unsupported/oipkg/opie-oipkg.control index 1cff44e..ff1c6ca 100644 --- a/noncore/unsupported/oipkg/opie-oipkg.control +++ b/noncore/unsupported/oipkg/opie-oipkg.control | |||
@@ -5,5 +5,5 @@ Maintainer: Patrick S. Vogt <tille@almana.ch> | |||
5 | Architecture: arm | 5 | Architecture: arm |
6 | Version: $QPE_VERSION-$SUB_VERSION | 6 | Version: $QPE_VERSION-$SUB_VERSION |
7 | Depends: opie-base ($QPE_VERSION), ipkg (>0.9) | 7 | Depends: opie-base ($QPE_VERSION), ipkg (>0.99.20) |
8 | Description: Opie Projects advanced gui ipkg installer | 8 | Description: Opie Projects advanced gui ipkg installer |
9 | A GUI front-end to ipkg for the Opie environment. | 9 | A GUI front-end to ipkg for the Opie environment. |
diff --git a/noncore/unsupported/oipkg/pmipkg.cpp b/noncore/unsupported/oipkg/pmipkg.cpp index 71e9b88..2ed86ee 100644 --- a/noncore/unsupported/oipkg/pmipkg.cpp +++ b/noncore/unsupported/oipkg/pmipkg.cpp | |||
@@ -40,5 +40,5 @@ | |||
40 | 40 | ||
41 | PmIpkg::PmIpkg( PackageManagerSettings* s, QWidget* p, const char * name, WFlags f ) | 41 | PmIpkg::PmIpkg( PackageManagerSettings* s, QWidget* p, const char * name, WFlags f ) |
42 | : QObject ( p ), shellWarning(true) | 42 | : QObject ( p ) |
43 | { | 43 | { |
44 | settings = s; | 44 | settings = s; |
@@ -157,10 +157,4 @@ bool PmIpkg::runIpkg(const QString& args, const QString& dest ) | |||
157 | } | 157 | } |
158 | pclose(fp); | 158 | pclose(fp); |
159 | if (!ret && shellWarning) | ||
160 | { | ||
161 | shellWarning = false; | ||
162 | QMessageBox::critical( runwindow, tr("install failure"), | ||
163 | tr("<p>Did you start me from the command line?</p>")); | ||
164 | } | ||
165 | #endif | 159 | #endif |
166 | //out( "Finished!"); | 160 | //out( "Finished!"); |
diff --git a/noncore/unsupported/oipkg/pmipkg.h b/noncore/unsupported/oipkg/pmipkg.h index 662800a..c84acfa 100644 --- a/noncore/unsupported/oipkg/pmipkg.h +++ b/noncore/unsupported/oipkg/pmipkg.h | |||
@@ -54,5 +54,4 @@ public slots: | |||
54 | 54 | ||
55 | private: | 55 | private: |
56 | bool shellWarning; | ||
57 | OProcess *ipkgProcess; | 56 | OProcess *ipkgProcess; |
58 | PackageManagerSettings* settings; | 57 | PackageManagerSettings* settings; |