[Mud-builder-commits] r159 - in trunk/lib/MUD: . Fetch

[jaffa at garage.maemo.org]

Author: jaffa
Date: 2007-02-28 15:59:51 +0200 (Wed, 28 Feb 2007)
New Revision: 159

Modified:
   trunk/lib/MUD/Build.pm
   trunk/lib/MUD/Fetch/Debian.pm
Log:
#504: Fix build failure when building e2fsprogs due to package/dependency name difference with Debian "dc" package

Modified: trunk/lib/MUD/Build.pm
===================================================================
--- trunk/lib/MUD/Build.pm	2007-02-22 10:10:24 UTC (rev 158)
+++ trunk/lib/MUD/Build.pm	2007-02-28 13:59:51 UTC (rev 159)
@@ -8,6 +8,7 @@
 use strict;
 use vars qw(@ISA $VERSION @PREVENT_INSTALL); 
 use Carp;
+use File::Basename;
 use File::Path;
 use File::Spec;
 use MUD::Config;
@@ -78,17 +79,18 @@
     chdir $self->{workdir};
     $fetch->fetch();
 
-    my $buildDir = $self->{data}->{build} || '.';
+    my $buildDir = basename($self->{data}->{build} || '.');
     my $origBDir = $buildDir;
     $buildDir    =~ s/-src\b//;
     my $version  = $self->{data}->{version};
-    print "Version = $version\n";
-    $version   ||= $1 if $buildDir =~ /-(\d[\w\-\.]+\w|\d\w*)*$/;
-    $version   ||= $1 if $buildDir =~ /(\d+)$/;
+    print "Version = $version, buildDir = $buildDir\n";
+    $version   ||= $1 if $buildDir =~ s/-(\d[\w\-\.]+\w|\d\w*)*$//;
+    $version   ||= $1 if !$version and $buildDir =~ s/(\d+)$//;
     $version     = $self->{data}->{data}->{deb}->{version} || $version;
     $version   ||= 1;
-    print "Version = $version\n";
-    $buildDir    = $self->{package}."-$version";
+    print "Version = $version, buildDir = $buildDir\n";
+    $buildDir    = $self->{package} unless $buildDir =~ /^[a-z0-9\-\+]+$/;
+    $buildDir   .= "-$version";
     print "Build dir = $buildDir\n";
     rename $origBDir, $buildDir if $origBDir ne $buildDir;
 

Modified: trunk/lib/MUD/Fetch/Debian.pm
===================================================================
--- trunk/lib/MUD/Fetch/Debian.pm	2007-02-22 10:10:24 UTC (rev 158)
+++ trunk/lib/MUD/Fetch/Debian.pm	2007-02-28 13:59:51 UTC (rev 159)
@@ -59,6 +59,7 @@
 
             } else {
                 system('fakeroot', 'apt-get', '-y', 'install', $dep);
+		next unless $?;
     	        my $dpkg = `dpkg -s $dep 2>/dev/null`;
                 print $dpkg;
                 if ($dpkg !~ /Status: install ok installed/) {