← Back to branch summary

~ubuntu-branches/ubuntu/intrepid/ruby1.9/intrepid-updates

« back to all changes in this revision

Viewing changes to lib/rss/maker/entry.rb

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose
  • Date: 2007-09-04 16:01:17 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20070904160117-i15zckg2nhxe9fyw
Tags: 1.9.0+20070830-2ubuntu1
* Sync from Debian; remaining changes:
  - Add -g to CFLAGS.
* Fixes build failure on ia64.
* Fixes build failure with gcc-4.2 on lpia.
* Robustify check for target_os, fixing build failure on lpia.
* Set Ubuntu maintainer address.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/rss/maker/entry.rb
75
75
              end
76
76
            end
77
77
 
78
 
            def have_required_values?
79
 
              set_default_values do
80
 
                super and title.have_required_values?
81
 
              end
82
 
            end
83
 
 
84
78
            private
85
79
            def required_variable_names
86
80
              %w(id updated)
100
94
                if authors.all? {|author| !author.have_required_values?}
101
95
                  vars << "author"
102
96
                end
103
 
                vars << "title" unless title.have_required_values?
 
97
                vars << "title" unless title {|t| t.have_required_values?}
104
98
                vars
105
99
              end
106
100
            end
126
120
              self.id ||= link || @maker.channel.id
127
121
              links.replace(@maker.channel.links) if keep[:links].empty?
128
122
              unless keep[:rights].variable_is_set?
129
 
                @rights = @maker.channel.rights
130
 
              end
131
 
              @title = @maker.channel.title unless keep[:title].variable_is_set?
 
123
                @maker.channel.rights {|r| @rights = r}
 
124
              end
 
125
              unless keep[:title].variable_is_set?
 
126
                @maker.channel.title {|t| @title = t}
 
127
              end
132
128
              self.updated ||= @maker.channel.updated
133
129
              super(&block)
134
130
            ensure