projects
/
oweals
/
opkg-lede.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libopkg: remove internal dependency on libopkg.h and opkg_cmd.h
[oweals/opkg-lede.git]
/
libopkg
/
opkg_remove.c
diff --git
a/libopkg/opkg_remove.c
b/libopkg/opkg_remove.c
index 1a84e95bc609497ac212141009cd852ebb528ec7..afb8aa79e9b2d040931933fc18d965957d2d7975 100644
(file)
--- a/
libopkg/opkg_remove.c
+++ b/
libopkg/opkg_remove.c
@@
-26,8
+26,6
@@
#include "sprintf_alloc.h"
#include "str_util.h"
#include "sprintf_alloc.h"
#include "str_util.h"
-#include "opkg_cmd.h"
-
/*
* Returns number of the number of packages depending on the packages provided by this package.
* Every package implicitly provides itself.
/*
* Returns number of the number of packages depending on the packages provided by this package.
* Every package implicitly provides itself.
@@
-204,11
+202,13
@@
static int remove_autoinstalled (opkg_conf_t *conf, pkg_t *pkg)
deps = pkg_has_installed_dependents(conf, NULL, p, &dependents);
if (deps == 0)
{
deps = pkg_has_installed_dependents(conf, NULL, p, &dependents);
if (deps == 0)
{
- printf ("%s was autoinstalled but is now orphaned\n", buffer);
+ opkg_message (conf, OPKG_INFO,
+ "%s was autoinstalled but is now orphaned\n", buffer);
opkg_remove_pkg(conf, p,0);
}
else
opkg_remove_pkg(conf, p,0);
}
else
- printf ("%s was autoinstalled and is still required by %d installed packages\n", buffer, deps);
+ opkg_message (conf, OPKG_INFO, "%s was autoinstalled and is still required by "
+ "%d installed packages\n", buffer, deps);
}
free (buffer);
}
}
free (buffer);
}
@@
-272,7
+272,8
@@
int opkg_remove_pkg(opkg_conf_t *conf, pkg_t *pkg,int message)
}
if ( message==0 ){
}
if ( message==0 ){
- printf("Removing package %s from %s...\n", pkg->name, pkg->dest->name);
+ opkg_message (conf, OPKG_NOTICE,
+ "Removing package %s from %s...\n", pkg->name, pkg->dest->name);
fflush(stdout);
}
pkg->state_flag |= SF_FILELIST_CHANGED;
fflush(stdout);
}
pkg->state_flag |= SF_FILELIST_CHANGED;
@@
-349,7
+350,8
@@
int remove_data_files_and_list(opkg_conf_t *conf, pkg_t *pkg)
this seems like a better thing to do to conserve
space. */
if (conffile_has_been_modified(conf, conffile)) {
this seems like a better thing to do to conserve
space. */
if (conffile_has_been_modified(conf, conffile)) {
- printf(" not deleting modified conffile %s\n", file_name);
+ opkg_message (conf, OPKG_NOTICE,
+ " not deleting modified conffile %s\n", file_name);
fflush(stdout);
continue;
}
fflush(stdout);
continue;
}