summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/unsupported/oipkg/pmipkg.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/noncore/unsupported/oipkg/pmipkg.cpp b/noncore/unsupported/oipkg/pmipkg.cpp
index 11c0f97..7682d49 100644
--- a/noncore/unsupported/oipkg/pmipkg.cpp
+++ b/noncore/unsupported/oipkg/pmipkg.cpp
@@ -157,25 +157,25 @@ QStringList* PmIpkg::getList( QString packFileName, QString d )
157} 157}
158 158
159void PmIpkg::linkPackage( QString packFileName, QString dest ) 159void PmIpkg::linkPackage( QString packFileName, QString dest )
160{ 160{
161 if (dest == "root" || dest == "/" ) return; 161 if (dest == "root" || dest == "/" ) return;
162 QStringList *fileList = getList( packFileName, dest ); 162 QStringList *fileList = getList( packFileName, dest );
163 processFileList( fileList, dest ); 163 processFileList( fileList, dest );
164 delete fileList; 164 delete fileList;
165} 165}
166 166
167void PmIpkg::processFileList( QStringList *fileList, QString d ) 167void PmIpkg::processFileList( QStringList *fileList, QString d )
168{ 168{
169 if (!fileList) return; 169 if (!fileList || fileList->isEmpty()) return;
170 for (uint i=0; i < fileList->count(); i++) 170 for (uint i=0; i < fileList->count(); i++)
171 { 171 {
172 QString dest = settings->getDestinationUrlByName( d ); 172 QString dest = settings->getDestinationUrlByName( d );
173 dest = dest==""?d:dest; 173 dest = dest==""?d:dest;
174 processLinkDir( (*fileList)[i], dest ); 174 processLinkDir( (*fileList)[i], dest );
175 } 175 }
176} 176}
177 177
178 178
179void PmIpkg::processLinkDir( QString file, QString dest ) 179void PmIpkg::processLinkDir( QString file, QString dest )
180{ 180{
181 pvDebug( 4,"PmIpkg::processLinkDir "+file+" to "+ dest); 181 pvDebug( 4,"PmIpkg::processLinkDir "+file+" to "+ dest);
@@ -283,25 +283,25 @@ void PmIpkg::doIt()
283} 283}
284 284
285 285
286void PmIpkg::remove() 286void PmIpkg::remove()
287{ 287{
288 if ( to_remove.count() == 0 ) return; 288 if ( to_remove.count() == 0 ) return;
289 289
290 out(tr("Removing")+"\n"+tr("please wait")+"\n\n"); 290 out(tr("Removing")+"\n"+tr("please wait")+"\n\n");
291 291
292 QStringList *fileList; 292 QStringList *fileList;
293 for (uint i=0; i < to_remove.count(); i++) 293 for (uint i=0; i < to_remove.count(); i++)
294 { 294 {
295 if ( to_remove.at(i)->link() )fileList = getList( to_remove.at(i)->name(), to_remove.at(i)->dest() ); 295 if ( to_remove.at(i)->link() ) fileList = getList( to_remove.at(i)->name(), to_remove.at(i)->dest() );
296 if ( runIpkg("remove " + to_remove.at(i)->installName(), to_remove.at(i)->dest() )) 296 if ( runIpkg("remove " + to_remove.at(i)->installName(), to_remove.at(i)->dest() ))
297 { 297 {
298 runwindow->progress->setProgress( 1 ); 298 runwindow->progress->setProgress( 1 );
299 linkOpp = removeLink; 299 linkOpp = removeLink;
300 to_remove.at(i)->processed(); 300 to_remove.at(i)->processed();
301 pvDebug(3,"link "+QString::number(i)); 301 pvDebug(3,"link "+QString::number(i));
302 if ( to_remove.at(i)->link() ) 302 if ( to_remove.at(i)->link() )
303 processFileList( fileList, to_remove.at(i)->dest() ); 303 processFileList( fileList, to_remove.at(i)->dest() );
304 //pvDebug(3,"take "+QString::number(i)+" of "+QString::number(to_remove.count())); 304 //pvDebug(3,"take "+QString::number(i)+" of "+QString::number(to_remove.count()));
305 //if ( to_remove.at(i) ) to_remove.take( i ); 305 //if ( to_remove.at(i) ) to_remove.take( i );
306 306
307 out("\n"); 307 out("\n");