From 759e855566a08d965059ca08d4f4510d335f1c7d Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 1 Jul 2011 21:47:30 +0100
Subject: refactor: rename gitCommitFileName to manualVersionFileName since
bin/.version doesn't necessary have to be a git hash
---
OpenSim/Framework/Servers/BaseOpenSimServer.cs | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index 21e1e09..98a92dd 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -460,21 +460,20 @@ namespace OpenSim.Framework.Servers
// elsewhere as well
string svnRevisionFileName = "svn_revision";
string svnFileName = ".svn/entries";
- string gitCommitFileName = ".version";
+ string manualVersionFileName = ".version";
string inputLine;
int strcmp;
- if (File.Exists(gitCommitFileName))
+ if (File.Exists(manualVersionFileName))
{
- StreamReader CommitFile = File.OpenText(gitCommitFileName);
+ StreamReader CommitFile = File.OpenText(manualVersionFileName);
buildVersion = CommitFile.ReadLine();
CommitFile.Close();
m_version += buildVersion ?? "";
}
-
- // Remove the else logic when subversion mirror is no longer used
else
{
+ // Remove the else logic when subversion mirror is no longer used
if (File.Exists(svnRevisionFileName))
{
StreamReader RevisionFile = File.OpenText(svnRevisionFileName);
--
cgit v1.1