[25525] branches/dp2mp-move/base/src/port/port.tcl
source_changes at macosforge.org
source_changes at macosforge.org
Wed May 23 22:30:21 PDT 2007
Revision: 25525
http://trac.macosforge.org/projects/macports/changeset/25525
Author: jmpp at macports.org
Date: 2007-05-23 22:30:21 -0700 (Wed, 23 May 2007)
Log Message:
-----------
Merging boeyms' r25310: Improve version comparison through nested rpm-vercomp calls.
Modified Paths:
--------------
branches/dp2mp-move/base/src/port/port.tcl
Modified: branches/dp2mp-move/base/src/port/port.tcl
===================================================================
--- branches/dp2mp-move/base/src/port/port.tcl 2007-05-24 05:24:08 UTC (rev 25524)
+++ branches/dp2mp-move/base/src/port/port.tcl 2007-05-24 05:30:21 UTC (rev 25525)
@@ -600,10 +600,13 @@
set latest_epoch $portinfo(epoch)
}
- # Compare versions, first checking epoch, then the compound version string
+ # Compare versions, first checking epoch, then version, then revision
set comp_result [expr $installed_epoch - $latest_epoch]
if { $comp_result == 0 } {
- set comp_result [rpm-vercomp $installed_compound $latest_compound]
+ set comp_result [rpm-vercomp $installed_version $latest_version]
+ if { $comp_result == 0 } {
+ set comp_result [rpm-vercomp $installed_revision $latest_revision]
+ }
}
# Add outdated ports to our results list
@@ -1629,10 +1632,13 @@
set latest_epoch $portinfo(epoch)
}
- # Compare versions, first checking epoch, then the compound version string
+ # Compare versions, first checking epoch, then version, then revision
set comp_result [expr $installed_epoch - $latest_epoch]
if { $comp_result == 0 } {
- set comp_result [rpm-vercomp $installed_compound $latest_compound]
+ set comp_result [rpm-vercomp $installed_version $latest_version]
+ if { $comp_result == 0 } {
+ set comp_result [rpm-vercomp $installed_revision $latest_revision]
+ }
}
# Report outdated (or, for verbose, predated) versions
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070523/2f9f5c76/attachment.html
More information about the macports-changes
mailing list