pf-tools commit: r717 [ccaillet-guest] - in /branches/0.33-stable: TODO debian/changelog lib/PFTools/Update.pm

[parmelan-guest at users.alioth.debian.org]

Author: ccaillet-guest
Date: Wed Sep 16 12:05:23 2009
New Revision: 717

URL: http://svn.debian.org/wsvn/pf-tools/?sc=1&rev=717
Log:
* lib/PFTools/Update.pm
  - in Do_updateloop : skipping circular dependancies for avoiding infinite
    loop

Modified:
    branches/0.33-stable/TODO
    branches/0.33-stable/debian/changelog
    branches/0.33-stable/lib/PFTools/Update.pm

Modified: branches/0.33-stable/TODO
URL: http://svn.debian.org/wsvn/pf-tools/branches/0.33-stable/TODO?rev=717&op=diff
==============================================================================
--- branches/0.33-stable/TODO (original)
+++ branches/0.33-stable/TODO Wed Sep 16 12:05:23 2009
@@ -5,6 +5,7 @@
 UM use Net::IP for ipstart.* and check it is ok wrt the subnet declaration
 LE Add %SERIAL% in addition to %CONSOLE% for PXE, if it is really interesting ("serial 0 115200" by default)
 LE Obsolete mk_packages and update-links (just have to be sure no one uses them anymore)
+UM Implement a mecanism for checking circular dependancies across a dependancy chain
 
 UH br0/trunk sur uml (2e couche bridge?)
 NM Pouvoir forcer une version particulière d'un paquet (apt-get install paquet=version)

Modified: branches/0.33-stable/debian/changelog
URL: http://svn.debian.org/wsvn/pf-tools/branches/0.33-stable/debian/changelog?rev=717&op=diff
==============================================================================
--- branches/0.33-stable/debian/changelog (original)
+++ branches/0.33-stable/debian/changelog Wed Sep 16 12:05:23 2009
@@ -1,3 +1,12 @@
+pf-tools (0.33.19-0+WIP) unstable; urgency=low
+
+  [Christophe Caillet]
+  * lib/PFTools/Update.pm
+    - in Do_updateloop : skipping circular dependancies for avoiding infinite
+      loop
+
+ -- Christophe Caillet <tof at sitadelle.com>  Wed, 16 Sep 2009 14:04:21 +0200
+
 pf-tools (0.33.18-1) unstable; urgency=low
 
   [ Thomas Parmelan ]

Modified: branches/0.33-stable/lib/PFTools/Update.pm
URL: http://svn.debian.org/wsvn/pf-tools/branches/0.33-stable/lib/PFTools/Update.pm?rev=717&op=diff
==============================================================================
--- branches/0.33-stable/lib/PFTools/Update.pm (original)
+++ branches/0.33-stable/lib/PFTools/Update.pm Wed Sep 16 12:05:23 2009
@@ -1691,6 +1691,14 @@
 
 		foreach $d (@dependsraw) {
 		    if ( defined($d) && $d ne "" && defined( $C->{$d} ) ) {
+			if ( $d eq $s ) {
+			    Warn ( $ERR_SYNTAX,
+					"["
+					. $s
+					. "] circular dependancy detected, skipping this depend"
+			    );
+			    FlushLog();
+			}
 			push @depends, $d;
 			if ( $C->{$d}->{'action'} eq 'addmount' ) {
 			    Warn( $ERR_OPEN,