Diffstat (limited to 'noncore/unsupported/oipkg/pmipkg.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/unsupported/oipkg/pmipkg.cpp | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/noncore/unsupported/oipkg/pmipkg.cpp b/noncore/unsupported/oipkg/pmipkg.cpp index f2852c3..6ef6d19 100644 --- a/noncore/unsupported/oipkg/pmipkg.cpp +++ b/noncore/unsupported/oipkg/pmipkg.cpp | |||
@@ -53,3 +53,3 @@ bool PmIpkg::runIpkg(const QString& args, const QString& dest ) | |||
53 | 53 | ||
54 | if (installDialog->_force_depends) | 54 | if (installDialog && installDialog->_force_depends) |
55 | { | 55 | { |
@@ -89,2 +89,3 @@ bool PmIpkg::runIpkg(const QString& args, const QString& dest ) | |||
89 | lineStrOld = lineStr; | 89 | lineStrOld = lineStr; |
90 | qApp->processEvents(); | ||
90 | } | 91 | } |
@@ -158,2 +159,4 @@ void PmIpkg::processLinkDir( QString file, QString dest ) | |||
158 | if (file == dest) return; | 159 | if (file == dest) return; |
160 | // if (linkOpp==createLink) out( "\ncreating links\n" ); | ||
161 | // if (linkOpp==removeLink) out( "\nremoving links\n" ); | ||
159 | QFileInfo fileInfo( file ); | 162 | QFileInfo fileInfo( file ); |
@@ -267,14 +270,14 @@ void PmIpkg::remove() | |||
267 | to_remove.at(i)->processed(); | 270 | to_remove.at(i)->processed(); |
271 | if ( to_remove.at(i)->link() ) | ||
272 | processFileList( fileList, to_remove.at(i)->dest() ); | ||
268 | to_remove.take( i ); | 273 | to_remove.take( i ); |
269 | 274 | ||
270 | out("\n\n"); | 275 | out("\n"); |
271 | }else{ | 276 | }else{ |
272 | out(tr("Error while removing")+to_remove.at(i)->name()+"\n"); | 277 | out(tr("Error while removing")+to_remove.at(i)->name()+"\n"); |
273 | } | ||
274 | if ( to_remove.at(i)->link() ) | 278 | if ( to_remove.at(i)->link() ) |
275 | { | ||
276 | out( "\nremoving links\n" ); | ||
277 | out( "for package "+to_remove.at(i)->name()+" in "+to_remove.at(i)->dest()+"\n" ); | ||
278 | processFileList( fileList, to_remove.at(i)->dest() ); | 279 | processFileList( fileList, to_remove.at(i)->dest() ); |
279 | } | 280 | } |
281 | if ( to_remove.at(i)->link() ) | ||
282 | processFileList( fileList, to_remove.at(i)->dest() ); | ||
280 | if ( to_remove.at(i)->link() )delete fileList; | 283 | if ( to_remove.at(i)->link() )delete fileList; |
@@ -292,2 +295,3 @@ void PmIpkg::install() | |||
292 | { | 295 | { |
296 | qDebug("install loop %i of %i installing %s",i,to_install.count(),to_install.at(i)->installName().latin1()); //pvDebug | ||
293 | if ( runIpkg("install " + to_install.at(i)->installName(), to_install.at(i)->dest() )) | 297 | if ( runIpkg("install " + to_install.at(i)->installName(), to_install.at(i)->dest() )) |
@@ -296,12 +300,11 @@ void PmIpkg::install() | |||
296 | to_install.at(i)->processed(); | 300 | to_install.at(i)->processed(); |
301 | linkOpp = createLink; | ||
302 | if ( to_install.at(i)->link() ) | ||
303 | makeLinks( to_install.at(i) ); | ||
297 | to_install.take( i ); | 304 | to_install.take( i ); |
298 | out("\n\n"); | 305 | out("\n"); |
299 | }else{ | 306 | }else{ |
300 | out(tr("Error while installing")+to_install.at(i)->name()+"\n"); | 307 | out(tr("Error while installing")+to_install.at(i)->name()+"\n"); |
301 | } | ||
302 | linkOpp = createLink; | 308 | linkOpp = createLink; |
303 | if ( to_install.at(i)->link() ) | 309 | if ( to_install.at(i)->link() ) |
304 | { | ||
305 | out( "\ncreating links\n" ); | ||
306 | out( "for package "+to_install.at(i)->name()+" in "+to_install.at(i)->dest()+"\n" ); | ||
307 | makeLinks( to_install.at(i) ); | 310 | makeLinks( to_install.at(i) ); |