[Mud-builder-commits] r261 - trunk/lib/MUD

[jaffa at garage.maemo.org]

Author: jaffa
Date: 2009-01-19 22:57:31 +0200 (Mon, 19 Jan 2009)
New Revision: 261

Modified:
   trunk/lib/MUD/Package.pm
Log:
Fix icon refactoring bug, and use new setField() semantics from Graham Cobb

Modified: trunk/lib/MUD/Package.pm
===================================================================
--- trunk/lib/MUD/Package.pm	2009-01-19 16:59:38 UTC (rev 260)
+++ trunk/lib/MUD/Package.pm	2009-01-19 20:57:31 UTC (rev 261)
@@ -178,7 +178,7 @@
   my $iconFile = $self->{data}->{deb}->{icon};
   if (! -f $iconFile) {
     foreach my $suffix (('-26.png', '-32.png', '-40.png', '-48.png', '-64.png', '')) {
-      $iconFile = $self->{config}->directory('PACKAGES_DIR').'/icon/'.$self->{package}.$suffix;
+      $iconFile = $self->{config}->directory('PACKAGES_DIR').'/icon/'.$self->{name}.$suffix;
       last if -f $iconFile;
     }
   }
@@ -406,7 +406,7 @@
   my $paragraph = $field eq 'Uploaders' ? 'Source' : 'Package';
   
   if ($data =~ /^$field:/im) {
-    $data =~ s/(\n?\s?)$field:([ \t]+[^\n]+\n)*/$1$wrapped\n/ig;
+    $data =~ s/^$field:\s.*$(^[ \t]+\S.*$)*/$1$wrapped/img;
   } else {
     $data =~ s/^$paragraph: .*$/$&\n$wrapped/mg;
   }