[prev in list] [next in list] [prev in thread] [next in thread] 

List:       perl5-changes
Subject:    Change 33607: Integrate:
From:       Nicholas Clark <nwc10+p5p4 () colon ! colondot ! net>
Date:       2008-03-30 13:45:03
Message-ID: 20080330134503.6A845500BE () mx ! activestate ! com
[Download RAW message or body]

Change 33607 by nicholas@mouse-mill on 2008/03/30 13:35:51

	Integrate:
	[ 33586]
	Integrate:
	[ 32883]
	Silence new warning grep in void context warning in various modules and test files, \
also silence a warning that came from a previous 'dev' version number bump.  
	[ 32884]
	dev version numbers, xs and warnings dont play together nicely, so use \
MM->parse_version() to smooth over the cracks....  
	[ 33604]
	Integrate:
	[ 33601]
	GDBM_File isn't dual life, so no need for a dev module version number.

Affected files ...

... //depot/maint-5.8/perl/ext/GDBM_File/GDBM_File.pm#4 integrate
... //depot/maint-5.8/perl/ext/GDBM_File/Makefile.PL#3 integrate
... //depot/maint-5.8/perl/ext/GDBM_File/t/gdbm.t#2 integrate
... //depot/maint-5.8/perl/lib/CGI/t/no_tabindex.t#2 integrate

Differences ...

==== //depot/maint-5.8/perl/ext/GDBM_File/GDBM_File.pm#4 (text) ====
Index: perl/ext/GDBM_File/GDBM_File.pm
--- perl/ext/GDBM_File/GDBM_File.pm#3~26806~	2006-01-12 11:23:34.000000000 -0800
+++ perl/ext/GDBM_File/GDBM_File.pm	2008-03-30 06:35:51.000000000 -0700
@@ -68,7 +68,8 @@
 	GDBM_WRITER
 );
 
-$VERSION = "1.08";
+# This module isn't dual life, so no need for dev version numbers.
+$VERSION = '1.09';
 
 sub AUTOLOAD {
     my($constname);

==== //depot/maint-5.8/perl/ext/GDBM_File/Makefile.PL#3 (text) ====
Index: perl/ext/GDBM_File/Makefile.PL
--- perl/ext/GDBM_File/Makefile.PL#2~18190~	2002-11-26 18:28:34.000000000 -0800
+++ perl/ext/GDBM_File/Makefile.PL	2008-03-30 06:35:51.000000000 -0700
@@ -7,6 +7,7 @@
     XSPROTOARG => '-noprototypes', 		# XXX remove later?
     VERSION_FROM => 'GDBM_File.pm',
     realclean => {FILES=> 'const-c.inc const-xs.inc'},
+    XS_VERSION => eval MM->parse_version('GDBM_File.pm'), #silence warnings if we \
are a dev release  );
 WriteConstants(
     NAME => 'GDBM_File',

==== //depot/maint-5.8/perl/ext/GDBM_File/t/gdbm.t#2 (xtext) ====
Index: perl/ext/GDBM_File/t/gdbm.t
--- perl/ext/GDBM_File/t/gdbm.t#1~20271~	2003-07-28 08:18:57.000000000 -0700
+++ perl/ext/GDBM_File/t/gdbm.t	2008-03-30 06:35:51.000000000 -0700
@@ -487,7 +487,7 @@
    $h{"fred"} = "joe" ;
    ok(76, $h{"fred"} eq "joe");
 
-   eval { grep { $h{$_} } (1, 2, 3) };
+   eval { my @r= grep { $h{$_} } (1, 2, 3) };
    ok (77, ! $@);
 
 
@@ -503,7 +503,7 @@
 
    ok(79, $db->FIRSTKEY() eq "fred") ;
    
-   eval { grep { $h{$_} } (1, 2, 3) };
+   eval { my @r= grep { $h{$_} } (1, 2, 3) };
    ok (80, ! $@);
 
    undef $db ;
End of Patch.


[prev in list] [next in list] [prev in thread] [next in thread]