Ignore:
Timestamp:
Aug 16, 2010, 6:31:48 PM (7 years ago)
Author:
and.damore@…
Message:

Added actual diff output

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/gsoc10-configfiles/base/src/registry2.0/portimage.tcl

    r70666 r70668  
    843843    variable config_upgrade_completed
    844844
     845    set newimagedir [$requested location]
     846    set oldimagedir [$active location]
    845847    set actions_list [list]
    846848    foreach file $changed_files {
    847         ui_debug "File $file has changed"
     849        ui_msg "$UI_PREFIX [format [msgcat::mc "File %s has changed"] $file]"
    848850        set choice ""
    849851        while {[lsearch "keep new" $choice] < 0} {
    850852            if {$choice eq "current"} {
    851                 #catch {exec /usr/bin/diff -u [] []} a
    852                 #set result [string range $a 0 [expr [string length $a]-33]]
    853                 #ui_msg "$result"
     853                catch {exec /usr/bin/diff -u $oldimagedir$file $file} a
     854                set result [string range $a 0 [expr [string length $a]-33]]
     855                ui_msg "\n$result\n"
    854856            } elseif {$choice eq "upgraded"} {
    855                 #catch {exec /usr/bin/diff -u [] []} a
    856                 #set result [string range $a 0 [expr [string length $a]-33]]
    857                 #ui_msg "$result"               
     857                catch {exec /usr/bin/diff -u $file $newimagedir$file} a
     858                set result [string range $a 0 [expr [string length $a]-33]]
     859                ui_msg "\n$result\n"               
    858860            }
    859861            ui_msg "$UI_PREFIX [format [msgcat::mc "Please choose one of (keep) current, install (new), show diff original-(current), show diff current-(upgraded):"] ]"
Note: See TracChangeset for help on using the changeset viewer.