[25868] users/jberry/mpwa/app/models

source_changes at macosforge.org source_changes at macosforge.org
Sun Jun 3 22:44:13 PDT 2007


Revision: 25868
          http://trac.macosforge.org/projects/macports/changeset/25868
Author:   jberry at macports.org
Date:     2007-06-03 22:44:12 -0700 (Sun, 03 Jun 2007)

Log Message:
-----------
mpwa: try to fix random startup sequence problems on production server

Modified Paths:
--------------
    users/jberry/mpwa/app/models/port.rb
    users/jberry/mpwa/app/models/port_pkg.rb

Modified: users/jberry/mpwa/app/models/port.rb
===================================================================
--- users/jberry/mpwa/app/models/port.rb	2007-06-04 05:12:12 UTC (rev 25867)
+++ users/jberry/mpwa/app/models/port.rb	2007-06-04 05:44:12 UTC (rev 25868)
@@ -37,12 +37,9 @@
       "name like '%#{sanitize_sql(q)}%'"
     end
     
-    def has_tag(name)
-        !self.tags.select { |t| t.name == name }.empty?
-    end
-
     def add_tag(name)
-        self.tags << Tag.find_or_create_by_name(name) unless has_tag name
+      tag = Tag.find_or_create_by_name(name)
+      self.tags << tag unless self.tags.include?(tag)
     end
     
     def remove_tag(name)

Modified: users/jberry/mpwa/app/models/port_pkg.rb
===================================================================
--- users/jberry/mpwa/app/models/port_pkg.rb	2007-06-04 05:12:12 UTC (rev 25867)
+++ users/jberry/mpwa/app/models/port_pkg.rb	2007-06-04 05:44:12 UTC (rev 25868)
@@ -3,11 +3,12 @@
 require 'rexml/document'
 
 require 'mpwa-conf'
-require 'port'
 require 'file_ref'
 require 'file_info'
 require 'person'
+require 'port'
 require 'variant'
+require 'tag'
 
 PortPkgMeta = Struct.new("PortPkgMeta",
     :submitter_email, :submitter_name, :submitter_notes,
@@ -163,12 +164,9 @@
         return refs
     end
     
-    def has_tag(name)
-        !self.tags.select { |t| t.name == name }.empty?
-    end
-
     def add_tag(name)
-        self.tags << Tag.find_or_create_by_name(name) unless has_tag name
+        tag = Tag.find_or_create_by_name(name)
+        self.tags << tag unless self.tags.include?(tag)
     end
     
     def remove_tag(name)

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070603/4d6bb3a9/attachment.html


More information about the macports-changes mailing list