From 4bedde72440835a3f66dc41dbeca0f08d16a3e38 Mon Sep 17 00:00:00 2001
From: Ken Moore <ken@ixsystems.com>
Date: Fri, 2 Dec 2016 10:27:02 -0500
Subject: [PATCH] Adjust the check for valid pkg repos to better catch when the
 databases are out of sync and update as needed.

---
 src/server/library/sysadm-pkg.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/server/library/sysadm-pkg.cpp b/src/server/library/sysadm-pkg.cpp
index 21cca54..c740034 100644
--- a/src/server/library/sysadm-pkg.cpp
+++ b/src/server/library/sysadm-pkg.cpp
@@ -331,11 +331,7 @@ QJsonArray PKG::list_categories(QString repo){
 QJsonArray PKG::list_repos(bool updated){
   QString dbdir = "/var/db/pkg/repo-%1.sqlite";
   QDir confdir("/usr/local/etc/pkg/repos");
-    QStringList confs = confdir.entryList(QStringList() << "*.conf", QDir::Files);
-  if(confs.isEmpty() && !updated){
-    QProcess::execute("pkg update"); //need to update pkg configs
-    return list_repos(true); //try again recursively (will not try to update again)
-  }
+  QStringList confs = confdir.entryList(QStringList() << "*.conf", QDir::Files);
   QStringList found;
   found << "local"; //There is always a local database (for installed pkgs)
   for(int i=0; i<confs.length(); i++){
@@ -345,6 +341,11 @@ QJsonArray PKG::list_repos(bool updated){
       if(QFile::exists(dbdir.arg(repo)) && repoinfo[j].section("enabled:",1,-1).section(":",0,0).contains("true")){ found << repo; }
     }
   }
+  if(found.length()<2 && !updated){
+    //Only the local repo could be found - update the package repos and try again
+    QProcess::execute("pkg update");
+    return list_repos(true); //try again recursively (will not try to update again)
+  }
   return QJsonArray::fromStringList(found);
 }