summaryrefslogtreecommitdiff
path: root/noncore/unsupported
authortille <tille>2002-07-16 16:08:17 (UTC)
committer tille <tille>2002-07-16 16:08:17 (UTC)
commit6d5261a534612f0f993caca801e7c7e1a5c74f32 (patch) (side-by-side diff)
tree41059fbab96533b103a76f01957f929da76cc5a5 /noncore/unsupported
parent9ccdc7ad1e8d42c40937ce1cfe218fe2a673b048 (diff)
downloadopie-6d5261a534612f0f993caca801e7c7e1a5c74f32.zip
opie-6d5261a534612f0f993caca801e7c7e1a5c74f32.tar.gz
opie-6d5261a534612f0f993caca801e7c7e1a5c74f32.tar.bz2
fixed update
Diffstat (limited to 'noncore/unsupported') (more/less context) (show whitespace changes)
-rw-r--r--noncore/unsupported/oipkg/packagelist.cpp2
-rw-r--r--noncore/unsupported/oipkg/pmipkg.cpp8
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
@@ -68,7 +68,7 @@ void PackageList::insertPackage( Package* pack )
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 );
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
@@ -73,6 +73,8 @@ bool PmIpkg::runIpkg(const QString& args, const QString& dest )
cmd = "";
#endif
pvDebug( 3,"PmIpkg::runIpkg got dest="+dest);
+ if (!args.contains("update"))
+ {
if ( dest == "" )
cmd += " -dest "+settings->getDestinationName();
else
@@ -89,8 +91,10 @@ bool PmIpkg::runIpkg(const QString& args, const QString& dest )
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);
@@ -433,9 +437,7 @@ void PmIpkg::removeLinks( const QString &dest )
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 )