Synthesized commit during git-svn import combining previous Mandriva history with Magiea.

This commit consitsts of the following subversion commits:

------------------------------------------------------------------------
r1928 | dmorgan | 2011-09-13 21:44:28 +0100 (Tue, 13 Sep 2011) | 1 line

Import urpmi
------------------------------------------------------------------------

24 files changed, 36 insertions, 36 deletions

diff --git a/urpm/args.pm b/urpm/args.pm
index e1c12dc3..8e544659 100644
--- a/urpm/args.pm
+++ b/urpm/args.pm
@@ -1,6 +1,6 @@
 package urpm::args;
 
-# $Id$
+# $Id: args.pm 271299 2010-11-21 15:54:30Z peroyvind $
 
 use strict;
 use warnings;
@@ -14,7 +14,7 @@ use Exporter;
 our @ISA = 'Exporter';
 our @EXPORT = '%options';
 
-(our $VERSION) = q($Revision$) =~ /(\d+)/;
+(our $VERSION) = q($Revision: 271299 $) =~ /(\d+)/;
 
 # The program that invokes us
 (my $tool = $0) =~ s!.*/!!;
diff --git a/urpm/bug_report.pm b/urpm/bug_report.pm
index 0971f774..137977d1 100644
--- a/urpm/bug_report.pm
+++ b/urpm/bug_report.pm
@@ -1,4 +1,4 @@
-package urpm::bug_report; # $Id$
+package urpm::bug_report; # $Id: bug_report.pm 250871 2009-01-06 17:21:05Z pixel $
 
 use strict;
 use urpm;
diff --git a/urpm/cdrom.pm b/urpm/cdrom.pm
index 94db0bb8..54e622b5 100644
--- a/urpm/cdrom.pm
+++ b/urpm/cdrom.pm
@@ -1,6 +1,6 @@
 package urpm::cdrom;
 
-# $Id$
+# $Id: cdrom.pm 257782 2009-06-05 14:51:02Z cfergeau $
 
 use strict;
 use urpm::msg;
diff --git a/urpm/cfg.pm b/urpm/cfg.pm
index 849f4460..a48fd0df 100644
--- a/urpm/cfg.pm
+++ b/urpm/cfg.pm
@@ -1,13 +1,13 @@
 package urpm::cfg;
 
-# $Id$
+# $Id: cfg.pm 271299 2010-11-21 15:54:30Z peroyvind $
 
 use strict;
 use warnings;
 use urpm::util;
 use urpm::msg 'N';
 
-(our $VERSION) = q($Revision$) =~ /(\d+)/;
+(our $VERSION) = q($Revision: 271299 $) =~ /(\d+)/;
 
 =head1 NAME
 
diff --git a/urpm/download.pm b/urpm/download.pm
index 494ca9a3..d7cb908c 100644
--- a/urpm/download.pm
+++ b/urpm/download.pm
@@ -1,6 +1,6 @@
 package urpm::download;
 
-# $Id$
+# $Id: download.pm 271299 2010-11-21 15:54:30Z peroyvind $
 
 use strict;
 use urpm::msg;
@@ -16,7 +16,7 @@ our @EXPORT = qw(get_proxy
 	set_proxy_config dump_proxy_config
 );
 
-(our $VERSION) = q($Revision$) =~ /(\d+)/;
+(our $VERSION) = q($Revision: 271299 $) =~ /(\d+)/;
 
 #- proxy config file.
 our $PROXY_CFG = '/etc/urpmi/proxy.cfg';
diff --git a/urpm/dudf.pm b/urpm/dudf.pm
index 664884eb..7b04a2a6 100644
--- a/urpm/dudf.pm
+++ b/urpm/dudf.pm
@@ -173,7 +173,7 @@ sub new {
         dudf_time => undef
     };
 
-    my $base_url = "http://dudf.forge.mandriva.com";
+    my $base_url = "http://dudf.mageia.org/";
     $self->{access_url} = $base_url . "/file/";
     $self->{upload_url} = $base_url . "/upload";
     $self->{metainstaller_name} =~ s/.*\///;
