Continue migration of user emails to IDs

salt/common/tools/sbin/so-user

@@ -159,22 +159,22 @@ function createFile() {
 
 function ensureRoleFileExists() {
   if [ ! -s "$socRolesFile" ]; then
+    if [[ -f "$databasePath" ]]; then
       echo "Migrating roles to new file: $socRolesFile"
 
+      # Generate the new users file
       rolesTmpFile="${socRolesFile}.tmp"
       createFile "$rolesTmpFile" "$soUID" "$soGID"
 
-    if [[ -f "$databasePath" ]]; then
-      # Generate the new users file
       echo "select 'superuser:' || id from identities;" | sqlite3 "$databasePath" \
         >> "$rolesTmpFile"
       [[ $? != 0 ]] && fail "Unable to read identities from database"
-    else
-      echo "Database file does not exist yet, installation is likely not yet complete."
-      exit 1
-    fi
 
       mv "${rolesTmpFile}" "${socRolesFile}"
+    else
+      echo "Database file does not exist yet, installation is likely not yet complete."
+      exit 0
+    fi
   fi
 }