From cc807715c78fc998e3d486bc5724e903b0e229a0 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 25 Jul 2001 17:04:55 +0000
Subject: do not export sync, keep it in common (esp. so that it doesn't
 conflict with my_gtk::sync

---
 perl-install/commands.pm            | 2 +-
 perl-install/common.pm              | 2 +-
 perl-install/install2.pm            | 2 +-
 perl-install/install_steps.pm       | 2 +-
 perl-install/partition_table.pm     | 2 +-
 perl-install/partition_table_mac.pm | 2 +-
 perl-install/partition_table_raw.pm | 8 ++++----
 perl-install/partition_table_sun.pm | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/commands.pm b/perl-install/commands.pm
index 2c9324fd5..0027b92a8 100644
--- a/perl-install/commands.pm
+++ b/perl-install/commands.pm
@@ -579,7 +579,7 @@ sub bug {
     require install_any;
     output("/fd0/report.bug", install_any::report_bug("/mnt")); #- no other way :-(
     umount "/fd0";
-    sync();
+    common::sync();
 }
 
 sub loadkeys {
diff --git a/perl-install/common.pm b/perl-install/common.pm
index 50da27856..a4848f84e 100644
--- a/perl-install/common.pm
+++ b/perl-install/common.pm
@@ -8,7 +8,7 @@ use vars qw(@ISA @EXPORT $SECTORSIZE);
 
 @ISA = qw(Exporter);
 # no need to export ``_''
-@EXPORT = qw(arch sync $SECTORSIZE __ translate untranslate formatXiB removeXiBSuffix formatTime setVirtual makedev unmakedev salt isCdNotEjectable compat_arch better_arch);
+@EXPORT = qw(arch $SECTORSIZE __ translate untranslate formatXiB removeXiBSuffix formatTime setVirtual makedev unmakedev salt isCdNotEjectable compat_arch better_arch);
 
 # perl_checker: RE-EXPORT-ALL
 push @EXPORT, @MDK::Common::EXPORT;
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 327df4f87..a35236f5e 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -609,7 +609,7 @@ sub main {
     eval { commands::cp('-f', "/tmp/ddebug.log", "$o->{prefix}/root") };
 
     #- ala pixel? :-) [fpons]
-    sync(); sync();
+    common::sync(); common::sync();
 
     log::l("installation complete, leaving");
     print "\n" x 80;
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index d637e54c6..f8c368279 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -408,7 +408,7 @@ Consoles 1,3,4,7 may also contain interesting information";
     pkgs::done_db();
 
     #-  why not? cuz weather is nice today :-) [pixel]
-    sync(); sync();
+    common::sync(); common::sync();
 
     #- generate /etc/lvmtab needed for rc.sysinit
     run_program::rooted($o->{prefix}, 'vgscan') if -e '/etc/lvmtab';
diff --git a/perl-install/partition_table.pm b/perl-install/partition_table.pm
index 249cfbd90..514d5568a 100644
--- a/perl-install/partition_table.pm
+++ b/perl-install/partition_table.pm
@@ -498,7 +498,7 @@ sub write($) {
 
     #- now sync disk and re-read the partition table
     if ($hd->{needKernelReread}) {
-	sync();
+	common::sync();
 	$hd->kernel_read;
 	$hd->{needKernelReread} = 0;
     }
diff --git a/perl-install/partition_table_mac.pm b/perl-install/partition_table_mac.pm
index f14668949..2fa628acf 100644
--- a/perl-install/partition_table_mac.pm
+++ b/perl-install/partition_table_mac.pm
@@ -315,7 +315,7 @@ sub write($$$;$) {
         syswrite F, pack($p_format, @$_{@$p_fields}), psizeof($p_format) or return 0;
     }
 
-    sync();
+    common::sync();
 
     1;
 }
diff --git a/perl-install/partition_table_raw.pm b/perl-install/partition_table_raw.pm
index 0323eddf9..28b0db3bb 100644
--- a/perl-install/partition_table_raw.pm
+++ b/perl-install/partition_table_raw.pm
@@ -109,13 +109,13 @@ sub openit($$;$) { sysopen $_[1], $_[0]{file}, $_[2] || 0; }
 # cause kernel to re-read partition table
 sub kernel_read($) {
     my ($hd) = @_;
-    sync();
+    common::sync();
     local *F; openit($hd, *F) or return 0;
-    sync(); sleep(1);
+    common::sync(); sleep(1);
     $hd->{rebootNeeded} = !ioctl(F, c::BLKRRPART(), 0);
-    sync();
+    common::sync();
     close F;
-    sync(); sleep(1);
+    common::sync(); sleep(1);
 }
 
 sub zero_MBR {
diff --git a/perl-install/partition_table_sun.pm b/perl-install/partition_table_sun.pm
index 2337c6860..75025b503 100644
--- a/perl-install/partition_table_sun.pm
+++ b/perl-install/partition_table_sun.pm
@@ -147,7 +147,7 @@ sub write($$$;$) {
 
     syswrite F, pack($main_format, @$info{@$main_fields}), psizeof($main_format) or return 0;
 
-    sync();
+    common::sync();
 
     1;
 }
-- 
cgit v1.2.1