From bf59a5746d3e84d70d89d5cc4ccc856d5ac986fe Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 6 Sep 2015 15:34:39 +0200 Subject: [PATCH] fixed includes --- alpm/alpmdatabase.cpp | 2 +- alpm/aurpackage.cpp | 2 +- alpm/manager.cpp | 2 +- main.cpp | 12 ++++++------ network/userrepository.cpp | 2 ++ network/userrepository.h | 4 ++-- web/index.html | 3 ++- web/js/packagemanagement.js | 2 +- 8 files changed, 16 insertions(+), 13 deletions(-) diff --git a/alpm/alpmdatabase.cpp b/alpm/alpmdatabase.cpp index 5f808a9..da7a3e0 100644 --- a/alpm/alpmdatabase.cpp +++ b/alpm/alpmdatabase.cpp @@ -6,7 +6,7 @@ #include -#include "alpm.h" +#include #include #include diff --git a/alpm/aurpackage.cpp b/alpm/aurpackage.cpp index 30a3ab0..f7294d8 100644 --- a/alpm/aurpackage.cpp +++ b/alpm/aurpackage.cpp @@ -1,6 +1,6 @@ #include "aurpackage.h" -#include "network/userrepository.h" +#include "repoindex/network/userrepository.h" #include diff --git a/alpm/manager.cpp b/alpm/manager.cpp index 9d37b85..c72b646 100644 --- a/alpm/manager.cpp +++ b/alpm/manager.cpp @@ -4,7 +4,7 @@ #include "list.h" #include "config.h" -#include "network/userrepository.h" +#include "repoindex/network/userrepository.h" #include #include diff --git a/main.cpp b/main.cpp index 752145f..f41e40f 100644 --- a/main.cpp +++ b/main.cpp @@ -1,10 +1,10 @@ -#include "alpm/manager.h" -#include "alpm/utilities.h" -#include "alpm/config.h" -#include "alpm/resolvebuildorder.h" -#include "alpm/mingwbundle.h" +#include "repoindex/alpm/manager.h" +#include "repoindex/alpm/utilities.h" +#include "repoindex/alpm/config.h" +#include "repoindex/alpm/resolvebuildorder.h" +#include "repoindex/alpm/mingwbundle.h" -#include "network/server.h" +#include "repoindex/network/server.h" #include #include diff --git a/network/userrepository.cpp b/network/userrepository.cpp index 599b4fc..b86161c 100644 --- a/network/userrepository.cpp +++ b/network/userrepository.cpp @@ -4,6 +4,8 @@ #include +#include + #include #include #include diff --git a/network/userrepository.h b/network/userrepository.h index b9295d5..2d33011 100644 --- a/network/userrepository.h +++ b/network/userrepository.h @@ -1,8 +1,8 @@ #ifndef ALPM_USER_REPOSITORY_H #define ALPM_USER_REPOSITORY_H -#include "alpm/package.h" -#include "alpm/repository.h" +#include "repoindex/alpm/package.h" +#include "repoindex/alpm/repository.h" #include #include diff --git a/web/index.html b/web/index.html index 7435d06..ba64b6f 100644 --- a/web/index.html +++ b/web/index.html @@ -165,7 +165,8 @@ Install reason Install script Validated by - Files + Package files + Download diff --git a/web/js/packagemanagement.js b/web/js/packagemanagement.js index 599cb39..3b9c496 100644 --- a/web/js/packagemanagement.js +++ b/web/js/packagemanagement.js @@ -296,7 +296,7 @@ var mirrorsAvailable = 0; if(repoEntries.length > 0) { var mirrors = repoEntries[0].info.servers; - if(mirrors.length > 0) { + if(Array.isArray(mirrors) && mirrors.length > 0) { for(var i = 0; i < mirrors.length; ++i) { var liElement = document.createElement("li"); var aElement = document.createElement("a");