@@ -192,7 +192,7 @@ sub new {
     if (! -f $self->{log_file})
     {
 	output_safe($self->{log_file}, 
-                    N("# Here are logs of your DUDF uploads.\n# Line format is : <date time of generation> <uid>\n# You can use uids to see the content of your uploads at this url :\n# http://dudf.forge.mandriva.com/"));
+                    N("# Here are logs of your DUDF uploads.\n# Line format is : <date time of generation> <uid>\n# You can use uids to see the content of your uploads at this url :\n# $base_url"));
     }
     my $ug = new Data::UUID;
     $self->{dudf_uid} = $ug->to_string($ug->create_str);
diff --git a/urpm/get_pkgs.pm b/urpm/get_pkgs.pm
index 391bd152..8e564c78 100644
--- a/urpm/get_pkgs.pm
+++ b/urpm/get_pkgs.pm
@@ -1,6 +1,6 @@
 package urpm::get_pkgs;
 
-# $Id$
+# $Id: get_pkgs.pm 267986 2010-04-28 10:10:27Z cfergeau $
 
 use strict;
 use urpm::msg;
diff --git a/urpm/install.pm b/urpm/install.pm
index 05b9248a..1ec5080d 100644
--- a/urpm/install.pm
+++ b/urpm/install.pm
@@ -1,6 +1,6 @@
 package urpm::install; 
 
-# $Id$
+# $Id: install.pm 261966 2009-10-15 11:00:35Z tv $
 
 use strict;
 use urpm;
diff --git a/urpm/ldap.pm b/urpm/ldap.pm
index 131663be..79ee9100 100644
--- a/urpm/ldap.pm
+++ b/urpm/ldap.pm
@@ -1,6 +1,6 @@
 package urpm::ldap;
 
-# $Id$
+# $Id: ldap.pm 271299 2010-11-21 15:54:30Z peroyvind $
 
 use strict;
 use warnings;
@@ -9,7 +9,7 @@ use urpm::util;
 use urpm::msg 'N';
 use urpm::media;
 
-(our $VERSION) = q($Revision$) =~ /(\d+)/;
+(our $VERSION) = q($Revision: 271299 $) =~ /(\d+)/;
 
 our $LDAP_CONFIG_FILE = '/etc/ldap.conf';
 my @per_media_opt = (@urpm::media::PER_MEDIA_OPT, qw(md5sum ftp-proxy http-proxy));
diff --git a/urpm/lock.pm b/urpm/lock.pm
index 687437d3..fc8cc5f4 100644
--- a/urpm/lock.pm
+++ b/urpm/lock.pm
@@ -1,6 +1,6 @@
 package urpm::lock;
 
-# $Id$
+# $Id: lock.pm 261997 2009-10-15 17:44:35Z cfergeau $
 
 use strict;
 use urpm::msg;
diff --git a/urpm/main_loop.pm b/urpm/main_loop.pm
index 6b2dd1eb..3a9df65c 100644
--- a/urpm/main_loop.pm
+++ b/urpm/main_loop.pm
@@ -1,6 +1,6 @@
 package urpm::main_loop;
 
-# $Id$
+# $Id: main_loop.pm 271299 2010-11-21 15:54:30Z peroyvind $
 
 #- Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 MandrakeSoft SA
 #- Copyright (C) 2005-2010 Mandriva SA
diff --git a/urpm/md5sum.pm b/urpm/md5sum.pm
index 67f5e69e..ed8eb6e7 100644
--- a/urpm/md5sum.pm
+++ b/urpm/md5sum.pm
@@ -1,4 +1,4 @@
-package urpm::md5sum; # $Id$
+package urpm::md5sum; # $Id: md5sum.pm 265136 2010-01-22 12:10:01Z misc $
 
 use strict;
 use urpm::util;
diff --git a/urpm/media.pm b/urpm/media.pm
index b4f7d389..ea9e1b81 100644
--- a/urpm/media.pm
+++ b/urpm/media.pm
@@ -1,6 +1,6 @@
 package urpm::media;
 
-# $Id$
+# $Id: media.pm 270394 2010-07-30 00:48:07Z misc $
 
 use strict;
 use urpm 'file_from_local_medium', 'is_local_medium';
