[PATCH 6/6] Before resolve dependencies, add all packages listed on the task
From: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
tools/list2cds | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/tools/list2cds b/tools/list2cds
index 427d814..5a055b2 100755
--- a/tools/list2cds
+++ b/tools/list2cds
@@ -192,10 +192,20 @@ while (defined($_=<LIST>)) {
next;
}
next if $excluded{$_};
- if ($included{$_}) {
+ if ($included{$_} == -1) {
msg(3, "$_ has already been included.\n");
next;
}
+
+ $included{$_} = -1;
+}
+close LIST;
+
+foreach (keys %included) {
+ next if ($included{$_} != -1);
+
+ $included{$_} = 0;
+
# This is because udebs tend to have bad dependencies but work
# nevertheless ... this may be removed once the udebs have a
# better depencency system
@@ -205,7 +215,6 @@ while (defined($_=<LIST>)) {
add_package ($_, ! $norecommends, ! $nosuggests);
}
}
-close LIST;
msg(0, " Now up to $cd_size bytes\n");
# All requested packages have been included
Reply to: