prompt user when cpu string isn't auto detected

45Drives · Dec 5, 2022 · 2eb8254 · 2eb8254
1 parent 1335043
commit 2eb8254
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,3 @@
-## Serial45d 1.1.0-5
+## Serial45d 1.1.0-6
 
-* Added support for ASRockRack EPC621D8A motherboards
-* Added the ability to serialize F8X units (naming convention subject to change)
-* improved key error checking in serial45d script when accessing fru data read from board
+* updated how system version detection is handled when cpu string doesn't have desired keywords
diff --git a/manifest.json b/manifest.json
@@ -4,7 +4,7 @@
     "title": "Serial45d",
     "prerelease": false,
     "version": "1.1.0",
-    "buildVersion": "5",
+    "buildVersion": "6",
     "author": "Mark Hooper <mhooper@45drives.com>",
     "url": "https://github.com/45Drives/serial45d",
     "category": "utils",
@@ -53,7 +53,7 @@
     "changelog": {
         "urgency": "medium",
         "version": "1.1.0",
-        "buildVersion": "5",
+        "buildVersion": "6",
         "ignore": [],
         "date": null,
         "packager": "Mark Hooper <mhooper@45drives.com>",

diff --git a/packaging/el7/main.spec b/packaging/el7/main.spec
@@ -42,6 +42,9 @@ fi
 %{_bindir}/*
 
 %changelog
+* Mon Dec 05 2022 Mark Hooper <mhooper@45drives.com> 1.1.0-6
+- updated how system version detection is handled when cpu string doesn't have desired
+  keywords
 * Wed Sep 14 2022 Mark Hooper <mhooper@45drives.com> 1.1.0-5
 - Added support for ASRockRack EPC621D8A motherboards
 - Added the ability to serialize F8X units (naming convention subject to change)

diff --git a/packaging/el8/main.spec b/packaging/el8/main.spec
@@ -42,6 +42,9 @@ fi
 %{_bindir}/*
 
 %changelog
+* Mon Dec 05 2022 Mark Hooper <mhooper@45drives.com> 1.1.0-6
+- updated how system version detection is handled when cpu string doesn't have desired
+  keywords
 * Wed Sep 14 2022 Mark Hooper <mhooper@45drives.com> 1.1.0-5
 - Added support for ASRockRack EPC621D8A motherboards
 - Added the ability to serialize F8X units (naming convention subject to change)

diff --git a/packaging/focal/changelog b/packaging/focal/changelog
@@ -1,3 +1,10 @@
+serial45d (1.1.0-6focal) focal; urgency=medium
+
+  * updated how system version detection is handled when cpu string doesn't have
+    desired keywords
+
+ -- Mark Hooper <mhooper@45drives.com>  Mon, 05 Dec 2022 05:53:46 -0400
+
 serial45d (1.1.0-5focal) focal; urgency=medium
 
   * Added support for ASRockRack EPC621D8A motherboards

diff --git a/src/fakeroot/opt/45drives/serial45d/serial45d b/src/fakeroot/opt/45drives/serial45d/serial45d
@@ -579,7 +579,8 @@ def assignProductName(auto_detect_fields,fru_fields):
 		"X11SSH-CTF":"Base",
 		"X11SSM-F": "Base",
 		"X11DPL-i": "Turbo",
-		"X11DPH-T": "Turbo"
+		"X11DPH-T": "Turbo",
+		"X10DRL-i": "Turbo"
 	}
 
 	cpu_substr_to_version_lut = {
@@ -626,13 +627,6 @@ def assignProductName(auto_detect_fields,fru_fields):
 
 		if unique_product_str_tmp in g_config_file_content["Product Name"]:
 			final_product_str = unique_product_str_tmp
-		else:
-			print("Product Configuration of \"{ps}\" is INVALID. \nRun Program again or contact Mark Hooper if issue persists.".format(ps=unique_product_str_tmp))
-			print("Valid Product Configurations: ")
-			for valid_product in g_config_file_content["Product Name"]:
-				print("\t{vp}".format(vp=valid_product))
-			input("Press ENTER to End Program.")
-			exit(0)
 
 		if final_product_str != "unknown":
 			# we got valid input from user and assigned a value to final product string.