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

[source_changes at macosforge.org]

Revision: 25892
          http://trac.macosforge.org/projects/macports/changeset/25892
Author:   jberry at macports.org
Date:     2007-06-04 19:19:57 -0700 (Mon, 04 Jun 2007)

Log Message:
-----------
mpwa: try extra saves to get around rails' duplicate records with HABTM associations

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 21:50:47 UTC (rev 25891)
+++ users/jberry/mpwa/app/models/port.rb	2007-06-05 02:19:57 UTC (rev 25892)
@@ -20,6 +20,9 @@
             port.long_desc = meta.long_desc
             port.home_page = meta.home_page
             
+            # Save before we tag
+            port.save
+            
             meta.maintainers.each do |maintainer|
                 person = Person.ensure_person_with_email(maintainer)
                 port.maintainers << person

Modified: users/jberry/mpwa/app/models/port_pkg.rb
===================================================================
--- users/jberry/mpwa/app/models/port_pkg.rb	2007-06-04 21:50:47 UTC (rev 25891)
+++ users/jberry/mpwa/app/models/port_pkg.rb	2007-06-05 02:19:57 UTC (rev 25892)
@@ -120,6 +120,9 @@
         # Map to, and/or create, a port
         self.port = Port.ensure_port(meta.name, meta)
         
+        # Save before we add variants and tags
+        self.save        
+        
         # Add the variants
         meta.variants.each do |v|
           self.variants << Variant.new(:name => v.name, :description => v.description)
@@ -139,7 +142,7 @@
             self.file_refs << FileRef.create_from_path(p, tempDirPath) if p.file?
         end
         
-        # Save the pkg (maybe we shouldn't?)
+        # Final save
         self.save
         
         # Cleanup the temp directory

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