diff options
| author | Koen Kooi <koen@openembedded.org> | 2005-06-30 08:19:37 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-06-30 08:19:37 +0000 |
| commit | c8e5702127e507e82e6f68a4b8c546803accea9d (patch) | |
| tree | 00583491f40ecc640f2b28452af995e3a63a09d7 /packages/ipkg/ipkg-0.99.135 | |
| parent | 87ec8ca4d2e2eb4d1c1e1e1a6b46a395d56805b9 (diff) | |
import clean BK tree at cset 1.3670
Diffstat (limited to 'packages/ipkg/ipkg-0.99.135')
| -rw-r--r-- | packages/ipkg/ipkg-0.99.135/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/ipkg/ipkg-0.99.135/remove-c99isms.patch | 42 | ||||
| -rw-r--r-- | packages/ipkg/ipkg-0.99.135/terse.patch | 18 |
3 files changed, 60 insertions, 0 deletions
diff --git a/packages/ipkg/ipkg-0.99.135/.mtn2git_empty b/packages/ipkg/ipkg-0.99.135/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/ipkg/ipkg-0.99.135/.mtn2git_empty diff --git a/packages/ipkg/ipkg-0.99.135/remove-c99isms.patch b/packages/ipkg/ipkg-0.99.135/remove-c99isms.patch index e69de29bb2..e70f3af9ff 100644 --- a/packages/ipkg/ipkg-0.99.135/remove-c99isms.patch +++ b/packages/ipkg/ipkg-0.99.135/remove-c99isms.patch @@ -0,0 +1,42 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- C/ipkg_install.c~remove-c99isms.patch ++++ C/ipkg_install.c +@@ -186,14 +186,16 @@ + { + abstract_pkg_vec_t *providers = pkg_hash_fetch_all_installation_candidates (&conf->pkg_hash, pkg_name); + int i; ++ ipkg_error_t err; ++ abstract_pkg_t *ppkg; + + if (providers == NULL) + return IPKG_PKG_HAS_NO_CANDIDATE; + + for (i = 0; i < providers->len; i++) { +- abstract_pkg_t *ppkg = abstract_pkg_vec_get(providers, i); +- ipkg_message(conf, IPKG_DEBUG2,"Function: %s calling ipkg_install_by_name %d \n",__FUNCTION__, i); +- ipkg_error_t err = ipkg_install_by_name(conf, ppkg->name); ++ ppkg = abstract_pkg_vec_get(providers, i); ++ ipkg_message(conf, IPKG_DEBUG2,"Function: %s calling ipkg_install_by_name %d \n",__FUNCTION__, i); ++ err = ipkg_install_by_name(conf, ppkg->name); + if (err) + return err; + } +@@ -614,12 +616,13 @@ + int pkg_remove_installed_replacees_unwind(ipkg_conf_t *conf, pkg_vec_t *replacees) + { + int i; ++ int err; + int replaces_count = replacees->len; + for (i = 0; i < replaces_count; i++) { + pkg_t *replacee = replacees->pkgs[i]; + if (replacee->state_status != SS_INSTALLED) { + ipkg_message(conf, IPKG_DEBUG2,"Function: %s calling ipkg_install_pkg \n",__FUNCTION__); +- int err = ipkg_install_pkg(conf, replacee); ++ err = ipkg_install_pkg(conf, replacee); + if (err) + return err; + } diff --git a/packages/ipkg/ipkg-0.99.135/terse.patch b/packages/ipkg/ipkg-0.99.135/terse.patch index e69de29bb2..3c4d6bed7e 100644 --- a/packages/ipkg/ipkg-0.99.135/terse.patch +++ b/packages/ipkg/ipkg-0.99.135/terse.patch @@ -0,0 +1,18 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- C/ipkg_cmd.c~terse ++++ C/ipkg_cmd.c +@@ -148,9 +146,7 @@ + int result; + p_userdata = userdata; + result = (cmd->fun)(conf, argc, argv); +- if ( result == 0 ) { +- ipkg_message(conf, IPKG_NOTICE, "Successfully terminated.\n"); +- } else { ++ if ( result != 0 ) { + ipkg_message(conf, IPKG_NOTICE, "An error ocurred, return value: %d.\n", result); + } + |