Changeset 80799

Timestamp:

07/17/11 11:33:07 (4 years ago)

Author:

jmr@…

Message:

merge r80779 from trunk:

fix setting livecheck.name from sourceforge master_sites using the new layout

Location:

branches/release_2_0

Files:

• . (modified) (1 prop)
• base (modified) (1 prop)
• base/portmgr/fedora/macports.spec (modified) (1 prop)
• base/src/pextlib1.0/sha2.c (modified) (1 prop)
• base/src/pextlib1.0/sha2.h (modified) (1 prop)
• base/src/pextlib1.0/sha256cmd.c (modified) (1 prop)
• base/src/pextlib1.0/sha256cmd.h (modified) (1 prop)
• base/src/port1.0/portlivecheck.tcl (modified) (1 diff)
• base/src/registry2.0/receipt_sqlite.tcl (modified) (1 prop)

branches/release_2_0/base/src/port1.0/portlivecheck.tcl

@@ -102 +102 @@
             foreach {master_site} ${master_sites} {
                 if {[regexp "^($available_types)(?::(\[^:\]+))?" ${master_site} _ site subdir]} {
+                    set subdirs [split $subdir /]
+                    if {[llength $subdirs] > 1} {
+                        if {[lindex $subdirs 0] == "project"} {
+                            set subdir [lindex $subdirs 1]
+                        } else {
+                            set subdir ""
+                        }
+                    }
                     if {${subdir} ne "" && ${livecheck.name} eq "default"} {
                         set livecheck.name ${subdir}