From f36deffb742a8d801280606006807f2ad95f3849 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Fri, 29 Jun 2007 13:36:22 +0000 Subject: prepare merge --- lib/Youri/Submit/Post/CleanRpmsrate.pm | 53 ------------------------ lib/Youri/Submit/Post/Gendistrib.pm | 66 ------------------------------ lib/Youri/Submit/Post/Genhdlist2.pm | 74 ---------------------------------- 3 files changed, 193 deletions(-) delete mode 100644 lib/Youri/Submit/Post/CleanRpmsrate.pm delete mode 100644 lib/Youri/Submit/Post/Gendistrib.pm delete mode 100644 lib/Youri/Submit/Post/Genhdlist2.pm (limited to 'lib/Youri/Submit/Post') diff --git a/lib/Youri/Submit/Post/CleanRpmsrate.pm b/lib/Youri/Submit/Post/CleanRpmsrate.pm deleted file mode 100644 index 977e2a0..0000000 --- a/lib/Youri/Submit/Post/CleanRpmsrate.pm +++ /dev/null @@ -1,53 +0,0 @@ -# $Id: CleanRpmsrate.pm 115367 2007-01-30 09:47:04Z pixel $ -package Youri::Submit::Post::CleanRpmsrate; - -=head1 NAME - -Youri::Submit::Post::CleanRpmsrate - calls clean-rpmsrate - -=head1 DESCRIPTION - -Calls clean-rpmsrate - -=cut - -use warnings; -use strict; -use Carp; -use base qw/Youri::Submit::Post/; - -#- inlined from MDK::Common::DataStructure -sub uniq { my %l; $l{$_} = 1 foreach @_; grep { delete $l{$_} } @_ } - -sub _init { -} - -sub run { - my ($self, $repository, $target, $define) = @_; - croak "Not a class method" unless ref $self; - my $root = $repository->get_install_root(); - my @changed = @{$repository->get_arch_changed($target)}; - if (grep { $_ eq 'i586' } @changed) { - # x86_64 uses i586 pkgs, so rpmsrate need to be rebuild - @changed = uniq(@changed, 'x86_64'); - } - foreach my $arch (@changed) { - my $rpmsrate = "$root/$target/$arch/media/media_info/rpmsrate"; - my @media = "$root/$target/$arch/media/main/release"; - system("cp", "$rpmsrate-raw", "$rpmsrate-new"); - system("clean-rpmsrate", "$rpmsrate-new", @media); - system("mv", "-f", "$rpmsrate-new", $rpmsrate); - } - return -} - -=head1 COPYRIGHT AND LICENSE - -Copyright (C) 2007, Mandriva - -This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. - -=cut - -1; - diff --git a/lib/Youri/Submit/Post/Gendistrib.pm b/lib/Youri/Submit/Post/Gendistrib.pm deleted file mode 100644 index 98205c7..0000000 --- a/lib/Youri/Submit/Post/Gendistrib.pm +++ /dev/null @@ -1,66 +0,0 @@ -# $Id: Gendistrib.pm 115367 2007-01-30 09:47:04Z pixel $ -package Youri::Submit::Post::Gendistrib; - -=head1 NAME - -Youri::Submit::Post::Gendistrib - calls gendistrib - -=head1 DESCRIPTION - -Calls gendistrib - -=cut - -use warnings; -use strict; -use Carp; -use base qw/Youri::Submit::Post/; - -sub _init { - my $self = shift; - my %options = ( - user => '', - host => '', - source => '', - destination => '', - @_ - ); - - foreach my $var ('tmpdir', 'command') { - $self->{"_$var"} = $options{$var}; - } -} - -sub run { - my ($self, $repository, $target, $define) = @_; - croak "Not a class method" unless ref $self; - my $root = $repository->get_install_root(); - (undef, undef, my $hour) = gmtime(time); - # during the night, use complete hdlist rebuild - my $fast = '--fast'; - $fast = ''; # blino: don't use fast for now, it might be broken - if ($hour > 22 && $hour < 5) { - if ($hour < 4) { - $fast = '--blind' - } else { - $fast = '' - } - } - foreach my $arch (@{$repository->get_arch_changed($target)}) { - my $cmd = "TMPDIR=$self->{_tmpdir}/$target/$arch time $self->{_command} --nochkdep --nobadrpm $fast --noclean $root/$target/$arch"; - print "$cmd\n"; - system($cmd); - } - return -} - -=head1 COPYRIGHT AND LICENSE - -Copyright (C) 2002-2006, Mandriva - -This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. - -=cut - -1; - diff --git a/lib/Youri/Submit/Post/Genhdlist2.pm b/lib/Youri/Submit/Post/Genhdlist2.pm deleted file mode 100644 index e9c3e24..0000000 --- a/lib/Youri/Submit/Post/Genhdlist2.pm +++ /dev/null @@ -1,74 +0,0 @@ -# $Id: Gendistrib.pm 115367 2007-01-30 09:47:04Z pixel $ -package Youri::Submit::Post::Genhdlist2; - -=head1 NAME - -Youri::Submit::Post::Genhdlist2 - calls genhdlist2 - -=head1 DESCRIPTION - -Calls genhdlist2 - -=cut - -use warnings; -use strict; -use Carp; -use base qw/Youri::Submit::Post/; - -sub _init { - my $self = shift; - my %options = ( - user => '', - host => '', - source => '', - destination => '', - @_ - ); - - foreach my $var ('command') { - $self->{"_$var"} = $options{$var}; - } -} - -sub run { - my ($self, $repository, $target, $define) = @_; - croak "Not a class method" unless ref $self; - my $root = $repository->get_install_root(); - (undef, undef, my $hour) = gmtime(time); - my @changed = @{$repository->get_install_dir_changed($target)}; - if (!@changed) { - print "nothing to do\n"; - return; - } - foreach my $dir (@changed) { - my $file_deps = "$dir/../../media_info/file-deps"; - my $file_deps_option = -e $file_deps ? "--file-deps $file_deps" : ''; - my $cmd = "time $self->{_command} -v --allow-empty-media $file_deps_option $dir"; - print "$cmd\n"; - system($cmd) == 0 or print "ERROR: $cmd failed\n"; - } - - # need to redo global MD5SUM. This MD5SUM is mostly obsolete, but is still needed up to 2007.1 - # (and even on cooker for existing urpmi.cfg) - foreach my $arch (@{$repository->get_arch_changed($target)}) { - my $dir = "$root/$target/$arch/media/media_info"; - my $cmd = "cd $dir ; time md5sum hdlist_* synthesis.*"; - print "$cmd\n"; - my $m = `$cmd`; - open my $f, '>', "$dir/MD5SUM" or die "Can't write $dir/MD5SUM: $!\n"; - print $f $m; - } - return; -} - -=head1 COPYRIGHT AND LICENSE - -Copyright (C) 2002-2006, Mandriva - -This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. - -=cut - -1; - -- cgit v1.2.1