Changeset c88b2a4


Ignore:
Timestamp:
04/25/13 11:41:54 (15 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.1-release, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2
Children:
2b9c5b7
Parents:
dc23852
Message:

Fix some bugs working with PKGNG in a chroot

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-pkgmanager/mainWin.cpp

    rafa0da8 rc88b2a4  
    5555  if ( curMode == "Advanced" ) 
    5656  { 
    57     stackedPkgView->setCurrentIndex(1); 
    58     action_Basic->setChecked(false); 
    59     action_Advanced->setChecked(true); 
     57     stackedPkgView->setCurrentIndex(1); 
     58     action_Basic->setChecked(false); 
     59     action_Advanced->setChecked(true); 
     60  } 
     61 
     62  // If we are running on a chroot, only do advanced mode 
     63  if ( !wDir.isEmpty() ) 
     64  { 
     65     stackedPkgView->setCurrentIndex(1); 
     66     action_Advanced->setChecked(true); 
     67     menu_View->setEnabled(false); 
     68     menu_View->setVisible(false); 
    6069  } 
    6170 
     
    490499    p.start("pkg", QStringList() << "rquery" << "-a" << "%n-%v:::%dn-%dv"); 
    491500  else 
    492     p.start("chroot", QStringList() << wDir << "pkg" "rquery" << "-a" << "%n-%v:::%dn-%dv" ); 
     501    p.start("chroot", QStringList() << wDir << "pkg" << "rquery" << "-a" << "%n-%v:::%dn-%dv" ); 
    493502  while(p.state() == QProcess::Starting || p.state() == QProcess::Running) { 
    494503      p.waitForFinished(200); 
     
    504513    p.start("pkg", QStringList() << "rquery" << "-a" << "%n-%v:::%rn-%rv"); 
    505514  else 
    506     p.start("chroot", QStringList() << wDir << "pkg" "rquery" << "-a" << "%n-%v:::%rn-%rv" ); 
     515    p.start("chroot", QStringList() << wDir << "pkg" << "rquery" << "-a" << "%n-%v:::%rn-%rv" ); 
    507516  while(p.state() == QProcess::Starting || p.state() == QProcess::Running) { 
    508517      p.waitForFinished(200); 
     
    521530    getNGProc->start(QString("pkg"), QStringList() << "info" << "-aq" ); 
    522531  else 
    523     getNGProc->start(QString("chroot"), QStringList() << wDir << "pkg" "info" "-aq"); 
     532    getNGProc->start(QString("chroot"), QStringList() << wDir << "pkg" << "info" << "-aq"); 
    524533 
    525534} 
     
    693702      pCmds << "pkg" << "delete" << "-R" << "-y" << pkgRemoveList.join(" "); 
    694703    else 
    695       pCmds << "chroot" << "wDir" << "pkg" << "delete" << "-R" << "-y" << pkgRemoveList.join(" "); 
     704      pCmds << "chroot" << wDir << "pkg" << "delete" << "-R" << "-y" << pkgRemoveList.join(" "); 
    696705    pkgCmdList << pCmds; 
    697706  } 
     
    703712      pCmds << "pc-pkg" << "install" << "-y" << pkgAddList.join(" "); 
    704713    else 
    705       pCmds << "chroot" << "wDir" << "pc-pkg" << "install" << "-y" << pkgAddList.join(" "); 
     714      pCmds << "chroot" << wDir << "pc-pkg" << "install" << "-y" << pkgAddList.join(" "); 
    706715    pkgCmdList << pCmds; 
    707716  } 
Note: See TracChangeset for help on using the changeset viewer.