summaryrefslogtreecommitdiff
Unidiff
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
@@ -68,7 +68,7 @@ void PackageList::insertPackage( Package* pack )
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 );
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,24 +73,28 @@ bool PmIpkg::runIpkg(const QString& args, const QString& dest )
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);
@@ -433,9 +437,7 @@ void PmIpkg::removeLinks( const QString &dest )
433void PmIpkg::update() 437void 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
441void PmIpkg::out( QString o ) 443void PmIpkg::out( QString o )