Diffstat (limited to 'noncore/settings/aqpkg/ipkg.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/aqpkg/ipkg.cpp | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/noncore/settings/aqpkg/ipkg.cpp b/noncore/settings/aqpkg/ipkg.cpp index 6d0edad..02d4258 100644 --- a/noncore/settings/aqpkg/ipkg.cpp +++ b/noncore/settings/aqpkg/ipkg.cpp | |||
@@ -43,3 +43,3 @@ Ipkg :: ~Ipkg() | |||
43 | 43 | ||
44 | // Option is what we are going to do - install, upgrade, download | 44 | // Option is what we are going to do - install, upgrade, download, reinstall |
45 | // package is the package name to install - either a fully qualified path and ipk | 45 | // package is the package name to install - either a fully qualified path and ipk |
@@ -91,3 +91,2 @@ bool Ipkg :: runIpkg( ) | |||
91 | } | 91 | } |
92 | |||
93 | } | 92 | } |
@@ -99,3 +98,7 @@ bool Ipkg :: runIpkg( ) | |||
99 | 98 | ||
100 | cmd += " " + option; | 99 | |
100 | if ( option == "reinstall" ) | ||
101 | cmd += " install"; | ||
102 | else | ||
103 | cmd += " " + option; | ||
101 | if ( option != "upgrade" ) | 104 | if ( option != "upgrade" ) |
@@ -104,2 +107,5 @@ bool Ipkg :: runIpkg( ) | |||
104 | 107 | ||
108 | |||
109 | emit outputText( QString( "Dealing with package " ) + package ); | ||
110 | |||
105 | qApp->processEvents(); | 111 | qApp->processEvents(); |
@@ -108,3 +114,3 @@ bool Ipkg :: runIpkg( ) | |||
108 | // create the links | 114 | // create the links |
109 | if ( option == "remove" ) | 115 | if ( option == "remove" || option == "reinstall" ) |
110 | { | 116 | { |
@@ -127,3 +133,3 @@ bool Ipkg :: runIpkg( ) | |||
127 | 133 | ||
128 | if ( option == "install" ) | 134 | if ( option == "install" || option == "reinstall" ) |
129 | { | 135 | { |
@@ -155,2 +161,3 @@ bool Ipkg :: runIpkg( ) | |||
155 | emit outputText( QString( "Finished - status=" ) + (ret ? "success" : "failure") ); | 161 | emit outputText( QString( "Finished - status=" ) + (ret ? "success" : "failure") ); |
162 | emit outputText( "" ); | ||
156 | return ret; | 163 | return ret; |
@@ -184,3 +191,3 @@ int Ipkg :: executeIpkgCommand( QString &cmd, const QString option ) | |||
184 | //See if we're finished | 191 | //See if we're finished |
185 | if ( option == "install" ) | 192 | if ( option == "install" || option == "reinstall" ) |
186 | { | 193 | { |
@@ -244,3 +251,3 @@ QStringList* Ipkg :: getList( const QString &packageFilename, const QString &des | |||
244 | 251 | ||
245 | cout << "Try to open " << packageFileDir.latin1() << endl; | 252 | cout << "Try to open " << packageFileDir << endl; |
246 | if ( !f.open(IO_ReadOnly) ) | 253 | if ( !f.open(IO_ReadOnly) ) |
@@ -248,3 +255,3 @@ QStringList* Ipkg :: getList( const QString &packageFilename, const QString &des | |||
248 | // Couldn't open from dest, try from / | 255 | // Couldn't open from dest, try from / |
249 | // cout << "Could not open:" << packageFileDir << endl; | 256 | cout << "Could not open:" << packageFileDir << endl; |
250 | f.close(); | 257 | f.close(); |