aboutsummaryrefslogtreecommitdiffstats
path: root/modules/rpmdragora
diff options
context:
space:
mode:
authorAngelo Naselli <anaselli@linux.it>2014-12-03 22:15:13 +0100
committerAngelo Naselli <anaselli@linux.it>2014-12-03 22:15:13 +0100
commit724e64f07bcdce36529949f525a05038529b7965 (patch)
treeb154ad3718057c0d75b3a95487d230ebfe5f6be5 /modules/rpmdragora
parent765fc307767d8dabc19c8e76759c7c0b30e01e95 (diff)
downloadmanatools-724e64f07bcdce36529949f525a05038529b7965.tar
manatools-724e64f07bcdce36529949f525a05038529b7965.tar.gz
manatools-724e64f07bcdce36529949f525a05038529b7965.tar.bz2
manatools-724e64f07bcdce36529949f525a05038529b7965.tar.xz
manatools-724e64f07bcdce36529949f525a05038529b7965.zip
Removed drakx common dependency
Diffstat (limited to 'modules/rpmdragora')
-rwxr-xr-xmodules/rpmdragora/dragora-urpm-addmedia3
-rwxr-xr-xmodules/rpmdragora/dragora-urpm-sources.pl2
-rwxr-xr-xmodules/rpmdragora/dragoraUpdate2
-rwxr-xr-xmodules/rpmdragora/rpmdragora21
4 files changed, 12 insertions, 16 deletions
diff --git a/modules/rpmdragora/dragora-urpm-addmedia b/modules/rpmdragora/dragora-urpm-addmedia
index b49840f9..136c5067 100755
--- a/modules/rpmdragora/dragora-urpm-addmedia
+++ b/modules/rpmdragora/dragora-urpm-addmedia
@@ -51,9 +51,8 @@ use AdminPanel::Rpmdragora::formatting;
use AdminPanel::Shared::Locales;
use AdminPanel::Privileges;
-use lib qw(/usr/lib/libDrakX);
use urpm::media;
-use MDK::Common::Func;
+use MDK::Common::File qw(cat_);
my $loc = AdminPanel::rpmdragora::locale();
diff --git a/modules/rpmdragora/dragora-urpm-sources.pl b/modules/rpmdragora/dragora-urpm-sources.pl
index 1bd4d627..adf127b9 100755
--- a/modules/rpmdragora/dragora-urpm-sources.pl
+++ b/modules/rpmdragora/dragora-urpm-sources.pl
@@ -25,7 +25,7 @@
use AdminPanel::Rpmdragora::init;
use AdminPanel::rpmdragora;
-use AdminPanel::Rpmdragora::edit_urpm_sources;
+use AdminPanel::Rpmdragora::edit_urpm_sources qw(run);
use AdminPanel::Privileges;
use AdminPanel::Shared::Locales;
diff --git a/modules/rpmdragora/dragoraUpdate b/modules/rpmdragora/dragoraUpdate
index b9894c07..b1ab4002 100755
--- a/modules/rpmdragora/dragoraUpdate
+++ b/modules/rpmdragora/dragoraUpdate
@@ -25,8 +25,6 @@
use strict;
use MDK::Common::Func 'any';
-# use lib qw(/usr/lib/libDrakX);
-# use common;
use File::ShareDir ':ALL';
use AdminPanel::Rpmdragora::init;
diff --git a/modules/rpmdragora/rpmdragora b/modules/rpmdragora/rpmdragora
index 8beaf5e4..28e98d1e 100755
--- a/modules/rpmdragora/rpmdragora
+++ b/modules/rpmdragora/rpmdragora
@@ -27,16 +27,17 @@
# $Id: rpmdragora 267936 2010-04-26 16:40:21Z jvictor $
-use MDK::Common::Func 'any';
-use lib qw(/usr/lib/libDrakX);
-use common;
+use MDK::Common::Func qw(any if_);
use utf8;
-# TO WORKAROUND LOCALIZATION ISSUE
-use AdminPanel::Rpmdragora::localization;
+use MDK::Common::DataStructure qw(uniq intersection);
+use MDK::Common::Various qw(to_bool first);
+use MDK::Common::System qw(arch);
+
+use urpm::media;
+use urpm::msg;
use AdminPanel::Rpmdragora::init;
-use standalone; #- standalone must be loaded very first, for 'explanations', but after rpmdragora::init
use AdminPanel::rpmdragora;
use AdminPanel::Shared;
use AdminPanel::Shared::Locales;
@@ -45,11 +46,9 @@ use AdminPanel::Rpmdragora::gui;
use AdminPanel::Rpmdragora::rpmnew;
use AdminPanel::Rpmdragora::formatting;
use AdminPanel::Rpmdragora::pkg;
-use urpm::media;
use yui;
-use AdminPanel::Rpmdragora::widgets;
use feature 'state';
# OLD $ugtk2::wm_icon = get_icon('installremoverpm', "title-$MODE");
@@ -223,7 +222,7 @@ sub _do_search($$$$$$) {
if ($NVR_searches->[0]) {
next if !/$entry_rx/;
} else {
- next if first(split_fullname($_)) !~ /$entry_rx/;
+ next if MDK::Common::Various::first(split_fullname($_)) !~ /$entry_rx/;
}
push @search_results, $_;
# FIXME: should be done for all research types
@@ -396,7 +395,7 @@ sub run_treeview_dialog {
@$unsel < @$sel;
},
get_status => sub {
- $loc->N("Selected: %s / Free disk space: %s", formatXiB($size_selected), formatXiB($size_free*1024));
+ $loc->N("Selected: %s / Free disk space: %s", urpm::msg::formatXiB($size_selected), urpm::msg::formatXiB($size_free*1024));
},
rebuild_tree => sub { $tree->rebuildTree(); },
};
@@ -1192,7 +1191,7 @@ sub run_treeview_dialog {
# -=-=-=---=-=-=---=-=-=-- main -=-=-=---=-=-=---=-=-=-
-if (my $pid = is_running('rpmdragora')) {
+if (my $pid = AdminPanel::Shared::isProcessRunning('rpmdragora')) {
interactive_msg($loc->N("Warning"), $loc->N("rpmdragora is already running (pid: %s)", $pid), yesno => [ $loc->N("Quit") ]);
exit(0);
}