- resync lost file after svn crash

3 files changed, 446 insertions, 14 deletions

diff --git a/lib/MDV/Distribconf.pm b/lib/MDV/Distribconf.pm
index ddcb908..560ae19 100644
--- a/lib/MDV/Distribconf.pm
+++ b/lib/MDV/Distribconf.pm
@@ -51,6 +51,49 @@ Some values have specific signification:
 
 =over 4
 
+=item media specific values:
+
+=over 4
+
+=item B<hdlist>
+
+The path or basename of the hdlist. By default, this is
+C<hdlist_mediapath.cz>, with slashes and spaces being replaced by '_'.
+
+=item B<synthesis>
+
+The path or basename of the synthesis. By default, this is the hdlist
+name prefixed by C<synthesis>.
+
+=item B<pubkey>
+
+The path or basename of the gpg public key file. By default, this is
+the media name prefixed by C<pubkey_>.
+
+=item B<name>
+
+A human-readable name for the media. By default this is the media path
+(that is, the section name), where slashes have been replaced by
+underscores.
+
+=back
+
+=item global specific values:
+
+=over 4
+
+=item B<version>
+
+OS version.
+
+=item B<branch>
+
+OS branch (cooker, etc.)
+
+=item B<arch>
+
+Media target architecture.
+
 =item B<root>
 
 The root path of the distribution tree. This value is not set in
@@ -71,10 +114,12 @@ version.
 
 =back
 
-Up to version 2 of media.cfg, for the paths of the hdlist and synthesis files,
-if only a basename is provided, the path is assumed to be relative to the
-mediadir or infodir. (hdlist and synthesis are created in both directories.)
-If it's a complete path, it's assumed to be relative to the 'root'. For example,
+=back
+
+For the paths of the hdlist and synthesis files, if only a basename is
+provided, the path is assumed to be relative to the mediadir or infodir.
+(hdlist and synthesis are created in both directories.) If it's a complete
+path, it's assumed to be relative to the 'root'. For example,
 
     hdlist.cz    -> <root>/<infodir>/hdlist.cz
     ./hdlist.cz  -> <root>/./hdlist.cz
@@ -105,8 +150,6 @@ Here's a complete example of a F<media.cfg> file:
     name=Contrib Sources
     noauto=1
 
-See L<MDV::Distribconf::MediaCFG> for specific value set in media.cfg.
-
 =head1 METHODS
 
 =cut
