Author: pebender
Date: Mon Jan 5 10:42:20 2009
New Revision: 4171
Modified:
trunk/gar-minimyth/html/minimyth/document-changelog.txt
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/functions
trunk/gar-minimyth/script/perl/perl-MiniMyth/checksums
trunk/gar-minimyth/script/perl/perl-MiniMyth/files/MiniMyth.pm
Log:
- Improved handling of 'dist:' URLs when using local boot.
Modified: trunk/gar-minimyth/html/minimyth/document-changelog.txt
==============================================================================
--- trunk/gar-minimyth/html/minimyth/document-changelog.txt (original)
+++ trunk/gar-minimyth/html/minimyth/document-changelog.txt Mon Jan 5
10:42:20 2009
@@ -1,7 +1,7 @@
MiniMyth Changelog
--------------------------------------------------------------------------------
-Changes since 62 (2009-01-04):
+Changes since 62 (2009-01-05):
Current MythTV versions
MythTV 0.20-softpad: version 0.20.2.softpad, release-0-20-fixes branch
svn 16082,
@@ -18,6 +18,7 @@
- Cleaned up 'error:' and 'warning:' prefixes in error messages for
perl
init scripts.
- Improved messages logged when fetching files using perl init scripts.
+ - Improved handling of 'dist:' URLs when using local boot.
Modified MiniMyth configuration
- Obsoleted MM_WIIMOTE_ENABLED.
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/functions
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/functions
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/functions
Mon Jan 5 10:42:20 2009
@@ -188,7 +188,11 @@
REMOTE_FILE_0=`/bin/echo ${MM_ROOTFS_IMAGE} | /bin/sed
-e 's%//*%/%g' | /bin/sed -e 's%[^/]*$%%' | /bin/sed -e 's%/$%%'`
REMOTE_FILE_0="${REMOTE_FILE_0}/${REMOTE_FILE}"
else
- REMOTE_FILE_0="/minimyth-${MM_VERSION}/${REMOTE_FILE}"
+ if /usr/bin/test "${MM_MINIMYTH_BOOT_URL}" = 'file:/minimyth/' ;
then
+ REMOTE_FILE_0="/${REMOTE_FILE}"
+ else
+ REMOTE_FILE_0="/minimyth-${MM_VERSION}/${REMOTE_FILE}"
+ fi
fi
/bin/rm -f "${LOCAL_FILE}"
Modified: trunk/gar-minimyth/script/perl/perl-MiniMyth/checksums
==============================================================================
--- trunk/gar-minimyth/script/perl/perl-MiniMyth/checksums (original)
+++ trunk/gar-minimyth/script/perl/perl-MiniMyth/checksums Mon Jan 5
10:42:20 2009
@@ -1 +1 @@
-025863b73ccaa870e0a6d0446037190f download/MiniMyth.pm
+5a51e41f8a387780cab8c0b2c8d7f740 download/MiniMyth.pm
Modified: trunk/gar-minimyth/script/perl/perl-MiniMyth/files/MiniMyth.pm
==============================================================================
--- trunk/gar-minimyth/script/perl/perl-MiniMyth/files/MiniMyth.pm
(original)
+++ trunk/gar-minimyth/script/perl/perl-MiniMyth/files/MiniMyth.pm Mon Jan
5 10:42:20 2009
@@ -1128,8 +1128,17 @@
}
else
{
- my $file_0 = '/minimyth-' .
$self->var_get('MM_VERSION') . '/' . $file;
- push(@list, $self->var_get('MM_MINIMYTH_BOOT_URL') .
$file_0);
+ if ($self->var_get('MM_MINIMYTH_BOOT_URL')
eq 'file:/minimyth/')
+ {
+ my $file_0 = $file;
+ push(@list, $self->var_get('MM_MINIMYTH_BOOT_URL') .
$file_0);
+ }
+ else
+ {
+ my $file_0 = 'minimyth-' .
$self->var_get('MM_VERSION') . '/' . $file;
+ push(@list, $self->var_get('MM_MINIMYTH_BOOT_URL') .
$file_0);
+ }
+ $self->message_log('info', qq(expanding '$url':
guessed '$list[$#list]' because distribution location is unknown.));
}
}
when (/^file$/ )
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"minimyth-commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/minimyth-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
