summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.com>2006-06-07 09:52:54 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.com>2006-06-07 09:52:54 +0000
commit5fb342d91de5cd6dfd3a94511fcfa1102739b545 (patch)
treeb1b7b539e23d3f6c978ae1669c267c74d4596599
parent610920956436a12457ffff01c64104acd838e08d (diff)
downloadurpmi-5fb342d91de5cd6dfd3a94511fcfa1102739b545.tar
urpmi-5fb342d91de5cd6dfd3a94511fcfa1102739b545.tar.gz
urpmi-5fb342d91de5cd6dfd3a94511fcfa1102739b545.tar.bz2
urpmi-5fb342d91de5cd6dfd3a94511fcfa1102739b545.tar.xz
urpmi-5fb342d91de5cd6dfd3a94511fcfa1102739b545.zip
Use revision number as version numbers for internal modules.
For gurpmi.pm, use the same version number as urpm.
-rw-r--r--gurpmi.pm3
-rw-r--r--urpm/args.pm4
-rw-r--r--urpm/cfg.pm4
-rw-r--r--urpm/download.pm4
-rw-r--r--urpm/ldap.pm4
-rw-r--r--urpm/msg.pm4
-rw-r--r--urpm/parallel_ka_run.pm4
-rw-r--r--urpm/parallel_ssh.pm4
-rw-r--r--urpm/prompt.pm4
-rw-r--r--urpm/sys.pm4
-rw-r--r--urpm/util.pm4
11 files changed, 32 insertions, 11 deletions
diff --git a/gurpmi.pm b/gurpmi.pm
index 16a369c2..574043b6 100644
--- a/gurpmi.pm
+++ b/gurpmi.pm
@@ -2,6 +2,7 @@ package gurpmi;
#- Copyright (C) 2005 MandrakeSoft SA
#- Copyright (C) 2005, 2006 Mandriva SA
+#- $Id$
#- This is needed because text printed by Gtk2 will always be encoded
#- in UTF-8; we first check if LC_ALL is defined, because if it is,
@@ -22,7 +23,7 @@ use strict;
use Exporter;
our @ISA = qw(Exporter);
our @EXPORT = qw(fatal but quit add_button_box new_label N);
-(our $VERSION) = q$Id$ =~ /(\d+\.\d+)/;
+our $VERSION = $urpm::VERSION;
sub usage () {
print <<USAGE;
diff --git a/urpm/args.pm b/urpm/args.pm
index 9e5ee075..7118635e 100644
--- a/urpm/args.pm
+++ b/urpm/args.pm
@@ -1,5 +1,7 @@
package urpm::args;
+# $Id$
+
use strict;
use warnings;
no warnings 'once';
@@ -7,7 +9,7 @@ use Getopt::Long;# 2.33;
use urpm::download;
use urpm::msg;
-(our $VERSION) = q$Id$ =~ /(\d+\.\d+)/;
+(our $VERSION) = q$Revision$ =~ /(\d+)/;
# The program that invokes us
(my $tool = $0) =~ s!.*/!!;
diff --git a/urpm/cfg.pm b/urpm/cfg.pm
index 511ad5ee..1493abb5 100644
--- a/urpm/cfg.pm
+++ b/urpm/cfg.pm
@@ -1,11 +1,13 @@
package urpm::cfg;
+# $Id$
+
use strict;
use warnings;
use urpm::util;
use urpm::msg 'N';
-(our $VERSION) = q$Id$ =~ /(\d+\.\d+)/;
+(our $VERSION) = q$Revision$ =~ /(\d+)/;
=head1 NAME
diff --git a/urpm/download.pm b/urpm/download.pm
index ace58c44..bea3a3c3 100644
--- a/urpm/download.pm
+++ b/urpm/download.pm
@@ -1,11 +1,13 @@
package urpm::download;
+# $Id$
+
use strict;
use urpm::msg;
use urpm::cfg;
use Cwd;
-(our $VERSION) = q$Id$ =~ /(\d+\.\d+)/;
+(our $VERSION) = q$Revision$ =~ /(\d+)/;
#- proxy config file.
our $PROXY_CFG = '/etc/urpmi/proxy.cfg';
diff --git a/urpm/ldap.pm b/urpm/ldap.pm
index 4f2a645e..34a387d3 100644
--- a/urpm/ldap.pm
+++ b/urpm/ldap.pm
@@ -1,12 +1,14 @@
package urpm::ldap;
+# $Id$
+
use strict;
use warnings;
use urpm;
use urpm::msg 'N';
use Net::LDAP;
-(our $VERSION) = q$Id$ =~ /(\d+\.\d+)/;
+(our $VERSION) = q$Revision$ =~ /(\d+)/;
our $LDAP_CONFIG_FILE = '/etc/ldap.conf';
my @per_media_opt = (@urpm::PER_MEDIA_OPT, qw(ftp-proxy http-proxy));
diff --git a/urpm/msg.pm b/urpm/msg.pm
index c99fabf3..e3986abe 100644
--- a/urpm/msg.pm
+++ b/urpm/msg.pm
@@ -1,10 +1,12 @@
package urpm::msg;
+# $Id$
+
use strict;
no warnings;
use Exporter;
-(our $VERSION) = q$Id$ =~ /(\d+\.\d+)/;
+(our $VERSION) = q$Revision$ =~ /(\d+)/;
our @ISA = 'Exporter';
our @EXPORT = qw(N bug_log to_utf8 message_input toMb from_utf8 sys_log);
diff --git a/urpm/parallel_ka_run.pm b/urpm/parallel_ka_run.pm
index cb4f2d6c..d9beea4c 100644
--- a/urpm/parallel_ka_run.pm
+++ b/urpm/parallel_ka_run.pm
@@ -1,11 +1,13 @@
package urpm::parallel_ka_run;
+# $Id$
+
#- Copyright (C) 2002, 2003, 2004, 2005 MandrakeSoft SA
#- Copyright (C) 2005 Mandriva SA
use strict;
-(our $VERSION) = q$Id$ =~ /(\d+\.\d+)/;
+(our $VERSION) = q$Revision$ =~ /(\d+)/;
our $mput_command = $ENV{URPMI_MPUT_COMMAND};
our $rshp_command = $ENV{URPMI_RSHP_COMMAND};
diff --git a/urpm/parallel_ssh.pm b/urpm/parallel_ssh.pm
index 1ed4406a..4e15e787 100644
--- a/urpm/parallel_ssh.pm
+++ b/urpm/parallel_ssh.pm
@@ -1,12 +1,14 @@
package urpm::parallel_ssh;
+# $Id$
+
#- Copyright (C) 2002, 2003, 2004, 2005 MandrakeSoft SA
#- Copyright (C) 2005 Mandriva SA
use strict;
use Time::HiRes qw(gettimeofday);
-(our $VERSION) = q$Id$ =~ /(\d+\.\d+)/;
+(our $VERSION) = q$Revision$ =~ /(\d+)/;
sub _localhost { $_[0] eq 'localhost' }
sub _nolock { &_localhost ? '--nolock ' : '' }
diff --git a/urpm/prompt.pm b/urpm/prompt.pm
index 7ed02a06..6d7147d0 100644
--- a/urpm/prompt.pm
+++ b/urpm/prompt.pm
@@ -1,8 +1,10 @@
package urpm::prompt;
+# $Id$
+
use strict;
-(our $VERSION) = q$Id$ =~ /(\d+\.\d+)/;
+(our $VERSION) = q$Revision$ =~ /(\d+)/;
sub new {
my ($class, $title, $prompts, $defaults, $hidden) = @_;
diff --git a/urpm/sys.pm b/urpm/sys.pm
index 8bf63127..dccd05b8 100644
--- a/urpm/sys.pm
+++ b/urpm/sys.pm
@@ -1,8 +1,10 @@
package urpm::sys;
+# $Id$
+
use strict;
-(our $VERSION) = q$Id$ =~ /(\d+\.\d+)/;
+(our $VERSION) = q$Revision$ =~ /(\d+)/;
#- find used mount point from a pathname, use a optional mode to allow
#- filtering according the next operation (mount or umount).
diff --git a/urpm/util.pm b/urpm/util.pm
index dfd133f8..d112005a 100644
--- a/urpm/util.pm
+++ b/urpm/util.pm
@@ -1,5 +1,7 @@
package urpm::util;
+# $Id$
+
use strict;
use Exporter;
our @ISA = 'Exporter';
@@ -10,7 +12,7 @@ our @EXPORT = qw(quotespace unquotespace
difference2
);
-(our $VERSION) = q$Id$ =~ /(\d+\.\d+)/;
+(our $VERSION) = q$Revision$ =~ /(\d+)/;
#- quoting/unquoting a string that may be containing space chars.
sub quotespace { my $x = $_[0] || ''; $x =~ s/(\s)/\\$1/g; $x }