summaryrefslogtreecommitdiff
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
parent9ccdc7ad1e8d42c40937ce1cfe218fe2a673b048 (diff)
downloadopie-6d5261a534612f0f993caca801e7c7e1a5c74f32.zip
opie-6d5261a534612f0f993caca801e7c7e1a5c74f32.tar.gz
opie-6d5261a534612f0f993caca801e7c7e1a5c74f32.tar.bz2
fixed update
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
@@ -70,3 +70,3 @@ void PackageList::insertPackage( Package* pack )
}
- pack->setName( pack->name()+"["+pack->version()+"]" );
+ pack->setName( pack->name() );//+"["+pack->version()+"]" );
pack->setOtherVersions( packver );
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
@@ -75,20 +75,24 @@ bool PmIpkg::runIpkg(const QString& args, const QString& dest )
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;
@@ -435,5 +439,3 @@ void PmIpkg::update()
show();
- if ( runIpkg( "update" ) )
- runwindow->close();
- else out("An error occurred!\nPlease check the log.");
+ runIpkg( "update" );
}