[SCM] Debian packaging of libconfig-model-perl branch, master, updated. debian/2.021-1-4-gcd8faab

Dominique Dumont dod at debian.org
Fri Jun 29 12:25:09 UTC 2012


The following commit has been merged in the master branch:
commit d6d995c80d7da91160ecb7e8a251941cdec43b1e
Author: Dominique Dumont <dod at debian.org>
Date:   Fri Jun 29 14:06:59 2012 +0200

    added a patch to fix a race condition between async calls to rmadison

diff --git a/debian/patches/fix-race-condition-dependency-check b/debian/patches/fix-race-condition-dependency-check
new file mode 100644
index 0000000..303e3cb
--- /dev/null
+++ b/debian/patches/fix-race-condition-dependency-check
@@ -0,0 +1,22 @@
+diff --git a/config-model-core/lib/Config/Model/Debian/Dependency.pm b/config-model-core/lib/Config/Model/Debian/Dependency.pm
+index 71bf0b5..c7ec283 100644
+--- a/config-model-core/lib/Config/Model/Debian/Dependency.pm
++++ b/config-model-core/lib/Config/Model/Debian/Dependency.pm
+@@ -396,11 +396,15 @@ sub get_available_version {
+     $logger->debug("get_available_version called on $pkg_name");
+ 
+     my ($time, at res) = split / /, ($cache{$pkg_name} || '');
+-    if ($requested{$pkg_name} 
+-        or (defined $time and $time =~ /^\d+$/ and $time + 24 * 60 * 60 * 7 > time) ) {
++    if (defined $time and $time =~ /^\d+$/ and $time + 24 * 60 * 60 * 7 > time) {
+         return (1, @res) ;
+     }
+ 
++    # package info was requested but info is still not there
++    # this may be called twice for the same package: one for source, one
++    # for binary package
++    return (0) if $requested{$pkg_name} ;
++
+     my $url = "http://qa.debian.org/cgi-bin/madison.cgi?package=$pkg_name&text=on" ;
+     $requested{$pkg_name} = 1 ;
+ 
diff --git a/debian/patches/series b/debian/patches/series
index cdc0a2e..86db5a1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+fix-race-condition-dependency-check
 add_dh_config

-- 
Debian packaging of libconfig-model-perl



More information about the Pkg-perl-cvs-commits mailing list