Changeset 3388 in MondoRescue

Timestamp:

Jun 3, 2015, 11:56:04 PM (9 years ago)

Author:

Bruno Cornec

Message:

• mindi now logs MINDI_CACHE
• Fix mindi-get-perl-modules by using scan_deps instead of internal code from Mageia which wasn't fully working. This implies en new dep for mindi on Module::ScanDeps

Location:

branches/3.2/mindi

Files:

• mindi (modified) (3 diffs)
• mindi-get-perl-modules (modified) (4 diffs)

branches/3.2/mindi/mindi

@@ -2819 +2819 @@
 mkdir -p $MINDI_TMP
 
-# Purge from potential old run
-if [ _"$MINDI_CACHE" = _"" ]; then
-    Die "MINDI_CACHE undefined"
-fi
-
 # --nolog needs to be first, and is used in analyze-my-lvm
 if [ "$1" = "--nolog" ] ; then
@@ -2855 +2850 @@
 LogFile "MINDI_SBIN = $MINDI_SBIN"
 LogFile "MINDI_CONF = $MINDI_CONF"
+# Purge from potential old run
+if [ _"$MINDI_CACHE" = _"" ]; then
+    Die "MINDI_CACHE undefined"
+else
+    LogFile "MINDI_CACHE = $MINDI_CACHE"
+fi
+
 if [ -f $MINDI_CONFIG ]; then
     LogFile "-----------------------------"
@@ -3174 +3176 @@
         # This is the scratch dir in mondo - subdir images
         MINDI_CACHE=$3
+        LogFile "MINDI_CACHE = $MINDI_CACHE"
 
         kernelpath=$4; [ "$kernelpath" = "(null)" ] && kernelpath=""

branches/3.2/mindi/mindi-get-perl-modules

@@ -14 +14 @@
 use ProjectBuilder::Base;
 use Getopt::Long qw(:config auto_abbrev no_ignore_case);
+use Module::ScanDeps;
 
 =pod
@@ -64 +65 @@
 my @includes;
 my $req;
-my %args;
-
 GetOptions(
      "verbose|v+" => \$opts{'v'},
@@ -92 +91 @@
 
 # deduplicate entry list
-if (defined $ARGV[0]) {
-    %args = map { $_, 1 } @ARGV;
-} else {
+if (not defined $ARGV[0]) {
     pb_syntax();
 }
@@ -109 +106 @@
 close(TMPF);
 
-foreach my $f (keys %args,"$tmpf") {
-    pb_log(1,"Get perl modules on $f\n");
-    $req = mr_get_perl_modules($f);
-    foreach my $k (keys %$req) {
-        $files{$k} = $req->{$k};
-    }
-    pb_log(1,"After mr_get_perl_modules on $f we got:".Dumper(\%files)."\n");
-}
+push @ARGV,$tmpf;
+
+my $h =  scan_deps(
+        files => \@ARGV,
+        recurse => 1,
+    );
+
 unlink("$tmpf");
 
-foreach my $f (sort keys %files) {
-    print "$f\n";
+pb_log(1,"Returning:");
+pb_log(1,Dumper($h));
+pb_log(1,"-----------------------\n");
+foreach my $f (sort keys %$h) {
+        print "$h->{$f}->{'file'}\n";
 }