[mythtv] Re: [mythtv-commits] Re: Ticket #832: SVN: 8306 - Channel icon import fails with ampersands in iconmap.xml

[Bruce Markey]

MythTV wrote:
> #832: SVN: 8306 - Channel icon import fails with ampersands in iconmap.xml
> -----------------------------------+----------------------------------------
>  Reporter:  steve.adeff at gmail.com  |        Owner:  ijr 
>      Type:  defect                 |       Status:  new 
>  Priority:  minor                  |    Milestone:      
> Component:  mythtv                 |      Version:  head
>  Severity:  low                    |   Resolution:      
> -----------------------------------+----------------------------------------
> Comment (by adeffs at gmail.com):
> 
>  my first patch, so don't ream me =)

That works but "diff -u" is much better, especially for larger
patches and SVN diff from the top directory of the source is best.

: bjm at moktoo ; svn di contrib/mkiconmap.pl
Index: contrib/mkiconmap.pl
===================================================================
--- contrib/mkiconmap.pl        (revision 8359)
+++ contrib/mkiconmap.pl        (working copy)
@@ -178,6 +178,9 @@

 sub stubbed_url {
        my ($full_url) = @_;
+       if ($full_url =~ m/&/) {
+               $full_url =~ s/&/&amp\;/g;
+       }
        my ($url, $icon_file) = split_url_from_file($full_url);
        if (exists $master_urls{$url}) {
                return "[" . $master_urls{$url} . "]/$icon_file";

--  bjm