From b6a2d46c5bbdca7ca5d3e50eece732b5b839f2c5 Mon Sep 17 00:00:00 2001
From: bnewbold <bnewbold@robocracy.org>
Date: Wed, 18 Apr 2012 23:12:11 -0400
Subject: bom load versioning

---
 bommom.go | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'bommom.go')

diff --git a/bommom.go b/bommom.go
index 42e0a1c..83f2610 100644
--- a/bommom.go
+++ b/bommom.go
@@ -247,7 +247,7 @@ func loadCmd() {
 }
 
 func convertCmd() {
-	if flag.NArg() != 3 {
+	if flag.NArg() != 2 && flag.NArg() != 3 {
 		log.Fatal("Error: wrong number of arguments (expected input and output files)")
 	}
 
@@ -258,10 +258,21 @@ func convertCmd() {
 	outFname := flag.Arg(2)
 
     bs, b := loadIn(inFname)
+
+    if b == nil {
+        log.Fatal("null bom")
+    }
     if inFormat == "csv" && bs == nil {
         // TODO: from inname? if ShortName?
         bs = &BomStub{Name: "untitled", Owner: anonUser.name}
     }
+    
+    if err := bs.Validate(); err != nil {
+        log.Fatal("loaded bomstub not valid: " + err.Error())
+    }
+    if err := b.Validate(); err != nil {
+        log.Fatal("loaded bom not valid: " + err.Error())
+    }
 
     dumpOut(outFname, bs, b)
 }
-- 
cgit v1.2.3