[Monotone-commits-diffs] net.venge.monotone.visualc: 19b63fdd368d5db44615adfdb13b454edd327443

[code]

revision:            19b63fdd368d5db44615adfdb13b454edd327443
date:                2010-12-21T03:37:31
author:              Timothy Brownawell  <address@hidden>
branch:              net.venge.monotone.visualc
changelog:
Fix Botan version check to still complain if run against 1.9.x
when built against an earlier version.

manifest:
format_version "1"

new_manifest [d91b4be522610ece4b64ce0de1eacb91fe10f370]

old_revision [b7d40492fa5aebe55c6df43a3aea16923a91867b]

patch "monotone.cc"
 from [923cf3d2ed93ccc522bd841dd54f96d6915b42a8]
   to [971350d4749ede8945b6cd6d5f47b09d097fe759]
============================================================
--- monotone.cc	923cf3d2ed93ccc522bd841dd54f96d6915b42a8
+++ monotone.cc	971350d4749ede8945b6cd6d5f47b09d097fe759
@@ -170,11 +170,14 @@ cpp_main(int argc, char ** argv)
       // versions, including all of the stable branch 1.8.x.
       E(linked_botan_version < BOTAN_VERSION_CODE_FOR(1,9,0), origin::system,
         F("This monotone binary does not work with Botan 1.9.x."));
-#else
+#elif BOTAN_VERSION_CODE < BOTAN_VERSION_CODE_FOR(1,9,0)
       E(linked_botan_version > BOTAN_VERSION_CODE_FOR(1,7,22), origin::system,
         F("This monotone binary requires Botan 1.7.22 or newer."));
-      //E(linked_botan_version < BOTAN_VERSION_CODE_FOR(1,9,0), origin::system,
-      //  F("This monotone binary does not work with Botan 1.9.x."));
+      E(linked_botan_version < BOTAN_VERSION_CODE_FOR(1,9,0), origin::system,
+        F("This monotone binary does not work with Botan 1.9.x."));
+#else
+      E(linked_botan_version >= BOTAN_VERSION_CODE_FOR(1,9,0), origin::system,
+        F("This monotone binaryrequires Botan 1.9.x."));
 #endif
 
       app_state app;