| author | andyq <andyq> | 2002-10-25 14:37:28 (UTC) |
|---|---|---|
| committer | andyq <andyq> | 2002-10-25 14:37:28 (UTC) |
| commit | f4007b261a7a4dc9672a1806be50ea16ccfc84f1 (patch) (side-by-side diff) | |
| tree | 5a2469d149be879bd221a1d1f07d9cab7cab5a49 /noncore/settings/aqpkg/ipkg.cpp | |
| parent | 3421736c248c6ca7171bafdf3af9e2edf94eb593 (diff) | |
| download | opie-f4007b261a7a4dc9672a1806be50ea16ccfc84f1.zip opie-f4007b261a7a4dc9672a1806be50ea16ccfc84f1.tar.gz opie-f4007b261a7a4dc9672a1806be50ea16ccfc84f1.tar.bz2 | |
Hopefully handles upgrading to newer packages correctly
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 @@ -63,12 +63,10 @@ bool Ipkg :: runIpkg( ) cmd += runtimeDir; cmd += " ; "; } - cmd += "ipkg"; - - if ( option != "update" && option != "download" && option != "upgrade" ) + cmd += "ipkg -force-defaults"; + if ( option != "update" && option != "download" ) { cmd += " -dest "+ destination; - cmd += " -force-defaults"; if ( flags & FORCE_DEPENDS ) cmd += " -force-depends"; @@ -101,7 +99,7 @@ bool Ipkg :: runIpkg( ) cmd += " install"; else cmd += " " + option; - if ( option != "upgrade" ) + if ( package != "" ) cmd += " " + package; cmd += " 2>&1"; |