Don't use FD, but F for the votes

diff --git a/914897_merged_usr/914897_results.txt b/914897_merged_usr/914897_results.txt
index 9756062f2f61e7e2da68cceaf0de806e93faa488..7e326d3434a6f6cba6b5bcc372b9a54c756a73f9 100644 (file)
--- a/914897_merged_usr/914897_results.txt
+++ b/914897_merged_usr/914897_results.txt
@@ -1,30 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-Starting results calculation at Mon Mar  4 15:31:12 2019
-
-/--WMHFD
-V: 321- odyx
-V: 213- bremner
-V: 521- gwolf
-V: 312- ntyni
-V: 213- marga
-V: 521- fil
+Starting results calculation at Mon Mar  4 15:34:31 2019
+
+/--WMHF
+V: 3214 odyx
+V: 2134 bremner
+V: 4213 gwolf
+V: 3124 ntyni
+V: 2134 marga
+V: 4213 fil
 Option W "`weak`: both directory schemes are allowed, but packages should only be built on hosts with classical directory schemes (or in such chroots)"
 Option M "`middle`: both directory schemes are allowed, and packages (including official packages) can be built on hosts with either classical or "merged `/usr`" directory schemes"
 Option H "`hard`: both directory schemes are allowed, but packages should only be built on hosts with "merged `/usr`" directory schemes (or in such chroots)"
-Option FD "Further Discussion"
+Option F "Further Discussion"
 
 In the following table, tally[row x][col y] represents the votes that
 option x received over option y.
 
                   Option
-              W     M     H    FD 
+              W     M     H     F 
             ===   ===   ===   === 
-Option W            0     2     6 
+Option W            0     2     4 
 Option M      6           3     6 
 Option H      4     3           6 
-Option FD      0     0     0       
+Option F      2     0     0       
 
 
 
@@ -34,18 +34,19 @@ received 6 votes over W
 Looking at row 1, column 2, W
 received 0 votes over M.
 
-Option W Reached quorum: 6 >= 2
+Option W Reached quorum: 4 >= 2
 Option M Reached quorum: 6 >= 2
 Option H Reached quorum: 6 >= 2
 
 
+Option W passes Majority.               2.000 (4/2) > 1
 
 
   Option M defeats Option W by (   6 -    0) =    6 votes.
   Option H defeats Option W by (   4 -    2) =    2 votes.
-  Option W defeats Option FD by (   6 -    0) =    6 votes.
-  Option M defeats Option FD by (   6 -    0) =    6 votes.
-  Option H defeats Option FD by (   6 -    0) =    6 votes.
+  Option W defeats Option F by (   4 -    2) =    2 votes.
+  Option M defeats Option F by (   6 -    0) =    6 votes.
+  Option H defeats Option F by (   6 -    0) =    6 votes.
 
 
 The Schwartz Set contains:
@@ -66,15 +67,15 @@ The winners are:
 
 -----BEGIN PGP SIGNATURE-----
 
-iQGzBAEBCgAdFiEEe+WPIRpjNw1/GSB7i8+nHsoWNFUFAlx9RMAACgkQi8+nHsoW
-NFW+VAv/befByw+qrEMhlWCrXb3QG2yUf4q0a36jtYWGVUo7lyyUgUbnt8Bcyc4n
-E2SRh5w5Kwz1Su39e2KBkPaahYBkbV4eCbsteL+bdzZ66N4GMfOETYPRqKXuwgv8
-bRxqHCUkOzAMPnMBHSuPpcFXbu/0Nsaex5BXPVH9473qMcuAorPxF2ahp3bWVQOM
-TAzBkBn4/OTh3ohyQOqmDPvhuktsSZHTNAiFcAvsBScX2eQonvNme54b5hnU6swj
-FoP0roiJkUtLBZsnZeD1tPtoDT+AmSTFQGhNMTTo66CVqx4qCda0Ygc9vM4xOHhr
-cqyp5wEX6VQq/pf+LiqcepSvsbEI/yMqbM5Fm50+mcnOGZkMUJB6rPJzmqyaBG03
-pfg6SUMYLatB2wyVdyS6lDauz8xLVIpRgTKoFWANYvU9/NRqmCKsqeH+sscjRdrj
-ZKnvUew1HtxK0IRNW4LY7MvDX8waiXBYiWuWiw+c4rYczNIVa/JbSUPreCd/+g6q
-eIGd1uwZ
-=wogk
+iQGzBAEBCgAdFiEEe+WPIRpjNw1/GSB7i8+nHsoWNFUFAlx9RYcACgkQi8+nHsoW
+NFWnOgwAlknUE8VEOLN4zty6JfAAMBbyJvBBBmJbVu4m/xgRkZV2DRcOZpjoNMiK
+GqIjl28g15Wdv0etUxkdo0qg7IQCd8nT2VSfUPhi9fiN/BVWLSzIpdePXg//3t7m
+g+ETHYHPVsPr87ImATNw3vP7Su5iZsvUyl3bCEcLDnnForvCJ4uxNLq/MDrW2cRR
+rqAKxwcvDLRwFm5oqM4zl2vtbsgOldMR2OfUEkx2HI3wEv3Nvzyz0lJTxOJdcbLp
+mVryWrMDeXHjaJVioCEFm1g4qPx63jb95Fj/C8qcH3VHezrI6jx5ZRkF2pHZ2a1C
+pYa99+29Bn+qfh5FKL6VULUn7hhN8b37DSoi7SOHzispqz6x2g5ouN118JhxZ55M
+Zz7fw2UtYoZP+puxcOW7cb9ZYHEcmZObrx+y/6G2cKR8q5b4ZWNzh4IwNJChormP
+nyczRC+pg1Qu5IhDEj6RJQhlRUZjJjJlNojaXxRcd9/SYGs1kjChw6muMyTyqtOT
+ed5P11DC
+=u0bf
 -----END PGP SIGNATURE-----

diff --git a/914897_merged_usr/run_vote.sh b/914897_merged_usr/run_vote.sh
index 4b7580a59b7c10ab2cdeddf3c35e4b98b6dd7f4d..e7d84f2611b883b2ca07aa6f126050adc66501e2 100755 (executable)
--- a/914897_merged_usr/run_vote.sh
+++ b/914897_merged_usr/run_vote.sh
@@ -2,11 +2,11 @@
         --option 'W: `weak`: both directory schemes are allowed, but packages should only be built on hosts with classical directory schemes (or in such chroots)' \
         --option 'M: `middle`: both directory schemes are allowed, and packages (including official packages) can be built on hosts with either classical or "merged `/usr`" directory schemes' \
         --option 'H: `hard`: both directory schemes are allowed, but packages should only be built on hosts with "merged `/usr`" directory schemes (or in such chroots)' \
-        --option 'FD: Further Discussion' <<EOF
-odyx: H > M > W > FD
-bremner: M > W > H > FD
-gwolf: H > M > FD > W
-ntyni: M > H > W > FD
-marga: M > W > H > FD
-fil: H > M > FD > W
+        --option 'F: Further Discussion' <<EOF
+odyx: H > M > W > F
+bremner: M > W > H > F
+gwolf: H > M > F > W
+ntyni: M > H > W > F
+marga: M > W > H > F
+fil: H > M > F > W
 EOF