diff --git a/urpm/mirrors.pm b/urpm/mirrors.pm
index 7cee554f..0992c814 100644
--- a/urpm/mirrors.pm
+++ b/urpm/mirrors.pm
@@ -304,7 +304,7 @@ sub _mandriva_mirrorlist {
     my @para = grep { $_ } $ENV{URPMI_ADDMEDIA_REASON};
     my $product_version = $ENV{URPMI_ADDMEDIA_PRODUCT_VERSION} || $product_id->{version};
 
-    "https://api.mandriva.com/mirrors/$product_type.$product_version.$arch.list"
+    "http://mirrors.mageia.org/api/$product_type.$product_version.$arch.list"
       . (@para ? '?' . join('&', @para) : '');
 }
 
diff --git a/urpm/msg.pm b/urpm/msg.pm
index be0c1838..8a1f1fb0 100644
--- a/urpm/msg.pm
+++ b/urpm/msg.pm
@@ -1,6 +1,6 @@
 package urpm::msg;
 
-# $Id$
+# $Id: msg.pm 271299 2010-11-21 15:54:30Z peroyvind $
 
 use strict;
 no warnings;
@@ -13,7 +13,7 @@ BEGIN {
     eval "use open ':locale'" if $encoding && $encoding ne 'ANSI_X3.4-1968';
 }
 
-(our $VERSION) = q($Revision$) =~ /(\d+)/;
+(our $VERSION) = q($Revision: 271299 $) =~ /(\d+)/;
 
 our @ISA = 'Exporter';
 our @EXPORT = qw(N N_ P translate bug_log message_input message_input_ toMb formatXiB sys_log);
diff --git a/urpm/parallel.pm b/urpm/parallel.pm
index f8cfa513..13f748e5 100644
--- a/urpm/parallel.pm
+++ b/urpm/parallel.pm
@@ -1,4 +1,4 @@
-package urpm::parallel; # $Id$
+package urpm::parallel; # $Id: parallel.pm 250871 2009-01-06 17:21:05Z pixel $
 
 use strict;
 use urpm;
diff --git a/urpm/parallel_ka_run.pm b/urpm/parallel_ka_run.pm
index 801317c2..58e114d0 100644
--- a/urpm/parallel_ka_run.pm
+++ b/urpm/parallel_ka_run.pm
@@ -1,6 +1,6 @@
 package urpm::parallel_ka_run;
 
-# $Id$
+# $Id: parallel_ka_run.pm 271299 2010-11-21 15:54:30Z peroyvind $
 
 #- Copyright (C) 2002, 2003, 2004, 2005 MandrakeSoft SA
 #- Copyright (C) 2005-2010 Mandriva SA
@@ -12,7 +12,7 @@ use urpm::parallel;
 
 our @ISA = 'urpm::parallel';
 
-(our $VERSION) = q($Revision$) =~ /(\d+)/;
+(our $VERSION) = q($Revision: 271299 $) =~ /(\d+)/;
 our $mput_command = $ENV{URPMI_MPUT_COMMAND};
 our $rshp_command = $ENV{URPMI_RSHP_COMMAND};
 
