- BugFix: 'yaourt' and 'pacaur' no longer honor "-a" option when

aarnt · aarnt · commit 9a1d042fb850 · 2017-05-01T18:44:10.000-03:00
querying outdated foreign packages;
- Refactored getForeignRepositoryToolName method.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,4 +1,4 @@
-0.9.0
+0.9.0 (dev)
   Added an options dialog to Octopi and Notifier.
   Added slovenian translation (thanks to the translation crew).
   Added "Install Reason" field at Info tab.
@@ -19,6 +19,8 @@
 	was reporting false newer packages.
   BugFix: System upgrade button was not disabled while synching packages in notifier.
   BugFix: searchlineedit font fix.
+  BugFix: 'yaourt' and 'pacaur' no longer honor "-a" option when querying outdated 
+	foreign packages.
 
 0.8.1
   BugFix: Updated CHAKRA RSS site (thanks to s8321414).
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -54,7 +54,7 @@ MainWindow::MainWindow(QWidget *parent) :
   QMainWindow(parent), ui(new Ui::MainWindow), m_packageModel(new PackageModel(m_packageRepo))
 {
   m_hasAURTool =
-      UnixCommand::hasTheExecutable(StrConstants::getForeignRepositoryToolName()) && !UnixCommand::isRootRunning();
+      UnixCommand::hasTheExecutable(Package::getForeignRepositoryToolName()) && !UnixCommand::isRootRunning();
 
   m_packageRepo.registerDependency(*m_packageModel);
   m_foundFilesInPkgFileList = new QList<QModelIndex>();
diff --git a/src/mainwindow_refresh.cpp b/src/mainwindow_refresh.cpp
@@ -1074,7 +1074,7 @@ void MainWindow::showToolButtonAUR()
 void MainWindow::refreshToolBar()
 {
   m_hasAURTool =
-      UnixCommand::hasTheExecutable(StrConstants::getForeignRepositoryToolName()) && !UnixCommand::isRootRunning();
+      UnixCommand::hasTheExecutable(Package::getForeignRepositoryToolName()) && !UnixCommand::isRootRunning();
 
   if (m_hasAURTool)
   {
@@ -1266,7 +1266,7 @@ void MainWindow::refreshTabInfo(bool clearContents, bool neverQuit)
     {
       PackageInfoData kcp;
 
-      if (StrConstants::getForeignRepositoryToolName() == "kcp")
+      if (Package::getForeignRepositoryToolName() == "kcp")
       {
         QEventLoop el;
         QFuture<PackageInfoData> f;
@@ -1286,15 +1286,15 @@ void MainWindow::refreshTabInfo(bool clearContents, bool neverQuit)
       html += "<a id=\"" + anchorBegin + "\"></a>";            
       html += "<h2>" + pkgName + "</h2>";
 
-      if (StrConstants::getForeignRepositoryToolName() != "kcp")
+      if (Package::getForeignRepositoryToolName() != "kcp")
       {
         html += "<a style=\"font-size:16px;\">" + pkgDescription + "</a>";
         html += "<table border=\"0\">";
         html += "<tr><th width=\"20%\"></th><th width=\"80%\"></th></tr>";
         html += "<tr><td>" + version + "</td><td>" + package->version + "</td></tr>";        
 
-        if (StrConstants::getForeignRepositoryToolName() == "yaourt" ||
-            StrConstants::getForeignRepositoryToolName() == "pacaur")
+        if (Package::getForeignRepositoryToolName() == "yaourt" ||
+            Package::getForeignRepositoryToolName() == "pacaur")
         {
           QString url = Package::getAURUrl(pkgName);
           if (!url.isEmpty() && !url.contains("(null)"))
@@ -1303,7 +1303,7 @@ void MainWindow::refreshTabInfo(bool clearContents, bool neverQuit)
           }
         }
       }
-      else if (StrConstants::getForeignRepositoryToolName() == "kcp")
+      else if (Package::getForeignRepositoryToolName() == "kcp")
       {
         html += "<a style=\"font-size:16px;\">" + kcp.description + "</a>";
         html += "<table border=\"0\">";
diff --git a/src/mainwindow_transaction.cpp b/src/mainwindow_transaction.cpp
@@ -1194,20 +1194,20 @@ void MainWindow::doInstallAURPackage()
     }
     if (package->repository != StrConstants::getForeignRepositoryName()) {
       std::cerr << "Octopi could not install selection using " <<
-                   StrConstants::getForeignRepositoryToolName().toLatin1().data() << std::endl;
+                   Package::getForeignRepositoryToolName().toLatin1().data() << std::endl;
       return;
     }
 
-    if (StrConstants::getForeignRepositoryToolName() != "pacaur" &&
-        StrConstants::getForeignRepositoryToolName() != "kcp")
+    if (Package::getForeignRepositoryToolName() != "pacaur" &&
+        Package::getForeignRepositoryToolName() != "kcp")
       listOfTargets += StrConstants::getForeignRepositoryTargetPrefix() + package->name + " ";
     else
       listOfTargets += package->name + " ";
   }
 
   if (listOfTargets.isEmpty()) {
     std::cerr << "Octopi could not install selection using " <<
-                 StrConstants::getForeignRepositoryToolName().toLatin1().data() << std::endl;
+                 Package::getForeignRepositoryToolName().toLatin1().data() << std::endl;
     return;
   }
 
@@ -1603,7 +1603,7 @@ void MainWindow::toggleSystemActions(const bool value)
     m_actionMenuMirrorCheck->setEnabled(value);
   }
 
-  if (isAURGroupSelected() && StrConstants::getForeignRepositoryToolName() == "kcp")
+  if (isAURGroupSelected() && Package::getForeignRepositoryToolName() == "kcp")
   {
     ui->actionSyncPackages->setEnabled(true);
   }
@@ -1722,7 +1722,7 @@ void MainWindow::pacmanProcessFinished(int exitCode, QProcess::ExitStatus exitSt
           {
             metaBuildPackageList();
           }
-          else if (StrConstants::getForeignRepositoryToolName() == "kcp")
+          else if (Package::getForeignRepositoryToolName() == "kcp")
           {
             metaBuildPackageList();
             delete m_pacmanExec;
diff --git a/src/package.cpp b/src/package.cpp
@@ -332,9 +332,9 @@ QStringList *Package::getOutdatedAURStringList()
 {
   QStringList * res = new QStringList();
 
-  if (StrConstants::getForeignRepositoryToolName() != "yaourt" &&
-      StrConstants::getForeignRepositoryToolName() != "pacaur" &&
-      StrConstants::getForeignRepositoryToolName() != "kcp")
+  if (getForeignRepositoryToolName() != "yaourt" &&
+      getForeignRepositoryToolName() != "pacaur" &&
+      getForeignRepositoryToolName() != "kcp")
     return res;
 
   QString outPkgList = UnixCommand::getOutdatedAURPackageList();
@@ -345,8 +345,8 @@ QStringList *Package::getOutdatedAURStringList()
   {
     QStringList parts = packageTuple.split(' ', QString::SkipEmptyParts);
     {
-      if (StrConstants::getForeignRepositoryToolName() == "yaourt" ||
-          StrConstants::getForeignRepositoryToolName() == "kcp")
+      if (getForeignRepositoryToolName() == "yaourt" ||
+          getForeignRepositoryToolName() == "kcp")
       {
         QString pkgName;
         pkgName = parts[0];
@@ -355,7 +355,13 @@ QStringList *Package::getOutdatedAURStringList()
         pkgName = pkgName.remove("[1;36m");
         pkgName = pkgName.remove("[1;32m");
         pkgName = pkgName.remove("[m");
-        pkgName = pkgName.remove("[1m");
+        pkgName = pkgName.remove("[1m");       
+
+        if (getForeignRepositoryToolName() == "yaourt")
+        {
+          if (!pkgName.startsWith(StrConstants::getForeignRepositoryTargetPrefix()))
+              continue;
+        }
 
         if (pkgName.contains(StrConstants::getForeignRepositoryTargetPrefix(), Qt::CaseInsensitive))
         {
@@ -367,11 +373,14 @@ QStringList *Package::getOutdatedAURStringList()
           }
         }
       }
-      else if (StrConstants::getForeignRepositoryToolName() == "pacaur")
+      else if (getForeignRepositoryToolName() == "pacaur")
       {
         QString pkgName;
         if (parts.count() >= 2)
         {
+          if (parts[1] != StrConstants::getForeignRepositoryTargetPrefix())
+            continue;
+
           pkgName = parts[2];
           pkgName = pkgName.remove("\033");
           pkgName = pkgName.remove("[1;31m");
@@ -381,7 +390,7 @@ QStringList *Package::getOutdatedAURStringList()
           pkgName = pkgName.remove("[1;39m");
           pkgName = pkgName.remove("[m");
           pkgName = pkgName.remove("[0m");
-          pkgName = pkgName.remove("[1m");
+          pkgName = pkgName.remove("[1m");   
 
           //Let's ignore the "IgnorePkg" list of packages...
           if (!ignorePkgList.contains(pkgName))
@@ -711,7 +720,7 @@ QString Package::getAURUrl(const QString &pkgName)
 {
   QString url="";
 
-  if (StrConstants::getForeignRepositoryToolName() != "kcp")
+  if (getForeignRepositoryToolName() != "kcp")
   {
     QString pkgInfo = UnixCommand::getAURUrl(pkgName);
     url = getURL(pkgInfo);
@@ -793,7 +802,7 @@ QList<PackageListData> * Package::getAURPackageList(const QString& searchString)
       pkgVotes = 0;
 
       //Chakra does not have popularity support in CCR
-      QString aurTool = StrConstants::getForeignRepositoryToolName();
+      QString aurTool = getForeignRepositoryToolName();
 
       if (aurTool != "chaser" && aurTool != "pacaur" && strVotes.count() > 0)
       {
@@ -1508,9 +1517,9 @@ QHash<QString, QString> Package::getAUROutdatedPackagesNameVersion()
   QHash<QString, QString> hash;
 
   if(UnixCommand::getLinuxDistro() == ectn_CHAKRA ||
-      (StrConstants::getForeignRepositoryToolName() != "yaourt" &&
-      StrConstants::getForeignRepositoryToolName() != "pacaur" &&
-      StrConstants::getForeignRepositoryToolName() != "kcp"))
+      (getForeignRepositoryToolName() != "yaourt" &&
+      getForeignRepositoryToolName() != "pacaur" &&
+      getForeignRepositoryToolName() != "kcp"))
   {
     return hash;
   }
@@ -1519,8 +1528,8 @@ QHash<QString, QString> Package::getAUROutdatedPackagesNameVersion()
   QStringList listOfPkgs = res.split("\n", QString::SkipEmptyParts);
   QStringList ignorePkgList = UnixCommand::getIgnorePkgsFromPacmanConf();
 
-  if ((StrConstants::getForeignRepositoryToolName() == "yaourt") ||
-    (StrConstants::getForeignRepositoryToolName() == "kcp"))
+  if ((getForeignRepositoryToolName() == "yaourt") ||
+    (getForeignRepositoryToolName() == "kcp"))
   {
     foreach (QString line, listOfPkgs)
     {
@@ -1537,16 +1546,19 @@ QHash<QString, QString> Package::getAUROutdatedPackagesNameVersion()
         QStringList nameVersion = line.split(" ", QString::SkipEmptyParts);
         QString pkgName = nameVersion.at(0);
 
-        if (StrConstants::getForeignRepositoryToolName() == "kcp")
+        if (getForeignRepositoryToolName() == "kcp")
         {
           //Let's ignore the "IgnorePkg" list of packages...
           if (!ignorePkgList.contains(pkgName))
           {
             hash.insert(pkgName, nameVersion.at(1));
           }
         }
-        else
+        else //It's yaourt!
         {
+          if (!pkgName.startsWith(StrConstants::getForeignRepositoryTargetPrefix()))
+            continue;
+
           //Let's ignore the "IgnorePkg" list of packages...
           if (!ignorePkgList.contains(pkgName))
           {
@@ -1559,7 +1571,7 @@ QHash<QString, QString> Package::getAUROutdatedPackagesNameVersion()
       }
     }
   }
-  else if (StrConstants::getForeignRepositoryToolName() == "pacaur")
+  else if (getForeignRepositoryToolName() == "pacaur")
   {
     foreach (QString line, listOfPkgs)
     {
@@ -1574,6 +1586,10 @@ QHash<QString, QString> Package::getAUROutdatedPackagesNameVersion()
       line = line.remove("[1m");
 
       QStringList sl = line.split(" ", QString::SkipEmptyParts);
+
+      if (sl[1] != StrConstants::getForeignRepositoryTargetPrefix())
+        continue;
+
       if (sl.count() >= 6)
       {
         hash.insert(sl.at(2), sl.at(5));
@@ -1701,3 +1717,25 @@ bool Package::hasPacmanDatabase()
 
   return answer;
 }
+
+QString Package::getForeignRepositoryToolName()
+{
+  static bool first=true;
+  static QString ret;
+
+  if (first)
+  {
+    if( UnixCommand::getLinuxDistro() == ectn_CHAKRA )
+      ret = QLatin1String( "chaser" );
+    else if (UnixCommand::getLinuxDistro() == ectn_KAOS)
+      ret = QLatin1String( "kcp" );
+    else if (UnixCommand::hasTheExecutable("pacaur"))
+      ret = QLatin1String( "pacaur" );
+    else
+      ret = QLatin1String( "yaourt" );
+
+    first = false;
+  }
+
+  return ret;
+}
diff --git a/src/package.h b/src/package.h
@@ -182,6 +182,8 @@ class Package{
     static QString parseSearchString( QString searchStr, bool exactMatch = false );
 
     static bool hasPacmanDatabase();
+
+    static QString getForeignRepositoryToolName();
 };
 
 #endif
diff --git a/src/pacmanexec.cpp b/src/pacmanexec.cpp
@@ -880,13 +880,13 @@ void PacmanExec::doAURUpgrade(const QString &listOfPackages)
 {
   m_lastCommandList.clear();
 
-  if (StrConstants::getForeignRepositoryToolName() == "pacaur")
+  if (Package::getForeignRepositoryToolName() == "pacaur")
   {
-    m_lastCommandList.append(StrConstants::getForeignRepositoryToolName() + " -Sa " + listOfPackages + ";");
+    m_lastCommandList.append(Package::getForeignRepositoryToolName() + " -Sa " + listOfPackages + ";");
   }
-  else if (StrConstants::getForeignRepositoryToolName() == "yaourt")
+  else if (Package::getForeignRepositoryToolName() == "yaourt")
   {
-    m_lastCommandList.append(StrConstants::getForeignRepositoryToolName() + " -S " + listOfPackages + ";");
+    m_lastCommandList.append(Package::getForeignRepositoryToolName() + " -S " + listOfPackages + ";");
   }
 
   m_lastCommandList.append("echo -e;");
@@ -904,13 +904,13 @@ void PacmanExec::doAURInstall(const QString &listOfPackages)
   m_lastCommandList.clear();
 
   if (UnixCommand::getLinuxDistro() == ectn_KAOS)
-    m_lastCommandList.append(StrConstants::getForeignRepositoryToolName() + " -i " + listOfPackages + ";");
-  else if (StrConstants::getForeignRepositoryToolName() == "pacaur")
-    m_lastCommandList.append(StrConstants::getForeignRepositoryToolName() + " -Sa " + listOfPackages + ";");
-  else if (StrConstants::getForeignRepositoryToolName() == "yaourt")
-    m_lastCommandList.append(StrConstants::getForeignRepositoryToolName() + " -S " + listOfPackages + ";");
-  else if (StrConstants::getForeignRepositoryToolName() == "chaser")
-    m_lastCommandList.append(StrConstants::getForeignRepositoryToolName() + " install " + listOfPackages + ";");
+    m_lastCommandList.append(Package::getForeignRepositoryToolName() + " -i " + listOfPackages + ";");
+  else if (Package::getForeignRepositoryToolName() == "pacaur")
+    m_lastCommandList.append(Package::getForeignRepositoryToolName() + " -Sa " + listOfPackages + ";");
+  else if (Package::getForeignRepositoryToolName() == "yaourt")
+    m_lastCommandList.append(Package::getForeignRepositoryToolName() + " -S " + listOfPackages + ";");
+  else if (Package::getForeignRepositoryToolName() == "chaser")
+    m_lastCommandList.append(Package::getForeignRepositoryToolName() + " install " + listOfPackages + ";");
 
   m_lastCommandList.append("echo -e;");
   m_lastCommandList.append("read -n 1 -p \"" + StrConstants::getPressAnyKey() + "\"");
@@ -926,26 +926,26 @@ void PacmanExec::doAURRemove(const QString &listOfPackages)
 {
   m_lastCommandList.clear();
 
-  if (StrConstants::getForeignRepositoryToolName() == "chaser" ||
-      StrConstants::getForeignRepositoryToolName() == "kcp")
+  if (Package::getForeignRepositoryToolName() == "chaser" ||
+      Package::getForeignRepositoryToolName() == "kcp")
   {
     m_lastCommandList.append("pacman -R " + listOfPackages + ";");
   }
   else
   {
-    m_lastCommandList.append(StrConstants::getForeignRepositoryToolName() +
+    m_lastCommandList.append(Package::getForeignRepositoryToolName() +
                              " -R " + listOfPackages + ";");
   }
 
   m_lastCommandList.append("echo -e;");
   m_lastCommandList.append("read -n 1 -p \"" + StrConstants::getPressAnyKey() + "\"");
 
-  if (StrConstants::getForeignRepositoryToolName() == "kcp")
+  if (Package::getForeignRepositoryToolName() == "kcp")
     m_commandExecuting = ectn_REMOVE_KCP_PKG;
   else
     m_commandExecuting = ectn_RUN_IN_TERMINAL;
 
-  if (StrConstants::getForeignRepositoryToolName() != "yaourt" && StrConstants::getForeignRepositoryToolName() != "pacaur")
+  if (Package::getForeignRepositoryToolName() != "yaourt" && Package::getForeignRepositoryToolName() != "pacaur")
     m_unixCommand->runCommandInTerminal(m_lastCommandList);
   else
     m_unixCommand->runCommandInTerminalAsNormalUser(m_lastCommandList);
diff --git a/src/strconstants.h b/src/strconstants.h
diff --git a/src/unixcommand.cpp b/src/unixcommand.cpp
diff --git a/src/utils.cpp b/src/utils.cpp

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ MainWindow::MainWindow(QWidget *parent) :`
`54`	`54`	`QMainWindow(parent), ui(new Ui::MainWindow), m_packageModel(new PackageModel(m_packageRepo))`
`55`	`55`	`{`
`56`	`56`	`m_hasAURTool =`
`57`		`- UnixCommand::hasTheExecutable(StrConstants::getForeignRepositoryToolName()) && !UnixCommand::isRootRunning();`
	`57`	`+ UnixCommand::hasTheExecutable(Package::getForeignRepositoryToolName()) && !UnixCommand::isRootRunning();`
`58`	`58`
`59`	`59`	`m_packageRepo.registerDependency(*m_packageModel);`
`60`	`60`	`m_foundFilesInPkgFileList = new QList<QModelIndex>();`
Original file line number	Diff line number	Diff line change
`@@ -1074,7 +1074,7 @@ void MainWindow::showToolButtonAUR()`
`1074`	`1074`	`void MainWindow::refreshToolBar()`
`1075`	`1075`	`{`
`1076`	`1076`	`m_hasAURTool =`
`1077`		`- UnixCommand::hasTheExecutable(StrConstants::getForeignRepositoryToolName()) && !UnixCommand::isRootRunning();`
	`1077`	`+ UnixCommand::hasTheExecutable(Package::getForeignRepositoryToolName()) && !UnixCommand::isRootRunning();`
`1078`	`1078`
`1079`	`1079`	`if (m_hasAURTool)`
`1080`	`1080`	`{`
`@@ -1266,7 +1266,7 @@ void MainWindow::refreshTabInfo(bool clearContents, bool neverQuit)`
`1266`	`1266`	`{`
`1267`	`1267`	`PackageInfoData kcp;`
`1268`	`1268`
`1269`		`- if (StrConstants::getForeignRepositoryToolName() == "kcp")`
	`1269`	`+ if (Package::getForeignRepositoryToolName() == "kcp")`
`1270`	`1270`	`{`
`1271`	`1271`	`QEventLoop el;`
`1272`	`1272`	`QFuture<PackageInfoData> f;`
`@@ -1286,15 +1286,15 @@ void MainWindow::refreshTabInfo(bool clearContents, bool neverQuit)`
`1286`	`1286`	`html += "<a id=\"" + anchorBegin + "\"></a>";`
`1287`	`1287`	`html += "<h2>" + pkgName + "</h2>";`
`1288`	`1288`
`1289`		`- if (StrConstants::getForeignRepositoryToolName() != "kcp")`
	`1289`	`+ if (Package::getForeignRepositoryToolName() != "kcp")`
`1290`	`1290`	`{`
`1291`	`1291`	`html += "<a style=\"font-size:16px;\">" + pkgDescription + "</a>";`
`1292`	`1292`	`html += "<table border=\"0\">";`
`1293`	`1293`	`html += "<tr><th width=\"20%\"></th><th width=\"80%\"></th></tr>";`
`1294`	`1294`	`html += "<tr><td>" + version + "</td><td>" + package->version + "</td></tr>";`
`1295`	`1295`
`1296`		`- if (StrConstants::getForeignRepositoryToolName() == "yaourt" \|\|`
`1297`		`- StrConstants::getForeignRepositoryToolName() == "pacaur")`
	`1296`	`+ if (Package::getForeignRepositoryToolName() == "yaourt" \|\|`
	`1297`	`+ Package::getForeignRepositoryToolName() == "pacaur")`
`1298`	`1298`	`{`
`1299`	`1299`	`QString url = Package::getAURUrl(pkgName);`
`1300`	`1300`	`if (!url.isEmpty() && !url.contains("(null)"))`
`@@ -1303,7 +1303,7 @@ void MainWindow::refreshTabInfo(bool clearContents, bool neverQuit)`
`1303`	`1303`	`}`
`1304`	`1304`	`}`
`1305`	`1305`	`}`
`1306`		`- else if (StrConstants::getForeignRepositoryToolName() == "kcp")`
	`1306`	`+ else if (Package::getForeignRepositoryToolName() == "kcp")`
`1307`	`1307`	`{`
`1308`	`1308`	`html += "<a style=\"font-size:16px;\">" + kcp.description + "</a>";`
`1309`	`1309`	`html += "<table border=\"0\">";`
Original file line number	Diff line number	Diff line change
`@@ -1194,20 +1194,20 @@ void MainWindow::doInstallAURPackage()`
`1194`	`1194`	`}`
`1195`	`1195`	`if (package->repository != StrConstants::getForeignRepositoryName()) {`
`1196`	`1196`	`std::cerr << "Octopi could not install selection using " <<`
`1197`		`- StrConstants::getForeignRepositoryToolName().toLatin1().data() << std::endl;`
	`1197`	`+ Package::getForeignRepositoryToolName().toLatin1().data() << std::endl;`
`1198`	`1198`	`return;`
`1199`	`1199`	`}`
`1200`	`1200`
`1201`		`- if (StrConstants::getForeignRepositoryToolName() != "pacaur" &&`
`1202`		`- StrConstants::getForeignRepositoryToolName() != "kcp")`
	`1201`	`+ if (Package::getForeignRepositoryToolName() != "pacaur" &&`
	`1202`	`+ Package::getForeignRepositoryToolName() != "kcp")`
`1203`	`1203`	`listOfTargets += StrConstants::getForeignRepositoryTargetPrefix() + package->name + " ";`
`1204`	`1204`	`else`
`1205`	`1205`	`listOfTargets += package->name + " ";`
`1206`	`1206`	`}`
`1207`	`1207`
`1208`	`1208`	`if (listOfTargets.isEmpty()) {`
`1209`	`1209`	`std::cerr << "Octopi could not install selection using " <<`
`1210`		`- StrConstants::getForeignRepositoryToolName().toLatin1().data() << std::endl;`
	`1210`	`+ Package::getForeignRepositoryToolName().toLatin1().data() << std::endl;`
`1211`	`1211`	`return;`
`1212`	`1212`	`}`
`1213`	`1213`
`@@ -1603,7 +1603,7 @@ void MainWindow::toggleSystemActions(const bool value)`
`1603`	`1603`	`m_actionMenuMirrorCheck->setEnabled(value);`
`1604`	`1604`	`}`
`1605`	`1605`
`1606`		`- if (isAURGroupSelected() && StrConstants::getForeignRepositoryToolName() == "kcp")`
	`1606`	`+ if (isAURGroupSelected() && Package::getForeignRepositoryToolName() == "kcp")`
`1607`	`1607`	`{`
`1608`	`1608`	`ui->actionSyncPackages->setEnabled(true);`
`1609`	`1609`	`}`
`@@ -1722,7 +1722,7 @@ void MainWindow::pacmanProcessFinished(int exitCode, QProcess::ExitStatus exitSt`
`1722`	`1722`	`{`
`1723`	`1723`	`metaBuildPackageList();`
`1724`	`1724`	`}`
`1725`		`- else if (StrConstants::getForeignRepositoryToolName() == "kcp")`
	`1725`	`+ else if (Package::getForeignRepositoryToolName() == "kcp")`
`1726`	`1726`	`{`
`1727`	`1727`	`metaBuildPackageList();`
`1728`	`1728`	`delete m_pacmanExec;`
Original file line number	Diff line number	Diff line change
`@@ -332,9 +332,9 @@ QStringList *Package::getOutdatedAURStringList()`
`332`	`332`	`{`
`333`	`333`	`QStringList * res = new QStringList();`
`334`	`334`
`335`		`- if (StrConstants::getForeignRepositoryToolName() != "yaourt" &&`
`336`		`- StrConstants::getForeignRepositoryToolName() != "pacaur" &&`
`337`		`- StrConstants::getForeignRepositoryToolName() != "kcp")`
	`335`	`+ if (getForeignRepositoryToolName() != "yaourt" &&`
	`336`	`+ getForeignRepositoryToolName() != "pacaur" &&`
	`337`	`+ getForeignRepositoryToolName() != "kcp")`
`338`	`338`	`return res;`
`339`	`339`
`340`	`340`	`QString outPkgList = UnixCommand::getOutdatedAURPackageList();`
`@@ -345,8 +345,8 @@ QStringList *Package::getOutdatedAURStringList()`
`345`	`345`	`{`
`346`	`346`	`QStringList parts = packageTuple.split(' ', QString::SkipEmptyParts);`
`347`	`347`	`{`
`348`		`- if (StrConstants::getForeignRepositoryToolName() == "yaourt" \|\|`
`349`		`- StrConstants::getForeignRepositoryToolName() == "kcp")`
	`348`	`+ if (getForeignRepositoryToolName() == "yaourt" \|\|`
	`349`	`+ getForeignRepositoryToolName() == "kcp")`
`350`	`350`	`{`
`351`	`351`	`QString pkgName;`
`352`	`352`	`pkgName = parts[0];`
`@@ -355,7 +355,13 @@ QStringList *Package::getOutdatedAURStringList()`
`355`	`355`	`pkgName = pkgName.remove("[1;36m");`
`356`	`356`	`pkgName = pkgName.remove("[1;32m");`
`357`	`357`	`pkgName = pkgName.remove("[m");`
`358`		`- pkgName = pkgName.remove("[1m");`
	`358`	`+ pkgName = pkgName.remove("[1m");`
	`359`	`+`
	`360`	`+ if (getForeignRepositoryToolName() == "yaourt")`
	`361`	`+ {`
	`362`	`+ if (!pkgName.startsWith(StrConstants::getForeignRepositoryTargetPrefix()))`
	`363`	`+ continue;`
	`364`	`+ }`
`359`	`365`
`360`	`366`	`if (pkgName.contains(StrConstants::getForeignRepositoryTargetPrefix(), Qt::CaseInsensitive))`
`361`	`367`	`{`
`@@ -367,11 +373,14 @@ QStringList *Package::getOutdatedAURStringList()`
`367`	`373`	`}`
`368`	`374`	`}`
`369`	`375`	`}`
`370`		`- else if (StrConstants::getForeignRepositoryToolName() == "pacaur")`
	`376`	`+ else if (getForeignRepositoryToolName() == "pacaur")`
`371`	`377`	`{`
`372`	`378`	`QString pkgName;`
`373`	`379`	`if (parts.count() >= 2)`
`374`	`380`	`{`
	`381`	`+ if (parts[1] != StrConstants::getForeignRepositoryTargetPrefix())`
	`382`	`+ continue;`
	`383`	`+`
`375`	`384`	`pkgName = parts[2];`
`376`	`385`	`pkgName = pkgName.remove("\033");`
`377`	`386`	`pkgName = pkgName.remove("[1;31m");`
`@@ -381,7 +390,7 @@ QStringList *Package::getOutdatedAURStringList()`
`381`	`390`	`pkgName = pkgName.remove("[1;39m");`
`382`	`391`	`pkgName = pkgName.remove("[m");`
`383`	`392`	`pkgName = pkgName.remove("[0m");`
`384`		`- pkgName = pkgName.remove("[1m");`
	`393`	`+ pkgName = pkgName.remove("[1m");`
`385`	`394`
`386`	`395`	`//Let's ignore the "IgnorePkg" list of packages...`
`387`	`396`	`if (!ignorePkgList.contains(pkgName))`
`@@ -711,7 +720,7 @@ QString Package::getAURUrl(const QString &pkgName)`
`711`	`720`	`{`
`712`	`721`	`QString url="";`
`713`	`722`
`714`		`- if (StrConstants::getForeignRepositoryToolName() != "kcp")`
	`723`	`+ if (getForeignRepositoryToolName() != "kcp")`
`715`	`724`	`{`
`716`	`725`	`QString pkgInfo = UnixCommand::getAURUrl(pkgName);`
`717`	`726`	`url = getURL(pkgInfo);`
`@@ -793,7 +802,7 @@ QList<PackageListData> * Package::getAURPackageList(const QString& searchString)`
`793`	`802`	`pkgVotes = 0;`
`794`	`803`
`795`	`804`	`//Chakra does not have popularity support in CCR`
`796`		`- QString aurTool = StrConstants::getForeignRepositoryToolName();`
	`805`	`+ QString aurTool = getForeignRepositoryToolName();`
`797`	`806`
`798`	`807`	`if (aurTool != "chaser" && aurTool != "pacaur" && strVotes.count() > 0)`
`799`	`808`	`{`
`@@ -1508,9 +1517,9 @@ QHash<QString, QString> Package::getAUROutdatedPackagesNameVersion()`
`1508`	`1517`	`QHash<QString, QString> hash;`
`1509`	`1518`
`1510`	`1519`	`if(UnixCommand::getLinuxDistro() == ectn_CHAKRA \|\|`
`1511`		`- (StrConstants::getForeignRepositoryToolName() != "yaourt" &&`
`1512`		`- StrConstants::getForeignRepositoryToolName() != "pacaur" &&`
`1513`		`- StrConstants::getForeignRepositoryToolName() != "kcp"))`
	`1520`	`+ (getForeignRepositoryToolName() != "yaourt" &&`
	`1521`	`+ getForeignRepositoryToolName() != "pacaur" &&`
	`1522`	`+ getForeignRepositoryToolName() != "kcp"))`
`1514`	`1523`	`{`
`1515`	`1524`	`return hash;`
`1516`	`1525`	`}`
`@@ -1519,8 +1528,8 @@ QHash<QString, QString> Package::getAUROutdatedPackagesNameVersion()`
`1519`	`1528`	`QStringList listOfPkgs = res.split("\n", QString::SkipEmptyParts);`
`1520`	`1529`	`QStringList ignorePkgList = UnixCommand::getIgnorePkgsFromPacmanConf();`
`1521`	`1530`
`1522`		`- if ((StrConstants::getForeignRepositoryToolName() == "yaourt") \|\|`
`1523`		`- (StrConstants::getForeignRepositoryToolName() == "kcp"))`
	`1531`	`+ if ((getForeignRepositoryToolName() == "yaourt") \|\|`
	`1532`	`+ (getForeignRepositoryToolName() == "kcp"))`
`1524`	`1533`	`{`
`1525`	`1534`	`foreach (QString line, listOfPkgs)`
`1526`	`1535`	`{`
`@@ -1537,16 +1546,19 @@ QHash<QString, QString> Package::getAUROutdatedPackagesNameVersion()`
`1537`	`1546`	`QStringList nameVersion = line.split(" ", QString::SkipEmptyParts);`
`1538`	`1547`	`QString pkgName = nameVersion.at(0);`
`1539`	`1548`
`1540`		`- if (StrConstants::getForeignRepositoryToolName() == "kcp")`
	`1549`	`+ if (getForeignRepositoryToolName() == "kcp")`
`1541`	`1550`	`{`
`1542`	`1551`	`//Let's ignore the "IgnorePkg" list of packages...`
`1543`	`1552`	`if (!ignorePkgList.contains(pkgName))`
`1544`	`1553`	`{`
`1545`	`1554`	`hash.insert(pkgName, nameVersion.at(1));`
`1546`	`1555`	`}`
`1547`	`1556`	`}`
`1548`		`- else`
	`1557`	`+ else //It's yaourt!`
`1549`	`1558`	`{`
	`1559`	`+ if (!pkgName.startsWith(StrConstants::getForeignRepositoryTargetPrefix()))`
	`1560`	`+ continue;`
	`1561`	`+`
`1550`	`1562`	`//Let's ignore the "IgnorePkg" list of packages...`
`1551`	`1563`	`if (!ignorePkgList.contains(pkgName))`
`1552`	`1564`	`{`
`@@ -1559,7 +1571,7 @@ QHash<QString, QString> Package::getAUROutdatedPackagesNameVersion()`
`1559`	`1571`	`}`
`1560`	`1572`	`}`
`1561`	`1573`	`}`
`1562`		`- else if (StrConstants::getForeignRepositoryToolName() == "pacaur")`
	`1574`	`+ else if (getForeignRepositoryToolName() == "pacaur")`
`1563`	`1575`	`{`
`1564`	`1576`	`foreach (QString line, listOfPkgs)`
`1565`	`1577`	`{`
`@@ -1574,6 +1586,10 @@ QHash<QString, QString> Package::getAUROutdatedPackagesNameVersion()`
`1574`	`1586`	`line = line.remove("[1m");`
`1575`	`1587`
`1576`	`1588`	`QStringList sl = line.split(" ", QString::SkipEmptyParts);`
	`1589`	`+`
	`1590`	`+ if (sl[1] != StrConstants::getForeignRepositoryTargetPrefix())`
	`1591`	`+ continue;`
	`1592`	`+`
`1577`	`1593`	`if (sl.count() >= 6)`
`1578`	`1594`	`{`
`1579`	`1595`	`hash.insert(sl.at(2), sl.at(5));`
`@@ -1701,3 +1717,25 @@ bool Package::hasPacmanDatabase()`
`1701`	`1717`
`1702`	`1718`	`return answer;`
`1703`	`1719`	`}`
	`1720`	`+`
	`1721`	`+QString Package::getForeignRepositoryToolName()`
	`1722`	`+{`
	`1723`	`+ static bool first=true;`
	`1724`	`+ static QString ret;`
	`1725`	`+`
	`1726`	`+ if (first)`
	`1727`	`+ {`
	`1728`	`+ if( UnixCommand::getLinuxDistro() == ectn_CHAKRA )`
	`1729`	`+ ret = QLatin1String( "chaser" );`
	`1730`	`+ else if (UnixCommand::getLinuxDistro() == ectn_KAOS)`
	`1731`	`+ ret = QLatin1String( "kcp" );`
	`1732`	`+ else if (UnixCommand::hasTheExecutable("pacaur"))`
	`1733`	`+ ret = QLatin1String( "pacaur" );`
	`1734`	`+ else`
	`1735`	`+ ret = QLatin1String( "yaourt" );`
	`1736`	`+`
	`1737`	`+ first = false;`
	`1738`	`+ }`
	`1739`	`+`
	`1740`	`+ return ret;`
	`1741`	`+}`