projects
/
oweals
/
opkg-lede.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Running a script does not change the state, modifying the state flags does.
[oweals/opkg-lede.git]
/
libopkg
/
opkg_configure.c
diff --git
a/libopkg/opkg_configure.c
b/libopkg/opkg_configure.c
index 94d37c28a320d0d026d74511a6967a5f7a6cc293..4aca0f07111141e64a02c38a5c916e1bf866c753 100644
(file)
--- a/
libopkg/opkg_configure.c
+++ b/
libopkg/opkg_configure.c
@@
-1,4
+1,4
@@
-/* opkg_configure.c - the
itsy
package management system
+/* opkg_configure.c - the
opkg
package management system
Carl D. Worth
Carl D. Worth
@@
-15,12
+15,14
@@
General Public License for more details.
*/
General Public License for more details.
*/
-#include "
opkg
.h"
+#include "
includes
.h"
#include "sprintf_alloc.h"
#include "opkg_configure.h"
#include "sprintf_alloc.h"
#include "opkg_configure.h"
-#include "opkg_state.h"
+#include "opkg_message.h"
+#include "opkg_cmd.h"
-int opkg_configure(opkg_conf_t *conf, pkg_t *pkg)
+int
+opkg_configure(pkg_t *pkg)
{
int err;
{
int err;
@@
-30,19
+32,12
@@
int opkg_configure(opkg_conf_t *conf, pkg_t *pkg)
/* DPKG_INCOMPATIBILITY:
dpkg actually includes a version number to this script call */
/* DPKG_INCOMPATIBILITY:
dpkg actually includes a version number to this script call */
- char *pkgid;
- sprintf_alloc (&pkgid, "%s;%s;%s;", pkg->name, pkg->version, pkg->architecture);
- opkg_set_current_state (conf, OPKG_STATE_CONFIGURING_PKG, pkgid);
- free (pkgid);
-
- err = pkg_run_script(conf, pkg, "postinst", "configure");
+ err = pkg_run_script(pkg, "postinst", "configure");
if (err) {
if (err) {
-
printf("ERROR: %s.postinst returned %d
\n", pkg->name, err);
+
opkg_msg(ERROR, "%s.postinst returned %d.
\n", pkg->name, err);
return err;
}
return err;
}
- opkg_state_changed++;
- opkg_set_current_state (conf, OPKG_STATE_NONE, NULL);
return 0;
}
return 0;
}