Re: 3896 pom-ng broken

[Phil Oester <kernel@linuxace.com>]

[-- Attachment #1: Type: text/plain, Size: 643 bytes --]

On Tue, May 10, 2005 at 03:15:25PM -0400, Jérôme Poulin wrote:
> On 5/10/05, Jérôme Poulin <jeromepoulin@gmail.com> wrote:
> > See my e-mail, posted the same problem / solution and got no answer,
> > only 3 patchs apply with that new snapshot, other patch with no
> > requirements or even with a valid requirement won't apply, only set,
> > h323, goto and another apply, anyway see my other mails.

Indeed, my patch was broken.  But the 'Requires' handling is also broken, but
will take something nontrivial to fix.

In the interim, the below patch reverts my changes, and adds a necessary
2nd Requires to pptp.  Harald, please apply.

Phil



[-- Attachment #2: patch-requiresfix --]
[-- Type: text/plain, Size: 957 bytes --]

diff -ruN pom-orig/Netfilter_POM.pm pom-new/Netfilter_POM.pm
--- pom-orig/Netfilter_POM.pm	2005-05-10 18:15:27.177796688 -0400
+++ pom-new/Netfilter_POM.pm	2005-05-10 18:16:58.249951616 -0400
@@ -196,10 +196,10 @@
 		# if the requirement refers to the tested patchlet,
 		# project version must fulfil the requirement.
 		# Multiple requirements are ANDed.
-		return 1 if $pver eq $prog 
-			    && $self->version_compare($proj, $op, $ver);
+		return 0 if $pver eq $prog 
+			    && !$self->version_compare($proj, $op, $ver);
 	}
-	return 0;
+	return 1;
 }
 
 # are the requirements for a specific patchlet fulfilled?
diff -ruN pom-orig/pptp-conntrack-nat/info pom-new/pptp-conntrack-nat/info
--- pom-orig/pptp-conntrack-nat/info	2005-05-10 20:35:15.584820688 -0400
+++ pom-new/pptp-conntrack-nat/info	2005-05-10 20:34:12.225452776 -0400
@@ -4,3 +4,4 @@
 Repository: extra
 Depends: !nat-reservations
 Requires: linux < 2.6.11
+Requires: linux-2.6 < 2.6.11