summaryrefslogtreecommitdiff
path: root/noncore/unsupported/oipkg/pmipkg.cpp
Side-by-side diff
Diffstat (limited to 'noncore/unsupported/oipkg/pmipkg.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/unsupported/oipkg/pmipkg.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/noncore/unsupported/oipkg/pmipkg.cpp b/noncore/unsupported/oipkg/pmipkg.cpp
index 0ae74da..5996e63 100644
--- a/noncore/unsupported/oipkg/pmipkg.cpp
+++ b/noncore/unsupported/oipkg/pmipkg.cpp
@@ -30,30 +30,31 @@ PmIpkg::PmIpkg( PackageManagerSettings* s, QWidget* p, const char * name, WFlag
: QObject ( p )
{
settings = s;
runwindow = new RunWindow( p, name, true, f );
}
PmIpkg::~PmIpkg()
{
}
//#define PROC
#define SYSTEM
+#define QT_QPROCESS_DEBUG
int PmIpkg::runIpkg(const QString& args, const QString& dest )
{
pvDebug(2,"PmIpkg::runIpkg "+args);
-
+ QDir::setCurrent("/tmp");
#ifdef PROC
- QStringList cmd = "ipkg ";
+ QString cmd;
#endif
#ifdef SYSTEM
QString cmd = "/usr/bin/ipkg ";
#endif
pvDebug( 3,"PmIpkg::runIpkg got dest="+dest);
if ( dest == "" )
cmd += " -dest "+settings->getDestinationName();
else
cmd += " -dest "+ dest;
cmd += " -force-defaults ";
@@ -63,25 +64,25 @@ int PmIpkg::runIpkg(const QString& args, const QString& dest )
cmd += " -force-depends ";
if (installDialog->_force_reinstall->isChecked())
cmd += " -force-reinstall ";
if (installDialog->_force_remove->isChecked())
cmd += " -force-removal-of-essential-packages ";
}
out( "<hr><br>Starting to "+ args+"<br>\n");
cmd += args;
int r = 0;
#ifdef PROC
QString o = "start";
- Process *ipkg = new Process( cmd );
+ Process *ipkg = new Process(QStringList() << "ipkg" << cmd );
out( "running:<br>\n"+ipkg->arguments().join(" ")+"<br>\n" );
QString description;
r = ipkg->exec("",o);
out( o );
#endif
#ifdef SYSTEM
out( "running:<br>\n"+cmd+"<br>\n" );
QString redirect = "/tmp/oipkg.pipe";
cmd += " 2>&1 | tee "+redirect+" 2>&1";
pvDebug(2, "running >"+cmd+"<");
r = system(cmd.latin1());
QFile f( redirect );
@@ -288,25 +289,25 @@ void PmIpkg::remove()
out("<br>");
}
void PmIpkg::install()
{
if ( to_install.count() == 0 ) return;
out("<b>"+tr("Installing")+"<br>"+tr("please wait")+"</b><br>");
for (uint i=0; i < to_install.count(); i++)
{
if ( runIpkg("install " + to_install.at(i)->installName(), to_install.at(i)->dest() ) == 0 )
{
- runwindow->progress->setProgress( to_install.at(i)->size().toInt() );
+ runwindow->progress->setProgress( to_install.at(i)->size().toInt() + runwindow->progress->progress());
linkOpp = createLink;
if ( to_install.at(i)->link() )
{
out( "<br>creating links<br>" );
out( "for package "+to_install.at(i)->name()+" in "+to_install.at(i)->dest()+"<br>" );
makeLinks( to_install.at(i) );
}
to_install.at(i)->processed();
to_install.take( i );
out("<br><hr>");
}else{
out("<b>"+tr("Error while installing")+"</b><hr>"+to_install.at(i)->name());