package log; # $Id$ use diagnostics; use strict; use c; my ($LOG, $LOG2); sub l { if ($::testing) { print STDERR @_, "\n"; } elsif ($::isInstall) { if (!$LOG) { open $LOG, '>>', '/tmp/ddebug.log'; open $LOG2, '>', '/dev/tty3' if !$::local_install; select((select($LOG), $| = 1)[0]); select((select($LOG2), $| = 1)[0]) if !$::local_install; } print $LOG "* ", @_, "\n"; print $LOG2 "* ", @_, "\n" if $LOG2; } elsif ($::isStandalone) { #- openlog was done in standalone.pm c::syslog(c::LOG_WARNING(), join("", @_)); } else { print STDERR @_, "\n"; } } sub openLog { my ($file) = @_; open $LOG, "> $file"; select((select($LOG), $| = 1)[0]); } sub closeLog() { if ($LOG) { close $LOG; close $LOG2 if $LOG2; } elsif ($::isStandalone) { c::closelog(); } } sub explanations { if ($::isStandalone) { c::syslog(c::LOG_INFO()|c::LOG_LOCAL1(), "@_"); } else { l(@_); } } 1; e='distro/mga7'>distro/mga7 The Mageia RPM configuration and scriptsThierry Vignaud [tv]
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJerome Quelin <jquelin@mageia.org>2011-02-26 12:04:53 +0000
committerJerome Quelin <jquelin@mageia.org>2011-02-26 12:04:53 +0000
commit0f1dd7bebbea6916dc5d698099a8a4cbfb829e81 (patch)
treed4f7f7841551904547aa5407efbb808eee83d7c4
parent870a2752cd199aa54e5315b3b495bf40ecbbb9a9 (diff)
downloadrpm-setup-0f1dd7bebbea6916dc5d698099a8a4cbfb829e81.tar
rpm-setup-0f1dd7bebbea6916dc5d698099a8a4cbfb829e81.tar.gz
rpm-setup-0f1dd7bebbea6916dc5d698099a8a4cbfb829e81.tar.bz2
rpm-setup-0f1dd7bebbea6916dc5d698099a8a4cbfb829e81.tar.xz
rpm-setup-0f1dd7bebbea6916dc5d698099a8a4cbfb829e81.zip
1.118 - support for _ in perl module version1.118
Diffstat
-rw-r--r--NEWS3
-rw-r--r--configure.ac2
-rwxr-xr-xperl.prov2
3 files changed, 5 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 16c2c11..2b3ad13 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+Version 1.118 - 26 February 2011, by Jerome Quelin
+- support for _ in perl module version
+
Version 1.117 - 20 February 2011, by Ahmad Samir
- merge svn rev. 271797 from Mandriva to make the python auto-requires always
lowercase
diff --git a/configure.ac b/configure.ac
index 00b4227..82b8589 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
# $Id: configure.ac 271266 2010-11-04 10:43:28Z fwang $
AC_PREREQ(2.59)
-AC_INIT(rpm-mageia-setup, 1.117, ahmad@mageia.org)
+AC_INIT(rpm-mageia-setup, 1.118, jquelin@mageia.org)
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE(1.9 -Wno-portability)
AC_CONFIG_SRCDIR
diff --git a/perl.prov b/perl.prov
index a6d68bb..85b8e81 100755
--- a/perl.prov
+++ b/perl.prov
@@ -159,7 +159,7 @@ sub process_file {
if (m/(\$Revision: (\d+[.0-9]+))/) {
$version= $2;
- } elsif (m/[\'\"]?(\d+[.0-9]+)[\'\"]?/) {
+ } elsif (m/[\'\"]?(\d+[._0-9]+)[\'\"]?/) {
# look for a static number hard coded in the script