author | tille <tille> | 2002-07-16 16:08:17 (UTC) |
---|---|---|
committer | tille <tille> | 2002-07-16 16:08:17 (UTC) |
commit | 6d5261a534612f0f993caca801e7c7e1a5c74f32 (patch) (unidiff) | |
tree | 41059fbab96533b103a76f01957f929da76cc5a5 | |
parent | 9ccdc7ad1e8d42c40937ce1cfe218fe2a673b048 (diff) | |
download | opie-6d5261a534612f0f993caca801e7c7e1a5c74f32.zip opie-6d5261a534612f0f993caca801e7c7e1a5c74f32.tar.gz opie-6d5261a534612f0f993caca801e7c7e1a5c74f32.tar.bz2 |
fixed update
-rw-r--r-- | noncore/unsupported/oipkg/packagelist.cpp | 2 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/pmipkg.cpp | 36 |
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 ) | |||
63 | QDict<Package> *packver = p->getOtherVersions(); | 63 | QDict<Package> *packver = p->getOtherVersions(); |
64 | // p->setName( pack->name()+"["+p->version()+"]" ); | 64 | // p->setName( pack->name()+"["+p->version()+"]" ); |
65 | if (!packver) | 65 | if (!packver) |
66 | { | 66 | { |
67 | packver = new QDict<Package>(); | 67 | packver = new QDict<Package>(); |
68 | packver->insert( pack->name(), p ); | 68 | packver->insert( pack->name(), p ); |
69 | p->setOtherVersions( packver ); | 69 | p->setOtherVersions( packver ); |
70 | } | 70 | } |
71 | pack->setName( pack->name()+"["+pack->version()+"]" ); | 71 | pack->setName( pack->name() );//+"["+pack->version()+"]" ); |
72 | pack->setOtherVersions( packver ); | 72 | pack->setOtherVersions( packver ); |
73 | packver->insert( pack->name(), pack ); | 73 | packver->insert( pack->name(), pack ); |
74 | packageListAll->insert( pack->name(), pack ); | 74 | packageListAll->insert( pack->name(), pack ); |
75 | packageList.insert( pack->name(), pack ); | 75 | packageList.insert( pack->name(), pack ); |
76 | origPackageList.insert( pack->name(), pack ); | 76 | origPackageList.insert( pack->name(), pack ); |
77 | } | 77 | } |
78 | }else{ | 78 | }else{ |
79 | packageListAll->insert( pack->name(), pack ); | 79 | 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 ) | |||
68 | QString cmd = "/usr/bin/ipkg "; | 68 | QString cmd = "/usr/bin/ipkg "; |
69 | #ifdef OPROCESS | 69 | #ifdef OPROCESS |
70 | ipkgProcess->kill(); | 70 | ipkgProcess->kill(); |
71 | ipkgProcess->clearArguments(); | 71 | ipkgProcess->clearArguments(); |
72 | *ipkgProcess << "/usr/bin/ipkg "; | 72 | *ipkgProcess << "/usr/bin/ipkg "; |
73 | cmd = ""; | 73 | cmd = ""; |
74 | #endif | 74 | #endif |
75 | pvDebug( 3,"PmIpkg::runIpkg got dest="+dest); | 75 | pvDebug( 3,"PmIpkg::runIpkg got dest="+dest); |
76 | if ( dest == "" ) | 76 | if (!args.contains("update")) |
77 | cmd += " -dest "+settings->getDestinationName(); | 77 | { |
78 | else | 78 | if ( dest == "" ) |
79 | cmd += " -dest "+ dest; | 79 | cmd += " -dest "+settings->getDestinationName(); |
80 | else | ||
81 | cmd += " -dest "+ dest; | ||
80 | 82 | ||
81 | cmd += " -force-defaults "; | 83 | cmd += " -force-defaults "; |
82 | 84 | ||
83 | if (installDialog && installDialog->_force_depends) | 85 | if ( installDialog && installDialog->_force_depends ) |
84 | { | 86 | { |
85 | if (installDialog->_force_depends->isChecked()) | 87 | if (installDialog->_force_depends->isChecked()) |
86 | cmd += " -force-depends "; | 88 | cmd += " -force-depends "; |
87 | if (installDialog->_force_reinstall->isChecked()) | 89 | if (installDialog->_force_reinstall->isChecked()) |
88 | cmd += " -force-reinstall "; | 90 | cmd += " -force-reinstall "; |
89 | if (installDialog->_force_remove->isChecked()) | 91 | if (installDialog->_force_remove->isChecked()) |
90 | cmd += " -force-removal-of-essential-packages "; | 92 | cmd += " -force-removal-of-essential-packages "; |
91 | } | 93 | } |
94 | } //!args.contains("update") | ||
92 | 95 | ||
93 | out( "Starting to "+ args+"\n"); | 96 | out( "Starting to "+ args+"\n"); |
97 | qApp->processEvents(); | ||
94 | cmd += args; | 98 | cmd += args; |
95 | out( "running:\n"+cmd+"\n" ); | 99 | out( "running:\n"+cmd+"\n" ); |
96 | pvDebug(2,"running:"+cmd); | 100 | pvDebug(2,"running:"+cmd); |
97 | #ifdef OPROCESS | 101 | #ifdef OPROCESS |
98 | *ipkgProcess << args; | 102 | *ipkgProcess << args; |
99 | out( "running:\n" + cmd); | 103 | out( "running:\n" + cmd); |
100 | *ipkgProcess << cmd; | 104 | *ipkgProcess << cmd; |
101 | 105 | ||
@@ -428,19 +432,17 @@ void PmIpkg::removeLinks( const QString &dest ) | |||
428 | url = url==""?dest:url; | 432 | url = url==""?dest:url; |
429 | processLinkDir( "/opt", url ); | 433 | processLinkDir( "/opt", url ); |
430 | processLinkDir( "/usr", url ); | 434 | processLinkDir( "/usr", url ); |
431 | } | 435 | } |
432 | 436 | ||
433 | void PmIpkg::update() | 437 | void PmIpkg::update() |
434 | { | 438 | { |
435 | show(); | 439 | show(); |
436 | if ( runIpkg( "update" ) ) | 440 | runIpkg( "update" ); |
437 | runwindow->close(); | ||
438 | else out("An error occurred!\nPlease check the log."); | ||
439 | } | 441 | } |
440 | 442 | ||
441 | void PmIpkg::out( QString o ) | 443 | void PmIpkg::out( QString o ) |
442 | { | 444 | { |
443 | runwindow->outPut->append(o); | 445 | runwindow->outPut->append(o); |
444 | runwindow->outPut->setCursorPosition(runwindow->outPut->numLines() + 1,0,FALSE); | 446 | runwindow->outPut->setCursorPosition(runwindow->outPut->numLines() + 1,0,FALSE); |
445 | } | 447 | } |
446 | 448 | ||