r66637 - in /trunk/libdbix-class-perl: Changes META.yml Makefile.PL README debian/changelog lib/DBIx/Class.pm lib/DBIx/Class/Optional/Dependencies.pm lib/DBIx/Class/Optional/Dependencies.pod t/storage/error.t t/storage/txn.t
jawnsy-guest at users.alioth.debian.org
jawnsy-guest at users.alioth.debian.org
Thu Dec 30 01:25:32 UTC 2010
Author: jawnsy-guest
Date: Thu Dec 30 01:25:22 2010
New Revision: 66637
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=66637
Log:
New upstream release
Modified:
trunk/libdbix-class-perl/Changes
trunk/libdbix-class-perl/META.yml
trunk/libdbix-class-perl/Makefile.PL
trunk/libdbix-class-perl/README
trunk/libdbix-class-perl/debian/changelog
trunk/libdbix-class-perl/lib/DBIx/Class.pm
trunk/libdbix-class-perl/lib/DBIx/Class/Optional/Dependencies.pm
trunk/libdbix-class-perl/lib/DBIx/Class/Optional/Dependencies.pod
trunk/libdbix-class-perl/t/storage/error.t
trunk/libdbix-class-perl/t/storage/txn.t
Modified: trunk/libdbix-class-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-perl/Changes?rev=66637&op=diff
==============================================================================
--- trunk/libdbix-class-perl/Changes (original)
+++ trunk/libdbix-class-perl/Changes Thu Dec 30 01:25:22 2010
@@ -1,4 +1,12 @@
Revision history for DBIx::Class
+
+0.08126 2010-12-28 18:10 (UTC)
+ * Fixes
+ - Bump forgotten Class::Accessor::Grouped core dependency
+ - Promote forgotten Hash::Merge optdep to a hard requirement
+ - Skip t/storage/error.t on smokers with leaking perls
+ - Fix t/storage/txn.t deadlocks on slower machines
+ - Do not run on smokers if a trial Package::Stash is found
0.08125 2010-12-27 04:30 (UTC)
* New Features / Changes
Modified: trunk/libdbix-class-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-perl/META.yml?rev=66637&op=diff
==============================================================================
--- trunk/libdbix-class-perl/META.yml (original)
+++ trunk/libdbix-class-perl/META.yml Thu Dec 30 01:25:22 2010
@@ -31,7 +31,7 @@
- DBIx::Class::Storage::DBIHacks
requires:
Carp::Clan: 6.0
- Class::Accessor::Grouped: 0.10000
+ Class::Accessor::Grouped: 0.10002
Class::C3::Componentised: 1.0005
Class::Inspector: 1.24
Config::Any: 0.20
@@ -40,6 +40,7 @@
Data::Dumper::Concise: 1.000
Data::Page: 2.00
File::Path: 2.07
+ Hash::Merge: 0.12
MRO::Compat: 0.09
Module::Find: 0.06
Path::Class: 0.18
@@ -57,4 +58,4 @@
homepage: http://www.dbix-class.org/
license: http://dev.perl.org/licenses/
repository: git://git.shadowcat.co.uk/dbsrgits/DBIx-Class.git
-version: 0.08125
+version: 0.08126
Modified: trunk/libdbix-class-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-perl/Makefile.PL?rev=66637&op=diff
==============================================================================
--- trunk/libdbix-class-perl/Makefile.PL (original)
+++ trunk/libdbix-class-perl/Makefile.PL Thu Dec 30 01:25:22 2010
@@ -57,13 +57,14 @@
my $runtime_requires = {
'Carp::Clan' => '6.0',
- 'Class::Accessor::Grouped' => '0.10000',
+ 'Class::Accessor::Grouped' => '0.10002',
'Class::C3::Componentised' => '1.0005',
'Class::Inspector' => '1.24',
'Config::Any' => '0.20',
'Context::Preserve' => '0.01',
'Data::Dumper::Concise' => '1.000',
'Data::Page' => '2.00',
+ 'Hash::Merge' => '0.12',
'MRO::Compat' => '0.09',
'Module::Find' => '0.06',
'Path::Class' => '0.18',
@@ -162,6 +163,22 @@
warn $optdep_msg if $Module::Install::AUTHOR;
auto_install();
warn $optdep_msg if $Module::Install::AUTHOR;
+
+# if this is a smoker, and some known-to-be-trouble reqs are already present
+# (are not missing reqs) - we can exit 1 now so that we register an N/A report
+# instead of a FAIL
+if ($ENV{AUTOMATED_TESTING} && ! $ENV{PERL5_CPANM_IS_RUNNING} && ! $ENV{RELEASE_TESTING}) {
+
+ eval {
+ require Package::Stash;
+ my $psv = Package::Stash->VERSION;
+ if ($psv != 0.13 and $psv >= 0.09 and $psv <= 0.15) {
+ warn "A trial version $psv of Package::Stash detected (known to break namespace::clean). "
+ ."Aborting useless smoke test\n";
+ exit 1;
+ }
+ };
+}
# re-create various autogenerated documentation bits
if ($Module::Install::AUTHOR) {
@@ -277,7 +294,10 @@
}
# test that we really took things away (just in case, happened twice somehow)
-exit 0 unless -f 'META.yml'; # in case bizarro comes around
+if (! -f 'META.yml') {
+ warn "No META.yml generated?! aborting...\n";
+ exit 1;
+}
my $meta = do { local @ARGV = 'META.yml'; local $/; <> };
# this is safe as there is a fatal check earlier to make sure $opt_testdeps does
Modified: trunk/libdbix-class-perl/README
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-perl/README?rev=66637&op=diff
==============================================================================
--- trunk/libdbix-class-perl/README (original)
+++ trunk/libdbix-class-perl/README Thu Dec 30 01:25:22 2010
@@ -223,6 +223,8 @@
dyfrgi: Michael Leuchtenburg <michael at slashhome.org>
+ freetime: Bill Moseley <moseley at hank.org>
+
frew: Arthur Axel "fREW" Schmidt <frioux at gmail.com>
goraxe: Gordon Irving <goraxe at cpan.org>
Modified: trunk/libdbix-class-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-perl/debian/changelog?rev=66637&op=diff
==============================================================================
--- trunk/libdbix-class-perl/debian/changelog (original)
+++ trunk/libdbix-class-perl/debian/changelog Thu Dec 30 01:25:22 2010
@@ -1,4 +1,4 @@
-libdbix-class-perl (0.08125-1) UNRELEASED; urgency=low
+libdbix-class-perl (0.08126-1) UNRELEASED; urgency=low
NEEDS:
- updated CAG (ribasushi is working on a minimal patch for that)
@@ -11,12 +11,12 @@
* Update my email address.
[ Jonathan Yu ]
- * New upstream release 0.08125
+ * New upstream release 0.08125, 0.08126
* Standards-Version 3.9.1 (no changes)
* Update license clauses
* Update package dependencies per upstream
- -- Jonathan Yu <jawnsy at cpan.org> Tue, 28 Dec 2010 09:51:52 -0500
+ -- Jonathan Yu <jawnsy at cpan.org> Wed, 29 Dec 2010 20:08:31 -0500
libdbix-class-perl (0.08123-1) unstable; urgency=low
Modified: trunk/libdbix-class-perl/lib/DBIx/Class.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-perl/lib/DBIx/Class.pm?rev=66637&op=diff
==============================================================================
--- trunk/libdbix-class-perl/lib/DBIx/Class.pm (original)
+++ trunk/libdbix-class-perl/lib/DBIx/Class.pm Thu Dec 30 01:25:22 2010
@@ -27,7 +27,7 @@
# Always remember to do all digits for the version even if they're 0
# i.e. first release of 0.XX *must* be 0.XX000. This avoids fBSD ports
# brain damage and presumably various other packaging systems too
-$VERSION = '0.08125';
+$VERSION = '0.08126';
$VERSION = eval $VERSION if $VERSION =~ /_/; # numify for warning-free dev releases
@@ -286,6 +286,8 @@
dyfrgi: Michael Leuchtenburg <michael at slashhome.org>
+freetime: Bill Moseley <moseley at hank.org>
+
frew: Arthur Axel "fREW" Schmidt <frioux at gmail.com>
goraxe: Gordon Irving <goraxe at cpan.org>
Modified: trunk/libdbix-class-perl/lib/DBIx/Class/Optional/Dependencies.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-perl/lib/DBIx/Class/Optional/Dependencies.pm?rev=66637&op=diff
==============================================================================
--- trunk/libdbix-class-perl/lib/DBIx/Class/Optional/Dependencies.pm (original)
+++ trunk/libdbix-class-perl/lib/DBIx/Class/Optional/Dependencies.pm Thu Dec 30 01:25:22 2010
@@ -22,7 +22,6 @@
my $replicated = {
%$moose_basic,
- 'Hash::Merge' => '0.12',
};
my $admin_basic = {
Modified: trunk/libdbix-class-perl/lib/DBIx/Class/Optional/Dependencies.pod
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-perl/lib/DBIx/Class/Optional/Dependencies.pod?rev=66637&op=diff
==============================================================================
--- trunk/libdbix-class-perl/lib/DBIx/Class/Optional/Dependencies.pod (original)
+++ trunk/libdbix-class-perl/lib/DBIx/Class/Optional/Dependencies.pod Thu Dec 30 01:25:22 2010
@@ -18,7 +18,7 @@
...
- configure_requires 'DBIx::Class' => '0.08125';
+ configure_requires 'DBIx::Class' => '0.08126';
require DBIx::Class::Optional::Dependencies;
@@ -219,8 +219,6 @@
=over
-=item * Hash::Merge >= 0.12
-
=item * Moose >= 0.98
=item * MooseX::Types >= 0.21
Modified: trunk/libdbix-class-perl/t/storage/error.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-perl/t/storage/error.t?rev=66637&op=diff
==============================================================================
--- trunk/libdbix-class-perl/t/storage/error.t (original)
+++ trunk/libdbix-class-perl/t/storage/error.t Thu Dec 30 01:25:22 2010
@@ -34,7 +34,11 @@
# destruction of everything except the $dbh should use the proper
# exception fallback:
-{
+SKIP: {
+ if (DBICTest::RunMode->peepeeness) {
+ skip "Your perl version $] appears to leak like a sieve - skipping garbage collected \$schema test", 1;
+ }
+
undef ($schema);
throws_ok (
sub {
Modified: trunk/libdbix-class-perl/t/storage/txn.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-perl/t/storage/txn.t?rev=66637&op=diff
==============================================================================
--- trunk/libdbix-class-perl/t/storage/txn.t (original)
+++ trunk/libdbix-class-perl/t/storage/txn.t Thu Dec 30 01:25:22 2010
@@ -233,6 +233,12 @@
for my $pid (@pids) {
waitpid ($pid, 0);
ok (! $?, "Child $pid exit ok (pass $pass)");
+ }
+
+ # it is important to reap all children before checking the final db-state
+ # otherwise a deadlock may occur between the transactions running in the
+ # children and the query of the parent
+ for my $pid (@pids) {
isa_ok ($schema->resultset ('Artist')->find ({ name => "forking action $pid" }), 'DBIx::Class::Row');
}
}
More information about the Pkg-perl-cvs-commits
mailing list