Diffstat (limited to 'noncore/settings/aqpkg/ipkg.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/aqpkg/ipkg.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/noncore/settings/aqpkg/ipkg.cpp b/noncore/settings/aqpkg/ipkg.cpp index 368548b..731a336 100644 --- a/noncore/settings/aqpkg/ipkg.cpp +++ b/noncore/settings/aqpkg/ipkg.cpp | |||
@@ -60,18 +60,16 @@ bool Ipkg :: runIpkg( ) | |||
60 | if ( runtimeDir != "" ) | 60 | if ( runtimeDir != "" ) |
61 | { | 61 | { |
62 | cmd += "cd "; | 62 | cmd += "cd "; |
63 | cmd += runtimeDir; | 63 | cmd += runtimeDir; |
64 | cmd += " ; "; | 64 | cmd += " ; "; |
65 | } | 65 | } |
66 | cmd += "ipkg"; | 66 | cmd += "ipkg -force-defaults"; |
67 | 67 | if ( option != "update" && option != "download" ) | |
68 | if ( option != "update" && option != "download" && option != "upgrade" ) | ||
69 | { | 68 | { |
70 | cmd += " -dest "+ destination; | 69 | cmd += " -dest "+ destination; |
71 | cmd += " -force-defaults"; | ||
72 | 70 | ||
73 | if ( flags & FORCE_DEPENDS ) | 71 | if ( flags & FORCE_DEPENDS ) |
74 | cmd += " -force-depends"; | 72 | cmd += " -force-depends"; |
75 | if ( flags & FORCE_REINSTALL ) | 73 | if ( flags & FORCE_REINSTALL ) |
76 | cmd += " -force-reinstall"; | 74 | cmd += " -force-reinstall"; |
77 | if ( flags & FORCE_REMOVE ) | 75 | if ( flags & FORCE_REMOVE ) |
@@ -98,13 +96,13 @@ bool Ipkg :: runIpkg( ) | |||
98 | 96 | ||
99 | 97 | ||
100 | if ( option == "reinstall" ) | 98 | if ( option == "reinstall" ) |
101 | cmd += " install"; | 99 | cmd += " install"; |
102 | else | 100 | else |
103 | cmd += " " + option; | 101 | cmd += " " + option; |
104 | if ( option != "upgrade" ) | 102 | if ( package != "" ) |
105 | cmd += " " + package; | 103 | cmd += " " + package; |
106 | cmd += " 2>&1"; | 104 | cmd += " 2>&1"; |
107 | 105 | ||
108 | 106 | ||
109 | if ( package != "" ) | 107 | if ( package != "" ) |
110 | emit outputText( QString( "Dealing with package " ) + package ); | 108 | emit outputText( QString( "Dealing with package " ) + package ); |