diff --git a/lib/MDV/Distribconf/Checks.pm b/lib/MDV/Distribconf/Checks.pm
new file mode 100644
index 0000000..57bae02
--- /dev/null
+++ b/lib/MDV/Distribconf/Checks.pm
@@ -0,0 +1,392 @@
+# $Id: Checks.pm 59285 2006-09-01 00:10:10Z nanardon $
+
+package MDV::Distribconf::Checks;
+
+our $VERSION = (qq$Revision: 59285 $ =~ /(\d+)/)[0];
+
+=head1 NAME
+
+MDV::Distribconf::Checks - A Subclass to MDV::Distribconf::Build to check distribution trees
+
+=head1 METHODS
+
+=over 4
+
+=cut
+
+use strict;
+use warnings;
+use MDV::Distribconf::MediaCFG;
+use MDV::Packdrakeng;
+use Digest::MD5;
+use MDV::Distribconf::Utils;
+use base qw(MDV::Distribconf);
+
+sub new {
+    my $class = shift;
+    my $self = $class->SUPER::new(@_);
+    bless $self, $class;
+}
+
+sub _report_err {
+    my ($out, $err_code, $fmt, @args) = @_;
+    my %errs = (
+        'UNSYNC_HDLIST' => 'E',
+        'UNSYNC_MD5' => 'E',
+        'WRONG_CONFIG' => 'W',
+        'MISSING_MEDIA' => 'W',
+        'MISSING_MEDIADIR' => 'E',
+        'SAME_INDEX' => 'E',
+        'NOMEDIA' => 'E',
+        'MISSING_INDEX' => 'E',
+        'MISSING_INFO' => 'W',
+    );
+    my $message = sprintf($fmt, @args);
+
+    if (ref $out eq 'CODE') {
+        $out->(
+            errcode => $err_code || '?',
+            level => $errs{$err_code} || '?',
+            message => $message,
+        );
+    } else {
+        printf $out "%s: %s\n", $errs{$err_code} || '?', $message;
+    }
+    return($errs{$err_code} || '?' eq 'E' ? 1 : 0)
+}
+
+=item $distrib->check_config
+
+=cut
+
+sub check_config {
+    my ($self, $fhout) = @_;
+    $fhout ||= \*STDERR;
+
+    my $error = 0;
+
+    foreach my $var ($self->{cfg}->Parameters('media_info')) {
+        $self->{cfg}->val('media_info', $var) or next;
+        my @er = MDV::Distribconf::MediaCFG::_valid_param(
+            'media_info',
+            $var,
+            $self->{cfg}->val('media_info', $var),
+        );
+        foreach (@er) {
+            $error += _report_err(
+                $fhout,
+                'WRONG_CONFIG',
+                "%s %s: %s", 'media_info', $var, $_
+            );
+        }
+    }
+    foreach my $media ($self->listmedia()) {
+        foreach my $var ($self->{cfg}->Parameters($media)) {
+            $self->{cfg}->val($media, $var) or next;
+            my @er = MDV::Distribconf::MediaCFG::_valid_param(
+                'media_info',
+                $var,
+                $self->getvalue($media, $var),
+            );
+            foreach (@er) {
+                $error += _report_err(
+                    $fhout,
+                    'WRONG_CONFIG',
+                    "%s %s: %s", $media, $var, $_
+                );
+            }
+            my $varinfo = MDV::Distribconf::MediaCFG::_value_info($var) || {};
+            if ($varinfo->{deny}) {
+                if ($self->getvalue($media, $varinfo->{deny})) {
+                    $error += _report_err(
+                        $fhout,
+                        'WRONG_CONFIG',
+                        '%s and %s cannot be set together (media %s)',
+                        $var, $varinfo->{deny}, $media
+                    );
+                }
+            }
+            if ($varinfo->{ismedialist} || $varinfo->{cross}) {
+            foreach my $sndmedia (split(/ /, $self->getvalue($media, $var, ''))) {
+                if (!$self->mediaexists($sndmedia)) {
+                    $error += _report_err(
+                        $fhout,
+                        'MISSING_MEDIA',
+                         "`%s' refer as %s to non existant `%s'",
+                        $media,
+                        $var,
+                        $sndmedia,
+                    );
+                } elsif($varinfo->{cross}) {
+                    if(!grep { $media eq $_ } 
+                        split(/ /, 
+                            $self->getvalue($sndmedia, $varinfo->{cross})
+                        )) {
+                        $error += _report_err(
+                            $fhout,
+                            'WRONG_CONFIG',
+                            "`%s' has not `%s' as %s",
+                            $sndmedia, $media, $varinfo->{cross},
+                        );
+                    }
+                }
+            }
+            }
+        }
+    }
+
+    # checking overlap
+    {
+        my %foundname;
+        push(@{$foundname{$self->getvalue($_, 'name')}}, $_) 
+            foreach($self->listmedia());
+
+        foreach (keys %foundname) {
+            if (@{$foundname{$_}} > 1) {
+                $error += _report_err(
+                    $fhout,
+                    'WRONG_CONFIG',
+                    "`%s' have same name (%s)",
+                    join(', ', @{$foundname{$_}}),
+                    $_,
+                );
+            }
+        }
+    }
+
+    $error
+}
+=item $distrib->check_media_coherency($fhout)
+
+Performs basic checks on the distribution and prints to $fhout (STDERR by
+default) warnings and errors found. Returns the number of errors reported.
+
+=cut
+
+sub check_media_coherency {
+    my ($distrib, $fhout) = @_;
+    $fhout ||= \*STDERR;
+
+    my $error = 0;
+
+    $distrib->listmedia or $error += _report_err(
+        'NOMEDIA', "No media found in this config"
+    );
+
+    # Checking no overlap
+    foreach my $var (qw/hdlist synthesis path/) {
+        my %e;
+        foreach ($distrib->listmedia) {
+            my $v = $distrib->getpath($_, $var);
+            push @{$e{$v}}, $_;
+        }
+
+        foreach my $key (keys %e) {
+            if (@{$e{$key}} > 1) {
+                $error += _report_err(
+                    $fhout,
+                    'SAME_INDEX', 
+                    "media `%s' have same %s (%s)",
+                    join (", ", @{$e{$key}}),
+                    $var,
+                    $key
+                );
+            }
+        }
+    }
+
+    foreach my $media ($distrib->listmedia) {
+	-d $distrib->getfullpath($media, 'path') or $error += _report_err(
+	    $fhout,
+		'MISSING_MEDIADIR', "dir %s does't exist for media `%s'",
+	    $distrib->getpath($media, 'path'),
+	    $media
+	);
+	foreach (qw/hdlist synthesis/) {
+	    -f $distrib->getfullpath($media, $_) or $error += _report_err(
+        $fhout,
+		'MISSING_INDEX', "$_ %s doesn't exist for media `%s'",
+		$distrib->getpath($media, $_),
+		$media
+	    );
+	}
+    foreach (qw/pubkey/) {
+	    -f $distrib->getfullpath($media, $_) or $error += _report_err(
+        $fhout,
+		'MISSING_INFO', "$_ %s doesn't exist for media `%s'",
+		$distrib->getpath($media, $_),
+		$media
+	    );
+	}
+
+    }
+    return $error;
+}
+
+=item $distrib->check_index_sync($media)
+
+Check the synchronisation between rpms contained by media $media
+and its hdlist:
+
+  - all rpms should be in the hdlist
+  - the hdlist should not contains rpms that does not exists
+
+Return 1 if no problem were found
+
+=cut
+
+
+sub check_index_sync {
+    my ($self, $media, $submedia) = @_;
+    my $rpmspath = $self->getfullpath($media, 'path');
+    my $hdlist = ($submedia && -d $self->getfullpath($media, 'path') . '/media_info') ?
+        $self->getfullmediapath($media, 'hdlist') :
+        $self->getfullpath($media, 'hdlist');
+    my $synthesis = ($submedia && -d $self->getfullpath($media, 'path') . '/media_info') ?
+        $self->getfullmediapath($media, 'synthesis') :
+        $self->getfullpath($media, 'synthesis');
+
+    -f $hdlist && -f $synthesis or return 0; # avoid warnings
+    my ($inp, $ind) = MDV::Distribconf::Utils::hdlist_vs_dir($hdlist, $rpmspath);
+    if (@{$inp || []} + @{$ind || []}) {
+        return 0;
+    }
+    return 1;
+}
+
+=item $distrib->check_media_md5($media)
+
+Check md5sum for hdlist and synthesis for the media $media are the same
+than value contains in the existing MD5SUM file.
+
+The function return an error also if the value is missing
+
+Return 1 if no error were found.
+
+=cut
+
+sub check_media_md5 {
+    my ($self, $media) = @_;
+    my ($unsync) = MDV::Distribconf::Utils::checkmd5(
+        $self->getfullmediapath($media, 'MD5SUM'),
+        map { $self->getfullmediapath($media, $_) } (qw(hdlist synthesis))
+    );
+    if (@{$unsync || []}) {
+        return 0;
+    } else {
+        return 1;
+    }
+}
+
+sub check_global_md5 {
+    my ($self) = @_;
+    my @indexes;
+    foreach my $media ($self->listmedia()) {
+        push(@indexes, map { $self->getfullpath($media, $_) } (qw(hdlist synthesis)));
+    }
+    my ($unsync) = MDV::Distribconf::Utils::checkmd5(
+        $self->getfullpath(undef, 'MD5SUM'),
+        @indexes,
+    );
+    if (@{$unsync || []}) {
+        return 0;
+    } else {
+        return 1;
+    }
+}
+
+=item $distrib->checkdistrib($fhout)
+
+Performs all light checks on the distribution and prints to $fhout (STDERR by
+default) warnings and errors found. Returns the number of errors reported.
+
+=cut
+
+sub checkdistrib {
+    my ($self, $fhout) = @_;
+    $fhout ||= \*STDERR;
+
+    my $error = 0;
+
+    $error += $self->check_config($fhout);
+    $error += $self->check_media_coherency($fhout);
+
+    foreach my $media ($self->listmedia) {
+        if(!$self->check_index_sync($media)) {
+            $error += _report_err(
+                $fhout,
+                'UNSYNC_HDLIST',
+                "hdlist for media `%s' is not sync with its rpms",
+                $media,
+            );
+        }
+
+        if(!$self->check_media_md5($media)) {
+            $error += _report_err(
+                $fhout,
+                'UNSYNC_MD5',
+                "md5sum for media `%s' is not ok",
+                $media,
+            );
+        }
+    }
+
+    if ($self->check_global_md5()) {
+        $error += _report_err(
+            $fhout,
+            'UNSYNC_MD5',
+            'Global md5sum file is not ok',
+        );
+    }
+    
+    $error
+}
+
+=item $distrib->check($fhout)
+
+=cut
+
+sub check {
+    my ($self, $fhout) = @_;
+    $fhout ||= \*STDERR;
+
+    my $error = $self->check_config($fhout);
+    $error += $self->check_media_coherency($fhout);
+
+    $error
+}
+
+1;
+
+__END__
+
+=back
+
+=head1 SEE ALSO
+
+L<MDV::Distribconf>
+L<MDV::Distribconf::Build>
+
+=head1 AUTHOR
+
+Olivier Thauvin <nanardon@mandriva.org>
+
+=head1 LICENSE AND COPYRIGHT
+
+(c) 2005 Olivier Thauvin ; (c) 2005, 2006 Mandriva
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+=cut
diff --git a/lib/MDV/Distribconf/MediaCFG.pm b/lib/MDV/Distribconf/MediaCFG.pm
index 90a320d..91431aa 100644
--- a/lib/MDV/Distribconf/MediaCFG.pm
+++ b/lib/MDV/Distribconf/MediaCFG.pm
@@ -155,20 +155,17 @@ foreach (qw(hdlist name synthesis pubkey)) {
 
 The name of the media. If unset, the section is the name.
 
-=head3 B<hdlist>
+=head3 hdlist
 
-The basename of the hdlist. By default, this is
-C<hdlist_mediapath.cz>, with slashes and spaces being replaced by '_'.
+The hdlist file holding rpm infos for the media
 
-=head3 B<synthesis>
+=head3 synthesis
 
-The basename of the synthesis. By default, this is the hdlist
-name prefixed by C<synthesis>.
+The synthesis file holding rpm infos for the media
 
 =head3 pubkey
 
-The basename of the gpg public key file. By default, this is
-the media name prefixed by C<pubkey_>.
+The file holding public gpg key used to sign rpms in this media.
 
 =cut