]> xenbits.xensource.com Git - people/iwj/osstest.git/commitdiff
ms-planner: apply showsharetype to unshares
authorIan Jackson <iwj@woking.cam.xci-test.com>
Fri, 8 Mar 2013 15:04:48 +0000 (15:04 +0000)
committerIan Jackson <iwj@woking.cam.xci-test.com>
Fri, 8 Mar 2013 15:04:48 +0000 (15:04 +0000)
ms-planner

index 1916db053f118948a18307034cb7cdeb5ceb353f..05ec65fec63bf320f6eabea540cfe199acce7e9a 100755 (executable)
@@ -196,7 +196,7 @@ sub launder_check_plan () {
                        Time => $evt->{Time},
                        Type => Unshare,
                        Avail => 1,
-                       Info => "$cshare->{Type}",
+                       Info => $cshare->{Type},
                    };
                    $cshare= undef;
                }
@@ -570,7 +570,8 @@ sub cmd_show_html () {
            my $type= $evt->{Type};
            my $show=
                $type eq End ? ($evt->{Share} ? "End $evt->{Info}" : "") :
-               ($type eq Overrun || $type eq Unshare || $type eq After)
+                $type eq Unshare ? "$type [".showsharetype($evt->{Info})."]" :
+               ($type eq Overrun || $type eq After)
                ? ("$type $evt->{Info}") :
                (!$evt->{Allocated} ? Booking :
                  ($evt->{Allocated}{Live} ? Allocation : Completed).