summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaouda Lo <daouda@mandriva.com>2004-02-04 11:10:01 +0000
committerDaouda Lo <daouda@mandriva.com>2004-02-04 11:10:01 +0000
commitbecdca4a0ac13ae3c0fbe00a0f1c84813b1d0a2a (patch)
treec9f8392a787025a0031e770e7143d4056b5da621
parent8c452d55fbab47d84adaeb4453e177e1938dc3ba (diff)
downloaddrakx-becdca4a0ac13ae3c0fbe00a0f1c84813b1d0a2a.tar
drakx-becdca4a0ac13ae3c0fbe00a0f1c84813b1d0a2a.tar.gz
drakx-becdca4a0ac13ae3c0fbe00a0f1c84813b1d0a2a.tar.bz2
drakx-becdca4a0ac13ae3c0fbe00a0f1c84813b1d0a2a.tar.xz
drakx-becdca4a0ac13ae3c0fbe00a0f1c84813b1d0a2a.zip
- less arguments in ntp_server, $prefix no more passed to function args
-rw-r--r--perl-install/timezone.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/timezone.pm b/perl-install/timezone.pm
index 69af76e60..6515c041a 100644
--- a/perl-install/timezone.pm
+++ b/perl-install/timezone.pm
@@ -21,7 +21,7 @@ sub read() {
}
sub ntp_server {
- my $setting = @_ > 1;
+ my $setting = @_ >= 1;
my ($server) = @_;
my $f = "$::prefix/etc/ntp.conf";
p { "$_\n" } sort(@names)));
diff --git a/t/superuser--media_info_dir.t b/t/superuser--media_info_dir.t
index 7d07d011..e40034cb 100644
--- a/t/superuser--media_info_dir.t
+++ b/t/superuser--media_info_dir.t
@@ -77,11 +77,6 @@ sub rpm_v3 {
chomp(my $fullname = run_urpm_cmd("urpmq -f $src_rpm"));
my ($arch) = $fullname =~ /(\w+)$/;
- if (rpm_is_jbj_version()) {
- # WARNING: package has a Sourcerpm empty tag (#29809), but this package is broken anyway
- $wanted_arch = 'i386' if $src_rpm =~ /KBackup/;
- }
-
is($arch, $wanted_arch, "$fullname should have arch $wanted_arch (found $arch)");
}
}
diff --git a/t/superuser--rpm.t b/t/superuser--rpm.t
index 9405e87b..9e4bad0a 100644
--- a/t/superuser--rpm.t
+++ b/t/superuser--rpm.t
@@ -8,7 +8,7 @@ use Test::More 'no_plan';
my $name = 'rpm-query-in-scriptlet';
need_root_and_prepare();
-rpm_is_jbj_version() or system_('mkdir -p root/var/lib/rpm');
+system_('mkdir -p root/var/lib/rpm');
test_rpm_query_in_scriptlet();
sub test_rpm_query_in_scriptlet {
diff --git a/t/superuser--rpmnew.t b/t/superuser--rpmnew.t
index 4aa530e7..d82f45f7 100644
--- a/t/superuser--rpmnew.t
+++ b/t/superuser--rpmnew.t
@@ -43,14 +43,6 @@ sub test2 {
['orig', 'orig', 'orig'],
['changed', 'changed', 'changed']);
- if (rpm_is_jbj_version()) {
- #- WARNING: those files have no added value
- #- (since the file was created with same content)
- #- and should not be there
- ok(unlink "$::pwd/root/etc/config.rpmorig");
- ok(unlink "$::pwd/root/etc/config-noreplace.rpmnew");
- }
-
check_no_etc_files();
}