Updates from db_utils-v2.7.0

ARM-DOE · May 17, 2023 · 7cf4d74 · 7cf4d74
1 parent 2436d30
commit 7cf4d74
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/packages/db_utils/bin/db_load_dod.pl b/packages/db_utils/bin/db_load_dod.pl
@@ -218,6 +218,9 @@ ()
 
     foreach $prop (@{$gVarProps}) {
 
+        # I have no idea where this is coming from
+        next if ($prop->{'var_name'} eq 'ui_state');
+
         $retval = $gDB->sp_call('dodvar_property_values', 'define',
             $prop->{'dsc_name'},
             $prop->{'dsc_level'},

diff --git a/packages/db_utils/bin/db_update.pl b/packages/db_utils/bin/db_update.pl
@@ -148,7 +148,7 @@ ($$)
             # Not a DBCORE Database Object Group update.
 
             print_error(__LINE__,
-                "Please install the latest release of 'dbcore-dbog_dbcore'.\n");
+                "Please install the latest release of 'dsdb-dbog_dbcore'.\n");
             return(undef);
         }
     }
@@ -1367,7 +1367,7 @@ ($$$$$)
 
 print_debug("Connecting To Database\n");
 
-$gConnArgs{'Component'}   = 'dbcore';
+$gConnArgs{'Component'}   = 'dsdb';
 $gConnArgs{'ObjectGroup'} = 'dbcore';
 
 $gDB = DBCORE->new();
@@ -1378,7 +1378,7 @@ ($$$$$)
 
 # Make sure the required dbcore object group is up-to-date
 
-unless (db_update('dbcore', 'dbcore', 'dbcore', 0, 0)) {
+unless (db_update('dsdb', 'dbcore', 'dbcore', 0, 0)) {
     exit(1);
 }
 

diff --git a/packages/db_utils/get_version.sh b/packages/db_utils/get_version.sh
@@ -9,5 +9,5 @@ if [ "$kernel" == "Linux" ]; then
     fi
 fi
 
-printf "db_utils-v2.5-0.$rel"
+printf "db_utils-v2.7-0.$rel"
 exit 0
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,5 +9,5 @@ if [ "$kernel" == "Linux" ]; then @@
         fi
     fi
-    printf "db_utils-v2.5-0.$rel"
+    printf "db_utils-v2.7-0.$rel"
     exit 0