Remove apparently unused get_product_info subroutine

4 files changed, 6 insertions, 18 deletions

diff --git a/NEWS b/NEWS
index 1a7ca025..a27c17f2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- mgaonline.pm: drop obsolete get_product_info (unused) and translate_product
+  subroutines which were leftovers from Mandriva times with multiple products
+- updated copyright years
 - updated headers and FSF contact address
 
 Version 3.12 - 9 February 2015, Anne Nicolas
diff --git a/mgaonline.pm b/mgaonline.pm
index fb6dd250..7deefd2d 100644
--- a/mgaonline.pm
+++ b/mgaonline.pm
@@ -52,7 +52,6 @@ our @EXPORT = qw(find_current_distro
                  $product_id
                  $root);
 our @EXPORT_OK = qw(
-    get_product_info
     get_my_mdv_profile
 );
 
@@ -138,20 +137,6 @@ sub fork_exec {
     run_program::raw({ detach => 1 }, @_);
 }
 
-# TODO Move all product.id handling to a separate module
-# (MDV::ProductId?)
-sub get_product_info {
-    my ($product) = @_;
-    my %info = (
-        free => {
-            name => N("Mageia Free"),
-            description => N("The 100%% Open Source distribution freely available."),
-        },
-    );
-    $product ||= lc $product_id->{product};
-    return $info{$product};
-}
-
 sub get_banner_icon() {
     find { -e $_ } 
       qw(/usr/share/mcc/themes/default/rpmdrake-mga.png /usr/share/icons/large/mgaonline.png);
diff --git a/mgaonline_agent.pl b/mgaonline_agent.pl
index 642bfd9c..d7bae8e5 100755
--- a/mgaonline_agent.pl
+++ b/mgaonline_agent.pl
@@ -41,14 +41,14 @@ logconfig(
     '-driver' => Log::Agent::Driver::File->make(
         '-prefix'  => $0,
         '-showpid' => 1,
-        '-file'    => 'mdvonline.log',
+        '-file'    => 'mgaonline.log',
     ),
     #-caller => [ -display => '($sub/$line)', -postfix => 1 ],
     '-priority' => [ '-display' => '[$priority]' ],
 );
 
 logsay "==================";
-mgaonline::is_running('mdvonline_agent') and die "mdvonline_agent already running\n";
+mgaonline::is_running('mgaonline_agent') and die "mgaonline_agent already running\n";
 require_root_capability();
 
 my %conf = mgaonline::get_configuration();
diff --git a/mgaupdate b/mgaupdate
index 60a5d847..5c2f01b1 100755
--- a/mgaupdate
+++ b/mgaupdate
@@ -63,7 +63,7 @@ This is free software and may be redistributed under the terms of the GNU GPL.
 
 usage:
 ", $CLIENT_VERSION,
-N("Copyright (C) %s %s", $YEARS, 'Mandriva') . N("Copyright (C) %s %s", $MGA_YEARS, 'Mageia')) . N("  --help		- print this help message.
+N("Copyright (C) %s %s", $YEARS, 'Mandriva') . "\n" . N("Copyright (C) %s %s", $MGA_YEARS, 'Mageia')) . N("  --help		- print this help message.
 ") . N("  --auto		- Mageia Update launched automatically.
 ") . N("  --mnf			- launch mnf specific scripts.
 ") . N("  --noX			- text mode version of Mageia Update.