summaryrefslogtreecommitdiff
authortille <tille>2002-07-25 12:29:45 (UTC)
committer tille <tille>2002-07-25 12:29:45 (UTC)
commit8895e9bd55244f32f12ff619e020a23afac44808 (patch) (unidiff)
treec2d1be286eeb7146af5a6caf69fec3e4f56b5438
parent6773dde79921b0a85040b2f74e89428c5f355fc0 (diff)
downloadopie-8895e9bd55244f32f12ff619e020a23afac44808.zip
opie-8895e9bd55244f32f12ff619e020a23afac44808.tar.gz
opie-8895e9bd55244f32f12ff619e020a23afac44808.tar.bz2
eliminated output mess
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/unsupported/oipkg/pmipkg.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/noncore/unsupported/oipkg/pmipkg.cpp b/noncore/unsupported/oipkg/pmipkg.cpp
index 7682d49..84de67b 100644
--- a/noncore/unsupported/oipkg/pmipkg.cpp
+++ b/noncore/unsupported/oipkg/pmipkg.cpp
@@ -343,97 +343,98 @@ void PmIpkg::install()
343 if ( runIpkg("install " + to_install.at(i)->installName(), to_install.at(i)->dest() )) 343 if ( runIpkg("install " + to_install.at(i)->installName(), to_install.at(i)->dest() ))
344 { 344 {
345 runwindow->progress->setProgress( to_install.at(i)->size().toInt() + runwindow->progress->progress()); 345 runwindow->progress->setProgress( to_install.at(i)->size().toInt() + runwindow->progress->progress());
346 to_install.at(i)->processed(); 346 to_install.at(i)->processed();
347 linkOpp = createLink; 347 linkOpp = createLink;
348 if ( to_install.at(i)->link() ) 348 if ( to_install.at(i)->link() )
349 makeLinks( to_install.at(i) ); 349 makeLinks( to_install.at(i) );
350 // to_install.take( i ); 350 // to_install.take( i );
351 out("\n"); 351 out("\n");
352 }else{ 352 }else{
353 out(tr("Error while installing")+to_install.at(i)->name()+"\n"); 353 out(tr("Error while installing")+to_install.at(i)->name()+"\n");
354 linkOpp = createLink; 354 linkOpp = createLink;
355 if ( to_install.at(i)->link() ) 355 if ( to_install.at(i)->link() )
356 makeLinks( to_install.at(i) ); 356 makeLinks( to_install.at(i) );
357 } 357 }
358 } 358 }
359 out("\n"); 359 out("\n");
360 to_install.clear(); 360 to_install.clear();
361} 361}
362 362
363void PmIpkg::createLinks( const QString &dest ) 363void PmIpkg::createLinks( const QString &dest )
364{ 364{
365 pvDebug(2,"PmIpkg::createLinks "+dest); 365 pvDebug(2,"PmIpkg::createLinks "+dest);
366 linkOpp=createLink; 366 linkOpp=createLink;
367 QString url = settings->getDestinationUrlByName( dest ); 367 QString url = settings->getDestinationUrlByName( dest );
368 url = url==""?dest:url; 368 url = url==""?dest:url;
369 processLinkDir( "/opt", url ); 369 processLinkDir( "/opt", url );
370 processLinkDir( "/usr", url ); 370 processLinkDir( "/usr", url );
371} 371}
372 372
373void PmIpkg::removeLinks( const QString &dest ) 373void PmIpkg::removeLinks( const QString &dest )
374{ 374{
375 pvDebug(2,"PmIpkg::removeLinks "+dest); 375 pvDebug(2,"PmIpkg::removeLinks "+dest);
376 linkOpp=removeLink; 376 linkOpp=removeLink;
377 QString url = settings->getDestinationUrlByName( dest ); 377 QString url = settings->getDestinationUrlByName( dest );
378 url = url==""?dest:url; 378 url = url==""?dest:url;
379 processLinkDir( "/opt", url ); 379 processLinkDir( "/opt", url );
380 processLinkDir( "/usr", url ); 380 processLinkDir( "/usr", url );
381} 381}
382 382
383void PmIpkg::update() 383void PmIpkg::update()
384{ 384{
385 show(); 385 show();
386 runIpkg( "update" ); 386 runIpkg( "update" );
387} 387}
388 388
389void PmIpkg::out( QString o ) 389void PmIpkg::out( QString o )
390{ 390{
391 runwindow->outPut->append(o); 391 //runwindow->outPut->append(o);
392 runwindow->outPut->setText(runwindow->outPut->text()+o);
392 runwindow->outPut->setCursorPosition(runwindow->outPut->numLines() + 1,0,FALSE); 393 runwindow->outPut->setCursorPosition(runwindow->outPut->numLines() + 1,0,FALSE);
393} 394}
394 395
395 396
396 397
397 398
398void PmIpkg::show() 399void PmIpkg::show()
399{ 400{
400 if (!runwindow->isVisible()) 401 if (!runwindow->isVisible())
401 { 402 {
402 runwindow->showMaximized(); 403 runwindow->showMaximized();
403 runwindow->show(); 404 runwindow->show();
404 } 405 }
405 runwindow->outPut->setText(""); 406 runwindow->outPut->setText("");
406} 407}
407 408
408void PmIpkg::installFile(const QString &fileName, const QString &dest) 409void PmIpkg::installFile(const QString &fileName, const QString &dest)
409{ 410{
410 411
411 to_install.clear(); 412 to_install.clear();
412 to_remove.clear(); 413 to_remove.clear();
413 pvDebug( 2,"PmIpkg::installFile "+ fileName); 414 pvDebug( 2,"PmIpkg::installFile "+ fileName);
414 Package *p = new Package(fileName,settings); 415 Package *p = new Package(fileName,settings);
415 if ( dest!="") p->setDest( dest ); 416 if ( dest!="") p->setDest( dest );
416 to_install.append( p ); 417 to_install.append( p );
417 commit(); 418 commit();
418 delete p; 419 delete p;
419} 420}
420 421
421void PmIpkg::removeFile(const QString &fileName, const QString &dest) 422void PmIpkg::removeFile(const QString &fileName, const QString &dest)
422{ 423{
423 424
424 to_install.clear(); 425 to_install.clear();
425 to_remove.clear(); 426 to_remove.clear();
426 pvDebug( 2,"PmIpkg::removeFile "+ fileName); 427 pvDebug( 2,"PmIpkg::removeFile "+ fileName);
427 Package *p = new Package(fileName,settings); 428 Package *p = new Package(fileName,settings);
428 if ( dest!="") p->setDest( dest ); 429 if ( dest!="") p->setDest( dest );
429 to_remove.append( p ); 430 to_remove.append( p );
430 commit(); 431 commit();
431 delete p; 432 delete p;
432} 433}
433 434
434 435
435void PmIpkg::clearLists() 436void PmIpkg::clearLists()
436{ 437{
437 to_remove.clear(); 438 to_remove.clear();
438 to_install.clear(); 439 to_install.clear();
439} 440}