[omd-commits] OMD Git: omd: perl: revert Term-ReadLine-Gnu for old Ubuntu systems

git version control git at mathias-kettner.de
Thu Apr 3 22:59:45 CEST 2014


Module:   omd
Branch:   master
Commit:   1ae298fba8c4a2efc8009fdd779708133fa4fd1d
URL:      http://omdistro.org/projects/omd/repository/revisions/1ae298fba8c4a2efc8009fdd779708133fa4fd1d

Author:   Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Thu Apr  3 21:56:29 2014 +0200
Commiter: Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Thu Apr  3 21:56:29 2014 +0200

perl: revert Term-ReadLine-Gnu for old Ubuntu systems

Signed-off-by: Sven Nierlein <Sven.Nierlein at consol.de>

---

 packages/perl-modules/build_module.pl |    1 +
 t/20-package_perl-modules.t           |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/perl-modules/build_module.pl b/packages/perl-modules/build_module.pl
index fa34843..0359c79 100755
--- a/packages/perl-modules/build_module.pl
+++ b/packages/perl-modules/build_module.pl
@@ -35,6 +35,7 @@ my $x = 1;
 my $max = scalar @ARGV;
 for my $mod (@ARGV) {
     next if $mod =~ m/curl/mxi and $DISTRO =~ m/^CENTOS\ 5/mxi;
+    next if $mod =~ m/Term-ReadLine-Gnu/mxi and $DISTRO =~ m/^UBUNTU\ 10/mxi;
     BuildHelper::install_module($mod, $TARGET, $PERL, $verbose, $x, $max) || exit 1;
     $x++;
 }
diff --git a/t/20-package_perl-modules.t b/t/20-package_perl-modules.t
index 3427771..83cf322 100644
--- a/t/20-package_perl-modules.t
+++ b/t/20-package_perl-modules.t
@@ -39,7 +39,6 @@ for my $tarball (glob("packages/perl-modules/src/*.gz packages/perl-modules/src/
 
     if($mod eq 'Package::DeprecationManager') { $version .= ' -deprecations => { blah => foo }'; }
     if($mod eq 'Filter::exec')                { $version .= " 'test'"; }
-    if($mod eq 'Term::ReadLine::Gnu')         { $mod      = 'Term::ReadLine; use Term::ReadLine::Gnu' }
     if($mod eq 'Module::Install')             { $mod = 'inc::'.$mod; }
     if($mod eq 'File::ChangeNotify')          { next; }
     if($mod eq 'UNIVERSAL::isa')              { next; }
@@ -48,6 +47,7 @@ for my $tarball (glob("packages/perl-modules/src/*.gz packages/perl-modules/src/
     if($mod eq 'DBD::Oracle')                 { next; }
     if($mod eq 'IO')                          { $version .= " qw/File/"; }    # Parameterless "use IO" deprecated at...
     if($mod =~ m/curl/imx)                    { next; } # broken
+    if($mod eq 'Term::ReadLine::Gnu')         { next; } # removed in ubuntu 10.04
 
     my $check = "use $mod";
     # Use with version doesnt work here, because of weird version numbers



More information about the omd-commits mailing list