| -rw-r--r-- | noncore/unsupported/oipkg/packagelist.cpp | 2 | ||||
| -rw-r--r-- | noncore/unsupported/oipkg/pmipkg.cpp | 8 |
2 files changed, 6 insertions, 4 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 @@ -69,5 +69,5 @@ void PackageList::insertPackage( Package* pack ) p->setOtherVersions( packver ); } - pack->setName( pack->name()+"["+pack->version()+"]" ); + pack->setName( pack->name() );//+"["+pack->version()+"]" ); pack->setOtherVersions( packver ); packver->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 @@ -74,4 +74,6 @@ bool PmIpkg::runIpkg(const QString& args, const QString& dest ) #endif pvDebug( 3,"PmIpkg::runIpkg got dest="+dest); + if (!args.contains("update")) + { if ( dest == "" ) cmd += " -dest "+settings->getDestinationName(); @@ -90,6 +92,8 @@ bool PmIpkg::runIpkg(const QString& args, const QString& dest ) cmd += " -force-removal-of-essential-packages "; } + } //!args.contains("update") out( "Starting to "+ args+"\n"); + qApp->processEvents(); cmd += args; out( "running:\n"+cmd+"\n" ); @@ -434,7 +438,5 @@ void PmIpkg::update() { show(); - if ( runIpkg( "update" ) ) - runwindow->close(); - else out("An error occurred!\nPlease check the log."); + runIpkg( "update" ); } |