Diffstat (limited to 'noncore/unsupported/oipkg/pmipkg.cpp') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | noncore/unsupported/oipkg/pmipkg.cpp | 31 |
1 files changed, 17 insertions, 14 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 ) - if (installDialog->_force_depends) + if (installDialog && installDialog->_force_depends) { @@ -89,2 +89,3 @@ bool PmIpkg::runIpkg(const QString& args, const QString& dest ) lineStrOld = lineStr; + qApp->processEvents(); } @@ -158,2 +159,4 @@ void PmIpkg::processLinkDir( QString file, QString dest ) if (file == dest) return; +// if (linkOpp==createLink) out( "\ncreating links\n" ); +// if (linkOpp==removeLink) out( "\nremoving links\n" ); QFileInfo fileInfo( file ); @@ -267,14 +270,14 @@ void PmIpkg::remove() to_remove.at(i)->processed(); + if ( to_remove.at(i)->link() ) + processFileList( fileList, to_remove.at(i)->dest() ); to_remove.take( i ); - out("\n\n"); + out("\n"); }else{ out(tr("Error while removing")+to_remove.at(i)->name()+"\n"); + if ( to_remove.at(i)->link() ) + processFileList( fileList, to_remove.at(i)->dest() ); } if ( to_remove.at(i)->link() ) - { - out( "\nremoving links\n" ); - out( "for package "+to_remove.at(i)->name()+" in "+to_remove.at(i)->dest()+"\n" ); processFileList( fileList, to_remove.at(i)->dest() ); - } if ( to_remove.at(i)->link() )delete fileList; @@ -292,2 +295,3 @@ void PmIpkg::install() { + qDebug("install loop %i of %i installing %s",i,to_install.count(),to_install.at(i)->installName().latin1()); //pvDebug if ( runIpkg("install " + to_install.at(i)->installName(), to_install.at(i)->dest() )) @@ -296,13 +300,12 @@ void PmIpkg::install() to_install.at(i)->processed(); + linkOpp = createLink; + if ( to_install.at(i)->link() ) + makeLinks( to_install.at(i) ); to_install.take( i ); - out("\n\n"); + out("\n"); }else{ out(tr("Error while installing")+to_install.at(i)->name()+"\n"); - } - linkOpp = createLink; - if ( to_install.at(i)->link() ) - { - out( "\ncreating links\n" ); - out( "for package "+to_install.at(i)->name()+" in "+to_install.at(i)->dest()+"\n" ); - makeLinks( to_install.at(i) ); + linkOpp = createLink; + if ( to_install.at(i)->link() ) + makeLinks( to_install.at(i) ); } |