[Pkg-sysvinit-commits] r1478 - in sysvinit/trunk/debian/startpar: . patches

[Kel Modderman]

Author: kelmo-guest
Date: 2009-07-19 22:29:53 +0000 (Sun, 19 Jul 2009)
New Revision: 1478

Modified:
   sysvinit/trunk/debian/startpar/makeboot.c
   sysvinit/trunk/debian/startpar/patches/04_makeboot_loop_upper_bound.patch
Log:
Tweak debian/startpar/patches/04_makeboot_loop_upper_bound.patch a bit

Modified: sysvinit/trunk/debian/startpar/makeboot.c
===================================================================
--- sysvinit/trunk/debian/startpar/makeboot.c	2009-07-19 13:59:55 UTC (rev 1477)
+++ sysvinit/trunk/debian/startpar/makeboot.c	2009-07-19 22:29:53 UTC (rev 1478)
@@ -117,8 +117,11 @@
 			fprintf(stderr, "loop exists %s in %s!\n", dep->name, src->name);
 			return 1;
 		}
-		if (loop++ > 99999)
+		if (loop++ > 99999) {
+			fprintf(stderr, "too many loops! (loop=%d, dep->name=%s, src->name=%s)\n",
+				loop, dep->name, src->name);
 			return 1;
+		}
 		if (check_loop(s->node, src))
 			return 1;
 	}
@@ -134,10 +137,8 @@
 
 	dep = add_target(dst);
 	loop = 0;
-	if (check_loop(dep, node)) {
-		fprintf(stderr, "loop threshold of %d breached for %s\n", loop, dst);
+	if (check_loop(dep, node))
 		return;
-	}
 	dep->select = new_list(node, dep->select);
 	dep->num_sels++;
 	node->depend = new_list(dep, node->depend);

Modified: sysvinit/trunk/debian/startpar/patches/04_makeboot_loop_upper_bound.patch
===================================================================
--- sysvinit/trunk/debian/startpar/patches/04_makeboot_loop_upper_bound.patch	2009-07-19 13:59:55 UTC (rev 1477)
+++ sysvinit/trunk/debian/startpar/patches/04_makeboot_loop_upper_bound.patch	2009-07-19 22:29:53 UTC (rev 1478)
@@ -7,24 +7,16 @@
 ---
 --- a/makeboot.c
 +++ b/makeboot.c
-@@ -117,7 +117,7 @@ static int check_loop(struct makenode *d
+@@ -117,8 +117,11 @@ static int check_loop(struct makenode *d
  			fprintf(stderr, "loop exists %s in %s!\n", dep->name, src->name);
  			return 1;
  		}
 -		if (loop++ > 999)
-+		if (loop++ > 99999)
++		if (loop++ > 99999) {
++			fprintf(stderr, "too many loops! (loop=%d, dep->name=%s, src->name=%s)\n",
++				loop, dep->name, src->name);
  			return 1;
++		}
  		if (check_loop(s->node, src))
  			return 1;
-@@ -134,8 +134,10 @@ static void add_depend(struct makenode *
- 
- 	dep = add_target(dst);
- 	loop = 0;
--	if (check_loop(dep, node))
-+	if (check_loop(dep, node)) {
-+		fprintf(stderr, "loop threshold of %d breached for %s\n", loop, dst);
- 		return;
-+	}
- 	dep->select = new_list(node, dep->select);
- 	dep->num_sels++;
- 	node->depend = new_list(dep, node->depend);
+ 	}