aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-10-27 16:49:21 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-10-27 16:49:21 +0000
commit8db2ef3faaa959fc470c78e9add0fcbff9202f03 (patch)
treedefd0735ce72b8c6da8c538f61b4ebac8186513a
parentf4d7db31562e1d8a5d418d257e58e3204c18b8b6 (diff)
downloadrpmdrake-8db2ef3faaa959fc470c78e9add0fcbff9202f03.tar
rpmdrake-8db2ef3faaa959fc470c78e9add0fcbff9202f03.tar.gz
rpmdrake-8db2ef3faaa959fc470c78e9add0fcbff9202f03.tar.bz2
rpmdrake-8db2ef3faaa959fc470c78e9add0fcbff9202f03.tar.xz
rpmdrake-8db2ef3faaa959fc470c78e9add0fcbff9202f03.zip
Get rid of c::_exit
-rwxr-xr-xedit-urpm-sources.pl3
-rwxr-xr-xgurpmi.addmedia3
-rwxr-xr-xrpmdrake3
-rw-r--r--rpmdrake.pm3
4 files changed, 8 insertions, 4 deletions
diff --git a/edit-urpm-sources.pl b/edit-urpm-sources.pl
index 3f82c00a..2f119113 100755
--- a/edit-urpm-sources.pl
+++ b/edit-urpm-sources.pl
@@ -26,13 +26,14 @@ use lib qw(/usr/lib/libDrakX);
use common;
use rpmdrake;
use URPM::Signature;
+use POSIX qw(_exit);
use MDK::Common qw(max);
BEGIN {
eval { require ugtk2; ugtk2->import(qw(:all)) };
if ($@) {
print "This program cannot be run in console mode.\n";
- c::_exit(0); #- skip ugtk2::END
+ _exit(0); #- skip ugtk2::END
}
}
diff --git a/gurpmi.addmedia b/gurpmi.addmedia
index 2b458c96..ecedf817 100755
--- a/gurpmi.addmedia
+++ b/gurpmi.addmedia
@@ -48,7 +48,8 @@ use rpmdrake;
eval { require ugtk2; ugtk2->import(qw(:all)) };
if ($@) {
print "This program cannot be run in console mode.\n";
- c::_exit(0); #- skip ugtk2::END
+ use POSIX qw(_exit);
+ _exit(0); #- skip ugtk2::END
}
$::isStandalone = 1;
diff --git a/rpmdrake b/rpmdrake
index 3093256d..4b56c65a 100755
--- a/rpmdrake
+++ b/rpmdrake
@@ -24,6 +24,7 @@ use strict;
use MDK::Common 'any';
use lib qw(/usr/lib/libDrakX);
use common;
+use POSIX qw(_exit);
BEGIN { #- we want to run this code before the Gtk->init of the use-my_gtk
my $basename = sub { local $_ = shift; s|/*\s*$||; s|.*/||; $_ };
@@ -85,7 +86,7 @@ unless ($MODE) {
eval { require ugtk2; ugtk2->import(qw(:all)); require Gtk2::Pango; require Gtk2::Gdk::Keysyms };
if ($@) {
print "This program cannot be run in console mode.\n";
- c::_exit(0); #- skip ugtk2::END
+ _exit(0); #- skip ugtk2::END
}
$MODE eq 'update' || $options{root} and require_root_capability();
diff --git a/rpmdrake.pm b/rpmdrake.pm
index 78f01b6c..4d01f8ab 100644
--- a/rpmdrake.pm
+++ b/rpmdrake.pm
@@ -34,6 +34,7 @@ use URPM;
use URPM::Resolve;
use strict;
use c;
+use POSIX qw(_exit);
use common;
use curl_download;
@@ -83,7 +84,7 @@ unshift @::textdomains, 'rpmdrake', 'urpmi';
eval { require ugtk2; ugtk2->import(qw(:all)) };
if ($@) {
print "This program cannot be run in console mode.\n";
- c::_exit(0); #- skip ugtk2::END
+ _exit(0); #- skip ugtk2::END
}
ugtk2::add_icon_path('/usr/share/rpmdrake/icons');