summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/unsupported/oipkg/packagelist.cpp2
-rw-r--r--noncore/unsupported/oipkg/pmipkg.cpp36
2 files changed, 20 insertions, 18 deletions
diff --git a/noncore/unsupported/oipkg/packagelist.cpp b/noncore/unsupported/oipkg/packagelist.cpp
index f6c4c37..844f43f 100644
--- a/noncore/unsupported/oipkg/packagelist.cpp
+++ b/noncore/unsupported/oipkg/packagelist.cpp
@@ -63,17 +63,17 @@ void PackageList::insertPackage( Package* pack )
QDict<Package> *packver = p->getOtherVersions();
// p->setName( pack->name()+"["+p->version()+"]" );
if (!packver)
{
packver = new QDict<Package>();
packver->insert( pack->name(), p );
p->setOtherVersions( packver );
}
- pack->setName( pack->name()+"["+pack->version()+"]" );
+ pack->setName( pack->name() );//+"["+pack->version()+"]" );
pack->setOtherVersions( packver );
packver->insert( pack->name(), pack );
packageListAll->insert( pack->name(), pack );
packageList.insert( pack->name(), pack );
origPackageList.insert( pack->name(), pack );
}
}else{
packageListAll->insert( pack->name(), pack );
diff --git a/noncore/unsupported/oipkg/pmipkg.cpp b/noncore/unsupported/oipkg/pmipkg.cpp
index 2ed86ee..bffad15 100644
--- a/noncore/unsupported/oipkg/pmipkg.cpp
+++ b/noncore/unsupported/oipkg/pmipkg.cpp
@@ -68,34 +68,38 @@ bool PmIpkg::runIpkg(const QString& args, const QString& dest )
QString cmd = "/usr/bin/ipkg ";
#ifdef OPROCESS
ipkgProcess->kill();
ipkgProcess->clearArguments();
*ipkgProcess << "/usr/bin/ipkg ";
cmd = "";
#endif
pvDebug( 3,"PmIpkg::runIpkg got dest="+dest);
- if ( dest == "" )
- cmd += " -dest "+settings->getDestinationName();
- else
- cmd += " -dest "+ dest;
+ if (!args.contains("update"))
+ {
+ if ( dest == "" )
+ cmd += " -dest "+settings->getDestinationName();
+ else
+ cmd += " -dest "+ dest;
- cmd += " -force-defaults ";
+ cmd += " -force-defaults ";
- if (installDialog && installDialog->_force_depends)
- {
- if (installDialog->_force_depends->isChecked())
- cmd += " -force-depends ";
- if (installDialog->_force_reinstall->isChecked())
- cmd += " -force-reinstall ";
- if (installDialog->_force_remove->isChecked())
- cmd += " -force-removal-of-essential-packages ";
- }
+ if ( installDialog && installDialog->_force_depends )
+ {
+ if (installDialog->_force_depends->isChecked())
+ cmd += " -force-depends ";
+ if (installDialog->_force_reinstall->isChecked())
+ cmd += " -force-reinstall ";
+ if (installDialog->_force_remove->isChecked())
+ cmd += " -force-removal-of-essential-packages ";
+ }
+ } //!args.contains("update")
out( "Starting to "+ args+"\n");
+ qApp->processEvents();
cmd += args;
out( "running:\n"+cmd+"\n" );
pvDebug(2,"running:"+cmd);
#ifdef OPROCESS
*ipkgProcess << args;
out( "running:\n" + cmd);
*ipkgProcess << cmd;
@@ -428,19 +432,17 @@ void PmIpkg::removeLinks( const QString &dest )
url = url==""?dest:url;
processLinkDir( "/opt", url );
processLinkDir( "/usr", url );
}
void PmIpkg::update()
{
show();
- if ( runIpkg( "update" ) )
- runwindow->close();
- else out("An error occurred!\nPlease check the log.");
+ runIpkg( "update" );
}
void PmIpkg::out( QString o )
{
runwindow->outPut->append(o);
runwindow->outPut->setCursorPosition(runwindow->outPut->numLines() + 1,0,FALSE);
}