mirrors/apparmor
1
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor.git synced 2025-03-04 08:24:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove last vestiges of Immunix::Ycp in deference to official ycp module

Browse source
This commit is contained in:
Jesse Michael 2007-03-19 02:29:47 +00:00
parent c878e09840
commit 7780d79c8d
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
utils/SubDomain.pm
View file

@ -237,9 +237,9 @@ sub setup_yast {
if($ENV{YAST_IS_RUNNING}) { if($ENV{YAST_IS_RUNNING}) {
# load the yast module if available. # load the yast module if available.
eval { require Immunix::Ycp; }; eval { require ycp; };
unless($@) { unless($@) {
import Immunix::Ycp; import ycp;
no warnings 'all'; no warnings 'all';
@ -671,7 +671,7 @@ sub UI_Info ($) {
if($UI_Mode eq "text") { if($UI_Mode eq "text") {
print "$text\n"; print "$text\n";
} else { } else {
Immunix::Ycp::y2milestone($text); ycp::y2milestone($text);
} }
} }
@ -896,7 +896,7 @@ sub SendDataToYast {
while(<STDIN>) { while(<STDIN>) {
$DEBUGGING && debug "SendDataToYast: YCP: $_"; $DEBUGGING && debug "SendDataToYast: YCP: $_";
my ($ycommand, $ypath, $yargument) = Immunix::Ycp::ParseCommand ($_); my ($ycommand, $ypath, $yargument) = ycp::ParseCommand($_);
if($ycommand && $ycommand eq "Read") { if($ycommand && $ycommand eq "Read") {
@ -905,7 +905,7 @@ sub SendDataToYast {
debug "SendDataToYast: Sending--\n$debugmsg"; debug "SendDataToYast: Sending--\n$debugmsg";
} }
Immunix::Ycp::Return($data); ycp::Return($data);
return 1; return 1;
} else { } else {
@ -928,7 +928,7 @@ sub GetDataFromYast {
while(<STDIN>) { while(<STDIN>) {
$DEBUGGING && debug "GetDataFromYast: YCP: $_"; $DEBUGGING && debug "GetDataFromYast: YCP: $_";
my ($ycmd, $ypath, $yarg) = Immunix::Ycp::ParseCommand ($_); my ($ycmd, $ypath, $yarg) = ycp::ParseCommand($_);
if($DEBUGGING) { if($DEBUGGING) {
my $debugmsg = Data::Dumper->Dump([$yarg], [qw(*data)]); my $debugmsg = Data::Dumper->Dump([$yarg], [qw(*data)]);
@ -937,7 +937,7 @@ sub GetDataFromYast {
if($ycmd && $ycmd eq "Write") { if($ycmd && $ycmd eq "Write") {
Immunix::Ycp::Return("true"); ycp::Return("true");
return ($ypath, $yarg); return ($ypath, $yarg);
} else { } else {