2005-03-29 Jeremy Katz <katzj@redhat.com>

	* product.py (bugUrl): Clean up .buildstamp reading, read in bug url

	* constants.py (bugzillaUrl): Make bug url a per-product characteristic.

	* scripts/buildinstall: Allow passing in bug url on the command
	line.
	* scripts/mk-images: Likewise, and use it to populate .buildstamp.

1 files changed, 13 insertions, 10 deletions

diff --git a/product.py b/product.py
index 0a00aba1c..f82c01ca3 100644
--- a/product.py
+++ b/product.py
@@ -19,20 +19,23 @@ elif os.access("/.buildstamp", os.R_OK):
 else:
     path = None
     
-if path is None:
-    productName = "anaconda"
-    productVersion = "bluesky"
-    productPath = "Fedora"
-else:
+
+productName = "anaconda"
+productVersion = "bluesky"
+productPath = "anaconda"
+bugUrl = "your distribution provider's bug reporting tool."    
+
+if path is not None:
     f = open(path, "r")
     lines = f.readlines()
-    if len(lines) < 4:
-        productName = "anaconda"
-        productVersion = "bluesky"
-	productPath = "Fedora"
-    else:
+    if len(lines) >= 3:
         productName = lines[1][:-1]
         productVersion = lines[2][:-1]
+    if len(lines) >= 4:
 	productPath = lines[3][:-1]
+    if len(lines) >= 5:
+        bugUrl = lines[4][:-1]
+
+