Diffstat (limited to 'core/launcher/packageslave.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/launcher/packageslave.cpp | 191 |
1 files changed, 95 insertions, 96 deletions
diff --git a/core/launcher/packageslave.cpp b/core/launcher/packageslave.cpp index a11ac86..0461432 100644 --- a/core/launcher/packageslave.cpp +++ b/core/launcher/packageslave.cpp | |||
@@ -55,3 +55,3 @@ PackageHandler::PackageHandler( QObject *parent, char* name ) | |||
55 | connect( packageChannel, SIGNAL( received(const QCString&,const QByteArray&) ), | 55 | connect( packageChannel, SIGNAL( received(const QCString&,const QByteArray&) ), |
56 | this, SLOT( qcopMessage(const QCString&,const QByteArray&) ) ); | 56 | this, SLOT( qcopMessage(const QCString&,const QByteArray&) ) ); |
57 | #endif | 57 | #endif |
@@ -68,3 +68,3 @@ void PackageHandler::qcopMessage( const QCString &msg, const QByteArray &data ) | |||
68 | } else if ( msg == "removePackage(QString)" ) { | 68 | } else if ( msg == "removePackage(QString)" ) { |
69 | QString file; | 69 | QString file; |
70 | stream >> file; | 70 | stream >> file; |
@@ -72,3 +72,3 @@ void PackageHandler::qcopMessage( const QCString &msg, const QByteArray &data ) | |||
72 | } else if ( msg == "addPackageFiles(QString,QString)" ) { | 72 | } else if ( msg == "addPackageFiles(QString,QString)" ) { |
73 | QString location, listfile; | 73 | QString location, listfile; |
74 | stream >> location >> listfile; | 74 | stream >> location >> listfile; |
@@ -76,3 +76,3 @@ void PackageHandler::qcopMessage( const QCString &msg, const QByteArray &data ) | |||
76 | } else if ( msg == "addPackages(QString)" ) { | 76 | } else if ( msg == "addPackages(QString)" ) { |
77 | QString location; | 77 | QString location; |
78 | stream >> location; | 78 | stream >> location; |
@@ -80,7 +80,7 @@ void PackageHandler::qcopMessage( const QCString &msg, const QByteArray &data ) | |||
80 | } else if ( msg == "cleanupPackageFiles(QString)" ) { | 80 | } else if ( msg == "cleanupPackageFiles(QString)" ) { |
81 | QString listfile; | 81 | QString listfile; |
82 | stream >> listfile; | 82 | stream >> listfile; |
83 | cleanupPackageFiles( listfile ); | 83 | cleanupPackageFiles( listfile ); |
84 | } else if ( msg == "cleanupPackages(QString)" ) { | 84 | } else if ( msg == "cleanupPackages(QString)" ) { |
85 | QString location; | 85 | QString location; |
86 | stream >> location; | 86 | stream >> location; |
@@ -88,6 +88,6 @@ void PackageHandler::qcopMessage( const QCString &msg, const QByteArray &data ) | |||
88 | } else if ( msg == "prepareInstall(QString,QString)" ) { | 88 | } else if ( msg == "prepareInstall(QString,QString)" ) { |
89 | QString size, path; | 89 | QString size, path; |
90 | stream >> size; | 90 | stream >> size; |
91 | stream >> path; | 91 | stream >> path; |
92 | prepareInstall( size, path ); | 92 | prepareInstall( size, path ); |
93 | } | 93 | } |
@@ -98,8 +98,8 @@ void PackageHandler::installPackage( const QString &package ) | |||
98 | if ( mNoSpaceLeft ) { | 98 | if ( mNoSpaceLeft ) { |
99 | mNoSpaceLeft = FALSE; | 99 | mNoSpaceLeft = FALSE; |
100 | // Don't emit that for now, I still couldn't test it (Wener) | 100 | // Don't emit that for now, I still couldn't test it (Wener) |
101 | //sendReply( "installFailed(QString)", package ); | 101 | //sendReply( "installFailed(QString)", package ); |
102 | //return; | 102 | //return; |
103 | } | 103 | } |
104 | 104 | ||
105 | currentProcess = new QProcess( QStringList() << "ipkg" << "install" << package ); // No tr | 105 | currentProcess = new QProcess( QStringList() << "ipkg" << "install" << package ); // No tr |
@@ -136,4 +136,4 @@ void PackageHandler::sendReply( const QCString& msg, const QString& arg ) | |||
136 | 136 | ||
137 | void PackageHandler::addPackageFiles( const QString &location, | 137 | void PackageHandler::addPackageFiles( const QString &location, |
138 | const QString &listfile ) | 138 | const QString &listfile ) |
139 | { | 139 | { |
@@ -146,5 +146,5 @@ void PackageHandler::addPackageFiles( const QString &location, | |||
146 | QDir d; | 146 | QDir d; |
147 | //#### revise | 147 | //#### revise |
148 | odebug << "Copy file at " << __FILE__ << ": " << __LINE__ << "" << oendl; | 148 | odebug << "Copy file at " << __FILE__ << ": " << __LINE__ << "" << oendl; |
149 | d.mkdir(("/usr/lib/ipkg/info/" + location).ascii()); | 149 | d.mkdir(("/usr/lib/ipkg/info/" + location).ascii()); |
150 | system(("copy " + f.name() + " /usr/lib/ipkg/info/"+location).ascii()); | 150 | system(("copy " + f.name() + " /usr/lib/ipkg/info/"+location).ascii()); |
@@ -152,34 +152,33 @@ void PackageHandler::addPackageFiles( const QString &location, | |||
152 | 152 | ||
153 | |||
154 | if ( f.open(IO_ReadOnly) ) { | ||
155 | QTextStream ts(&f); | ||
156 | 153 | ||
157 | QString s; | 154 | if ( f.open(IO_ReadOnly) ) { |
158 | while ( !ts.eof() ) { // until end of file... | 155 | QTextStream ts(&f); |
159 | s = ts.readLine(); // line of text excluding '\n' | 156 | |
160 | // for s, do link/mkdir. | 157 | QString s; |
161 | if ( s.right(1) == "/" ) { | 158 | while ( !ts.eof() ) { // until end of file... |
159 | s = ts.readLine(); // line of text excluding '\n' | ||
160 | // for s, do link/mkdir. | ||
161 | if ( s.right(1) == "/" ) { | ||
162 | odebug << "do mkdir for " << s.ascii() << "" << oendl; | 162 | odebug << "do mkdir for " << s.ascii() << "" << oendl; |
163 | #ifndef Q_OS_WIN32 | 163 | #ifndef Q_OS_WIN32 |
164 | mkdir( s.ascii(), 0777 ); | 164 | mkdir( s.ascii(), 0777 ); |
165 | //possible optimization: symlink directories | 165 | //possible optimization: symlink directories |
166 | //that don't exist already. -- Risky. | 166 | //that don't exist already. -- Risky. |
167 | #else | 167 | #else |
168 | d.mkdir( s.ascii()); | 168 | d.mkdir( s.ascii()); |
169 | #endif | 169 | #endif |
170 | 170 | ||
171 | } else { | 171 | } else { |
172 | #ifndef Q_OS_WIN32 | 172 | #ifndef Q_OS_WIN32 |
173 | odebug << "do symlink for " << s.ascii() << "" << oendl; | 173 | odebug << "do symlink for " << s.ascii() << "" << oendl; |
174 | symlink( (location + s).ascii(), s.ascii() ); | 174 | symlink( (location + s).ascii(), s.ascii() ); |
175 | #else | 175 | #else |
176 | odebug << "Copy file instead of a symlink for WIN32" << oendl; | 176 | odebug << "Copy file instead of a symlink for WIN32" << oendl; |
177 | if (!CopyFile((TCHAR*)qt_winTchar((location + s), TRUE), (TCHAR*)qt_winTchar(s, TRUE), FALSE)) | 177 | if (!CopyFile((TCHAR*)qt_winTchar((location + s), TRUE), (TCHAR*)qt_winTchar(s, TRUE), FALSE)) |
178 | qWarning("Unable to create symlinkfor %s", | 178 | owarn << "Unable to create symlinkfor " << (location + s).ascii() << oendl; |
179 | (location + s).ascii()); | ||
180 | #endif | 179 | #endif |
181 | } | 180 | } |
182 | } | 181 | } |
183 | f.close(); | 182 | f.close(); |
184 | } | 183 | } |
185 | } | 184 | } |
@@ -190,10 +189,10 @@ void PackageHandler::addPackages( const QString &location ) | |||
190 | QDir dir(location + "/usr/lib/ipkg/info", "*.list", // No tr | 189 | QDir dir(location + "/usr/lib/ipkg/info", "*.list", // No tr |
191 | QDir::Name, QDir::Files); | 190 | QDir::Name, QDir::Files); |
192 | if ( !dir.exists() ) | 191 | if ( !dir.exists() ) |
193 | return; | 192 | return; |
194 | 193 | ||
195 | QStringList packages = dir.entryList(); | 194 | QStringList packages = dir.entryList(); |
196 | for ( QStringList::Iterator it = packages.begin(); | 195 | for ( QStringList::Iterator it = packages.begin(); |
197 | it != packages.end(); ++it ) { | 196 | it != packages.end(); ++it ) { |
198 | addPackageFiles( location, *it ); | 197 | addPackageFiles( location, *it ); |
199 | } | 198 | } |
@@ -205,31 +204,31 @@ void PackageHandler::cleanupPackageFiles( const QString &listfile ) | |||
205 | QFile f(listfile); | 204 | QFile f(listfile); |
206 | 205 | ||
207 | if ( f.open(IO_ReadOnly) ) { | 206 | if ( f.open(IO_ReadOnly) ) { |
208 | QTextStream ts(&f); | 207 | QTextStream ts(&f); |
209 | 208 | ||
210 | QString s; | 209 | QString s; |
211 | while ( !ts.eof() ) { // until end of file... | 210 | while ( !ts.eof() ) { // until end of file... |
212 | s = ts.readLine(); // line of text excluding '\n' | 211 | s = ts.readLine(); // line of text excluding '\n' |
213 | // for s, do link/mkdir. | 212 | // for s, do link/mkdir. |
214 | if ( s.right(1) == "/" ) { | 213 | if ( s.right(1) == "/" ) { |
215 | //should rmdir if empty, after all files have been removed | 214 | //should rmdir if empty, after all files have been removed |
216 | } else { | 215 | } else { |
217 | #ifndef Q_OS_WIN32 | 216 | #ifndef Q_OS_WIN32 |
218 | odebug << "remove symlink for " << s.ascii() << "" << oendl; | 217 | odebug << "remove symlink for " << s.ascii() << "" << oendl; |
219 | //check if it is a symlink first (don't remove /etc/passwd...) | 218 | //check if it is a symlink first (don't remove /etc/passwd...) |
220 | char buf[10]; //we don't care about the contents | 219 | char buf[10]; //we don't care about the contents |
221 | if ( ::readlink( s.ascii(),buf, 10 >= 0 ) ) | 220 | if ( ::readlink( s.ascii(),buf, 10 >= 0 ) ) |
222 | ::unlink( s.ascii() ); | 221 | ::unlink( s.ascii() ); |
223 | #else | 222 | #else |
224 | // ### revise | 223 | // ### revise |
225 | owarn << "Unable to remove symlink " << __FILE__ << ":" << __LINE__ << "" << oendl; | 224 | owarn << "Unable to remove symlink " << __FILE__ << ":" << __LINE__ << "" << oendl; |
226 | #endif | 225 | #endif |
227 | } | 226 | } |
228 | } | 227 | } |
229 | f.close(); | 228 | f.close(); |
230 | 229 | ||
231 | //remove the list file | 230 | //remove the list file |
232 | ::unlink( listfile.ascii() ); | 231 | ::unlink( listfile.ascii() ); |
233 | 232 | ||
234 | } | 233 | } |
235 | } | 234 | } |
@@ -240,13 +239,13 @@ void PackageHandler::cleanupPackages( const QString &location ) | |||
240 | QDir dir( "/usr/lib/ipkg/info/"+location, "*.list", // No tr | 239 | QDir dir( "/usr/lib/ipkg/info/"+location, "*.list", // No tr |
241 | QDir::Name, QDir::Files); | 240 | QDir::Name, QDir::Files); |
242 | if ( !dir.exists() ) | 241 | if ( !dir.exists() ) |
243 | return; | 242 | return; |
244 | 243 | ||
245 | QStringList packages = dir.entryList(); | 244 | QStringList packages = dir.entryList(); |
246 | for ( QStringList::Iterator it = packages.begin(); | 245 | for ( QStringList::Iterator it = packages.begin(); |
247 | it != packages.end(); ++it ) { | 246 | it != packages.end(); ++it ) { |
248 | cleanupPackageFiles( *it ); | 247 | cleanupPackageFiles( *it ); |
249 | } | 248 | } |
250 | 249 | ||
251 | //remove the backup directory | 250 | //remove the backup directory |
252 | //### | 251 | //### |
@@ -259,5 +258,5 @@ void PackageHandler::prepareInstall( const QString& size, const QString& path ) | |||
259 | unsigned int s = size.toUInt( &ok ); | 258 | unsigned int s = size.toUInt( &ok ); |
260 | 259 | ||
261 | if ( !ok ) | 260 | if ( !ok ) |
262 | return; | 261 | return; |
263 | 262 | ||
@@ -267,6 +266,6 @@ void PackageHandler::prepareInstall( const QString& size, const QString& path ) | |||
267 | if ( statfs( path.latin1(), &fs ) == 0 ) | 266 | if ( statfs( path.latin1(), &fs ) == 0 ) |
268 | if ( s > fs.f_bsize * fs.f_bavail ) { | 267 | if ( s > fs.f_bsize * fs.f_bavail ) { |
269 | //odebug << "############### Not enough space left ###############" << oendl; | 268 | //odebug << "############### Not enough space left ###############" << oendl; |
270 | mNoSpaceLeft = TRUE; | 269 | mNoSpaceLeft = TRUE; |
271 | } | 270 | } |
272 | #endif | 271 | #endif |
@@ -277,11 +276,11 @@ void PackageHandler::iProcessExited() | |||
277 | if ( currentProcess->normalExit() && currentProcess->exitStatus() == 0 ) | 276 | if ( currentProcess->normalExit() && currentProcess->exitStatus() == 0 ) |
278 | sendReply( "installDone(QString)", currentPackage ); | 277 | sendReply( "installDone(QString)", currentPackage ); |
279 | else { | 278 | else { |
280 | #ifndef QT_NO_COP | 279 | #ifndef QT_NO_COP |
281 | QCopEnvelope e( "QPE/Desktop", "installFailed(QString,int,QString)" ); | 280 | QCopEnvelope e( "QPE/Desktop", "installFailed(QString,int,QString)" ); |
282 | e << currentPackage << currentProcess->exitStatus() | 281 | e << currentPackage << currentProcess->exitStatus() |
283 | << currentProcessError; | 282 | << currentProcessError; |
284 | #endif | 283 | #endif |
285 | } | 284 | } |
286 | 285 | ||
287 | delete currentProcess; | 286 | delete currentProcess; |
@@ -300,5 +299,5 @@ void PackageHandler::rmProcessExited() | |||
300 | if ( currentProcess->normalExit() && currentProcess->exitStatus() == 0 ) | 299 | if ( currentProcess->normalExit() && currentProcess->exitStatus() == 0 ) |
301 | sendReply( "removeDone(QString)", currentPackage ); | 300 | sendReply( "removeDone(QString)", currentPackage ); |
302 | else | 301 | else |
303 | sendReply( "removeFailed(QString)", currentPackage ); | 302 | sendReply( "removeFailed(QString)", currentPackage ); |
304 | 303 | ||
@@ -314,8 +313,8 @@ void PackageHandler::readyReadStdout() | |||
314 | while ( currentProcess->canReadLineStdout() ) { | 313 | while ( currentProcess->canReadLineStdout() ) { |
315 | QString line = currentProcess->readLineStdout(); | 314 | QString line = currentProcess->readLineStdout(); |
316 | currentProcessError.append("OUT:"+line); | 315 | currentProcessError.append("OUT:"+line); |
317 | if ( line.contains( "Unpacking" ) ) // No tr | 316 | if ( line.contains( "Unpacking" ) ) // No tr |
318 | sendReply( "installStep(QString)", "one" ); // No tr | 317 | sendReply( "installStep(QString)", "one" ); // No tr |
319 | else if ( line.contains( "Configuring" ) ) // No tr | 318 | else if ( line.contains( "Configuring" ) ) // No tr |
320 | sendReply( "installStep(QString)", "two" ); // No tr | 319 | sendReply( "installStep(QString)", "two" ); // No tr |
321 | } | 320 | } |
@@ -326,4 +325,4 @@ void PackageHandler::readyReadStderr() | |||
326 | while ( currentProcess->canReadLineStderr() ) { | 325 | while ( currentProcess->canReadLineStderr() ) { |
327 | QString line = currentProcess->readLineStderr(); | 326 | QString line = currentProcess->readLineStderr(); |
328 | currentProcessError.append("ERR:"+line); | 327 | currentProcessError.append("ERR:"+line); |
329 | } | 328 | } |