4.5-22mdk: Updates for the new media layout in cooker4.5.22

4 files changed, 30 insertions, 22 deletions

diff --git a/distriblint b/distriblint
index fa00cbc..5cea290 100755
--- a/distriblint
+++ b/distriblint
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-#- Mandrake Distribution Checker.
+#- Mandrakelinux Distribution Checker.
 #- Copyright (C) 2002 MandrakeSoft (fpons@mandrakesoft.com)
 #-
 #- This program is free software; you can redistribute it and/or modify
@@ -41,15 +41,15 @@ sub pass_get_hdlists {
 
     $o->{c}->("parsing hdlists from distrib $o->{root}.");
     local *F;
-    open F, "$o->{root}/Mandrake/base/hdlists" or die "unable to open $o->{root}/Mandrake/base/hdlists";
+    open F, "$o->{root}/media/media_info/hdlists" or die "unable to open $o->{root}/media/media_info/hdlists";
     foreach (<F>) {
 	chomp;
 	s/\s*#.*$//;
 	/^\s*$/ and next;
 	m/^\s*(hdlist\S*\.cz2?)\s+(\S+)\s*(.*)$/ or die "invalid hdlist description \"$_\" in hdlists file";
 	
-	push @{$o->{hdlists}}, { synthesis => "$o->{root}/Mandrake/base/synthesis.$1",
-				 hdlist => "$o->{root}/Mandrake/base/$1",
+	push @{$o->{hdlists}}, { synthesis => "$o->{root}/media/media_info/synthesis.$1",
+				 hdlist => "$o->{root}/media/media_info/$1",
 				 dir => $2,
 				 descr => $3 };
     }
@@ -184,7 +184,7 @@ sub main {
 	die "usage: $0 --distrib <d>";
     }
     
-    #- perform all test, $i is used for pass numbering.
+    #- perform all tests, $i is used for pass numbering.
     print "Starting tests...";
     my $i = 1;
     foreach (@passtest) {
diff --git a/gendistrib b/gendistrib
index ca852df..639bd7d 100755
--- a/gendistrib
+++ b/gendistrib
@@ -4,7 +4,7 @@
 # $Id$
 #
 
-#- Copyright (C) 1999 MandrakeSoft (fpons@mandrakesoft.com)
+#- Copyright (C) 1999-2004 Mandrakesoft (fpons@mandrakesoft.com)
 #-
 #- 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
@@ -67,12 +67,12 @@ GetOptions(
 my $root = $root[0];
 
 my %default_urpmfiles = (
-	depslist =>  "$root/Mandrake/base/depslist.ordered",
-	provides => "$root/Mandrake/base/provides",
-	compss =>   "$root/Mandrake/base/compss",
-	hdlists =>  "$root/Mandrake/base/hdlists",
-	version =>  "$root/VERSION",
-	md5sum =>   "$root/Mandrake/base/MD5SUM",	
+    depslist => "$root/media/media_info/depslist.ordered",
+    provides => "$root/media/media_info/provides",
+    compss =>   "$root/media/media_info/compss",
+    hdlists =>  "$root/media/media_info/hdlists",
+    version =>  "$root/VERSION",
+    md5sum =>   "$root/media/media_info/MD5SUM",
 );
 
 while (my ($k, $v) = each(%default_urpmfiles)) {
@@ -86,7 +86,12 @@ foreach (<F>) {
     /^\s*$/ and next;
     m/^\s*(?:noauto:)?(hdlist\S*\.cz2?)\s+(\S+)\s*(.*)$/ or die "invalid hdlist description \"$_\" in hdlists file";
 
-    push @hdlists, { synthesis => "$root/Mandrake/base/synthesis.$1", hdlist => "$root/Mandrake/base/$1", dir => $2, descr => $3 };
+    push @hdlists, {
+	synthesis => "$root/media/media_info/synthesis.$1",
+	hdlist => "$root/media/media_info/$1",
+	dir => $2,
+	descr => $3,
+    };
 }
 close F;
 
@@ -173,7 +178,7 @@ $urpm->build_base_files(depslist => $urpmfiles{depslist},
 unlink $urpmfiles{md5sum};
 
 #- check if there are NOTFOUND in dependancy, check if they are in other medium, warn the user.
-if (! $nochkdep) {
+if ($nooutput || !$nochkdep) {
     foreach (0 .. $#{$urpm->{depslist}}) {
         my $pkg = $urpm->{depslist}[$_];
 
diff --git a/packdrake-pm/packdrake.pm b/packdrake-pm/packdrake.pm
index 3766d81..722b151 100644
--- a/packdrake-pm/packdrake.pm
+++ b/packdrake-pm/packdrake.pm
@@ -7,14 +7,14 @@ $VERSION = "0.04";
 
 =head1 NAME
 
-packdrake - Mandrake Simple Archive Extractor/Builder
+packdrake - Simple Archive Extractor/Builder
 
 =head1 SYNOPSIS
 
     require packdrake;
 
-    packdrake::cat_archive("/export/Mandrake/base/hdlist.cz",
-                           "/export/Mandrake/base/hdlist2.cz");
+    packdrake::cat_archive("/export/media/media_info/hdlist.cz",
+                           "/export/media/media_info/hdlist2.cz");
     packdrake::list_archive("/tmp/modules.cz2");
 
     my $packer = new packdrake("/tmp/modules.cz2");
@@ -24,12 +24,12 @@ packdrake - Mandrake Simple Archive Extractor/Builder
         (\*STDIN, "/lib/modules", "/tmp/modules.cz2",
          400000, "bzip2", "bzip2 -d");
     my $packer = packdrake::build_archive
-        (\*STDIN, "/export/Mandrake/base/hdlist.cz",
+        (\*STDIN, "/export/media/media_info/hdlist.cz",
          400000, "gzip -9", "gzip -d");
 
 =head1 DESCRIPTION
 
-C<packdrake> is a very simple archive extractor and builder used by MandrakeSoft.
+C<packdrake> is a very simple archive extractor and builder used by Mandrakesoft.
 
 =head1 IMPLEMENTATION
 
@@ -62,11 +62,11 @@ TOC_TRAILER for summary.
 
 =head1 SEE ALSO
 
-packdrake command is a simple executable perl script using this module.
+The packdrake command is a simple executable perl script using this module.
 
 =head1 COPYRIGHT
 
-Copyright (C) 2000 MandrakeSoft <fpons@mandrakesoft.com>
+Copyright (C) 2000-2004 Mandrakesoft <fpons@mandrakesoft.com>
 
 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
diff --git a/rpmtools.spec b/rpmtools.spec
index 2dc9376..973e131 100644
--- a/rpmtools.spec
+++ b/rpmtools.spec
@@ -1,5 +1,5 @@
 %define name rpmtools
-%define release 21mdk
+%define release 22mdk
 
 # do not modify here, see Makefile in the CVS
 %define version 4.5
@@ -65,6 +65,9 @@ Various tools needed by urpmi and drakxtools for handling rpm files.
 %{_mandir}/*/*
 
 %changelog
+* Thu Jul 22 2004 Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com> 4.5-22mdk
+- Updates for the new media layout in cooker
+
 * Mon Jul 05 2004 Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com> 4.5-21mdk
 - Minor changes