summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-12-18 12:13:56 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-12-18 12:13:56 +0000
commit2e45a61245d60946c6864f4d8eaeccec5f363ef9 (patch)
treeed3d5f2f73e98662ce7315b715038b49889b6d6b
parent36bcabcc743b9406c6b8747791266ac01e35016a (diff)
downloaddrakx-2e45a61245d60946c6864f4d8eaeccec5f363ef9.tar
drakx-2e45a61245d60946c6864f4d8eaeccec5f363ef9.tar.gz
drakx-2e45a61245d60946c6864f4d8eaeccec5f363ef9.tar.bz2
drakx-2e45a61245d60946c6864f4d8eaeccec5f363ef9.tar.xz
drakx-2e45a61245d60946c6864f4d8eaeccec5f363ef9.zip
allow common.pm and standalone.pm to be used in drakxtools-backend without perl-Locale-gettext
-rw-r--r--perl-install/common.pm2
-rw-r--r--perl-install/standalone.pm6
2 files changed, 5 insertions, 3 deletions
diff --git a/perl-install/common.pm b/perl-install/common.pm
index 29aecf868..509878ef7 100644
--- a/perl-install/common.pm
+++ b/perl-install/common.pm
@@ -1,9 +1,9 @@
package common; # $Id$
use MDK::Common;
-use Locale::gettext();
use diagnostics;
use strict;
+eval { require Locale::gettext }; #- allow common.pm to be used in drakxtools-backend without perl-Locale-gettext
use log;
use run_program;
diff --git a/perl-install/standalone.pm b/perl-install/standalone.pm
index 320b336e1..2ffdc883e 100644
--- a/perl-install/standalone.pm
+++ b/perl-install/standalone.pm
@@ -15,8 +15,10 @@ $::isStandalone = 1;
$ENV{SHARE_PATH} ||= "/usr/share";
-c::init_setlocale();
-Locale::gettext::bindtextdomain('libDrakX', "/usr/share/locale");
+eval { #- allow standalone.pm to be used in drakxtools-backend without perl-Locale-gettext
+ c::init_setlocale();
+ Locale::gettext::bindtextdomain('libDrakX', "/usr/share/locale");
+};
$::license = N_("This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by