@@ -82,7 +82,7 @@ sub _run_mput {
 
 sub _parse_rshp_output {
     my ($s) = @_;
-    #- eg of output of rshp2: <tata2.mandriva.com> [rank:2]:@removing@mpich-1.2.5.2-10mlcs4.x86_64
+    #- eg of output of rshp2: <tata2.mageia.org> [rank:2]:@removing@mpich-1.2.5.2-10mlcs4.x86_64
 
     if ($s =~ /<([^>]*)>.*:->:(.*)/ || $s =~ /<([^>]*)>\s*\[[^]]*\]:(.*)/) {
 	($1, $2);
diff --git a/urpm/parallel_ssh.pm b/urpm/parallel_ssh.pm
index 9cdafc40..0e5b6d60 100644
--- a/urpm/parallel_ssh.pm
+++ b/urpm/parallel_ssh.pm
@@ -1,6 +1,6 @@
 package urpm::parallel_ssh;
 
-# $Id$
+# $Id: parallel_ssh.pm 271299 2010-11-21 15:54:30Z peroyvind $
 
 #- Copyright (C) 2002, 2003, 2004, 2005 MandrakeSoft SA
 #- Copyright (C) 2005-2010 Mandriva SA
@@ -12,7 +12,7 @@ use urpm::parallel;
 
 our @ISA = 'urpm::parallel';
 
-(our $VERSION) = q($Revision$) =~ /(\d+)/;
+(our $VERSION) = q($Revision: 271299 $) =~ /(\d+)/;
 
 sub _localhost { $_[0] eq 'localhost' }
 sub _ssh       { &_localhost ? '' : "ssh $_[0] " }
diff --git a/urpm/prompt.pm b/urpm/prompt.pm
index d45a969a..6762f19f 100644
--- a/urpm/prompt.pm
+++ b/urpm/prompt.pm
@@ -1,10 +1,10 @@
 package urpm::prompt;
 
-# $Id$
+# $Id: prompt.pm 271299 2010-11-21 15:54:30Z peroyvind $
 
 use strict;
 
-(our $VERSION) = q($Revision$) =~ /(\d+)/;
+(our $VERSION) = q($Revision: 271299 $) =~ /(\d+)/;
 
 sub new {
     my ($class, $title, $prompts, $defaults, $hidden) = @_;
diff --git a/urpm/removable.pm b/urpm/removable.pm
index 4887eb8c..1fe9dd2b 100644
--- a/urpm/removable.pm
+++ b/urpm/removable.pm
@@ -1,6 +1,6 @@
 package urpm::removable;
 
-# $Id$
+# $Id: removable.pm 250871 2009-01-06 17:21:05Z pixel $
 
 use strict;
 use urpm::msg;
diff --git a/urpm/select.pm b/urpm/select.pm
index 59c56c6e..c757dd7e 100644
--- a/urpm/select.pm
+++ b/urpm/select.pm
@@ -1,6 +1,6 @@
 package urpm::select;
 
-# $Id$
+# $Id: select.pm 258637 2009-07-28 13:14:16Z cfergeau $
 
 use strict;
 use urpm::msg;
diff --git a/urpm/signature.pm b/urpm/signature.pm
index 473839d1..6272dfac 100644
--- a/urpm/signature.pm
+++ b/urpm/signature.pm
@@ -1,6 +1,6 @@
 package urpm::signature;
 
-# $Id$
+# $Id: signature.pm 253617 2009-03-05 11:18:45Z tv $
 
 use strict;
 use urpm::msg;
diff --git a/urpm/sys.pm b/urpm/sys.pm
index ba215cbe..44b48d33 100644
--- a/urpm/sys.pm
+++ b/urpm/sys.pm
@@ -1,6 +1,6 @@
 package urpm::sys;
 
-# $Id$
+# $Id: sys.pm 271299 2010-11-21 15:54:30Z peroyvind $
 
 use strict;
 use warnings;
@@ -8,7 +8,7 @@ use urpm::util;
 use urpm::msg;
 use POSIX ();
 
-(our $VERSION) = q($Revision$) =~ /(\d+)/;
+(our $VERSION) = q($Revision: 271299 $) =~ /(\d+)/;
 
 
 #- get the list of packages that should not be upgraded or installed,
diff --git a/urpm/util.pm b/urpm/util.pm
index 723ed16e..26730a0d 100644
--- a/urpm/util.pm
+++ b/urpm/util.pm
@@ -1,6 +1,6 @@
 package urpm::util;
 
-# $Id$
+# $Id: util.pm 271299 2010-11-21 15:54:30Z peroyvind $
 
 use strict;
 use Exporter;
@@ -20,7 +20,7 @@ our @EXPORT = qw(min max quotespace unquotespace
     file2absolute_file
 );
 
-(our $VERSION) = q($Revision$) =~ /(\d+)/;
+(our $VERSION) = q($Revision: 271299 $) =~ /(\d+)/;
 
 sub min  { my $n = shift; $_ < $n and $n = $_ foreach @_; $n }
 sub max  { my $n = shift; $_ > $n and $n = $_ foreach @_; $n }