summaryrefslogtreecommitdiff
path: root/pkgtools/pkg_install
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2011-09-29 23:30:21 +0000
committerwiz <wiz@pkgsrc.org>2011-09-29 23:30:21 +0000
commit47f00f034b570637c8bdf9af1089559977132056 (patch)
tree33c16d228d9dbc67b91b9cb73da5036015cbbdc9 /pkgtools/pkg_install
parent5948b1d84659197030db4b1d7dfca5008657838d (diff)
downloadpkgsrc-47f00f034b570637c8bdf9af1089559977132056.tar.gz
pkg_delete -R does not remove all leaves.
Fix from Anthony Mallet on tech-pkg. While here, fix a typo in a comment.
Diffstat (limited to 'pkgtools/pkg_install')
-rw-r--r--pkgtools/pkg_install/files/delete/pkg_delete.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgtools/pkg_install/files/delete/pkg_delete.c b/pkgtools/pkg_install/files/delete/pkg_delete.c
index fa063518f9b..fa343c411f8 100644
--- a/pkgtools/pkg_install/files/delete/pkg_delete.c
+++ b/pkgtools/pkg_install/files/delete/pkg_delete.c
@@ -34,7 +34,7 @@
#if HAVE_SYS_CDEFS_H
#include <sys/cdefs.h>
#endif
-__RCSID("$NetBSD: pkg_delete.c,v 1.11 2010/02/03 14:20:14 joerg Exp $");
+__RCSID("$NetBSD: pkg_delete.c,v 1.12 2011/09/29 23:30:21 wiz Exp $");
#if HAVE_ERR_H
#include <err.h>
@@ -307,7 +307,7 @@ struct find_leaves_data {
* Packages that are marked as not for deletion are not considered as
* leaves. For all other packages it is checked if at least one package
* that depended on them is to be removed AND no depending package remains.
- * If that is the case, the package is appened to the sorted list.
+ * If that is the case, the package is appended to the sorted list.
* As this package can't have depending packages left, the topological order
* remains consistent.
*/
@@ -338,7 +338,7 @@ find_new_leaves_iter(const char *pkg, void *cookie)
if (process_required_by(pkg, NULL, data->pkgs, 3) == 1) {
lpp = alloc_lpkg(pkg);
TAILQ_INSERT_TAIL(data->pkgs, lpp, lp_link);
- data->progress = 0;
+ data->progress = 1;
}
return 0;