Merge pull request #1297 from habitat-sh/trim-version

Fix bug with inclusion of whitespace in VERSION constant
habitat-sh · Sep 28, 2016 · 799748c · 799748c
2 parents f0fc1bc + 970edd0
commit 799748c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/components/build.rs b/components/build.rs
@@ -10,7 +10,7 @@ fn main() {
         _ => read_version(),
     };
     let mut f = File::create(Path::new(&env::var("OUT_DIR").unwrap()).join("VERSION")).unwrap();
-    f.write_all(version.as_bytes()).unwrap();
+    f.write_all(version.trim().as_bytes()).unwrap();
 }
 
 fn read_version() -> String {

diff --git a/components/builder-admin/build.rs b/components/builder-admin/build.rs
@@ -38,5 +38,5 @@ fn write_version_file() {
         _ => read_version(),
     };
     let mut f = File::create(Path::new(&env::var("OUT_DIR").unwrap()).join("VERSION")).unwrap();
-    f.write_all(version.as_bytes()).unwrap();
+    f.write_all(version.trim().as_bytes()).unwrap();
 }
diff --git a/components/builder-api/build.rs b/components/builder-api/build.rs
@@ -38,5 +38,5 @@ fn write_version_file() {
         _ => read_version(),
     };
     let mut f = File::create(Path::new(&env::var("OUT_DIR").unwrap()).join("VERSION")).unwrap();
-    f.write_all(version.as_bytes()).unwrap();
+    f.write_all(version.trim().as_bytes()).unwrap();
 }
diff --git a/components/builder-depot/build.rs b/components/builder-depot/build.rs
@@ -38,5 +38,5 @@ fn write_version_file() {
         _ => read_version(),
     };
     let mut f = File::create(Path::new(&env::var("OUT_DIR").unwrap()).join("VERSION")).unwrap();
-    f.write_all(version.as_bytes()).unwrap();
+    f.write_all(version.trim().as_bytes()).unwrap();
 }