merge 2 branches

Actions.h

@@ -24,7 +24,7 @@ int DowngradePackage(char *package) {
 		else printf("Package %s not found in AUR, local cache or ARM. Terminating\n", package);
 	}
 	return 1;
-}
+} 
 //////////////////////////////////////////////////
 int GetChoiseForPackage(char *package) {
 
@@ -38,6 +38,7 @@ int GetChoiseForPackage(char *package) {
 		int ret = CheckDowngradePossibility(package);
 		if (ret) return 1;
 		ret = ReadArm(package);
+		if (!ret) return 2;
 		ret = IsPackageInCache(package);
 		for (int i=1;i<MAX_PKGS_FROM_ARM_FOR_USER && i<=pkgs_in_arm;i++) {
 			printf("%d: %s-%s", i, arm_pkgs[i].name, arm_pkgs[i].version);

Interface.h

@@ -5,4 +5,4 @@ void ShowHelpWindow() {
 	printf("   -h   <print this help and exit>\n");
 	printf("   -q   <quiet working, without any notifications> \n");
 	printf("   -l N   <gave a list of available packages versions for downgrade package N>\n");
-}
+} 

Makefile

@@ -7,3 +7,4 @@ main.o: main.c Interface.h Actions.h variables.h
 install: downgrader
 	strip -s downgrader
 	cp downgrader /usr/sbin/downgrader
+

PKGBUILD

@@ -3,7 +3,7 @@ pkgname=downgrader
 pkgver=1.7.0
 pkgrel=5
 pkgdesc="Powerful packages downgrader for Archlinux. Works with libalpm, ARM and pacman logs"
-arch=('i686' 'x86_64')
+arch=('any')
 depends=('pacman' 'intltool' 'sudo')
 license=("GPL")
 url="https://github.com/DimaSmirnov/Archlinux-downgrader"
@@ -18,8 +18,4 @@ build() {
 package() {
   cd "$srcdir"
   install -D -m755 downgrader "$pkgdir/usr/bin/downgrader"
-}
-<<<<<<< master
-
-=======
->>>>>>> local
+} 

main.c

@@ -8,12 +8,12 @@
 #include "cJSON.h"
 
 #define MAX_PKGS_FROM_ARM_FOR_USER 30
-#define VERSION "1.7.0-5"
+#define VERSION "1.7.0-4"
 
 #include "variables.h"
 #include "Interface.h"
 #include "Actions.h"
-
+ 
 
 int main(int argc, char **argv) {
 	char *package;
@@ -41,22 +41,21 @@ int main(int argc, char **argv) {
 		}
 	///////////////////////////// Show possible packages list when downgrade
 	if (show_list) {
-/*		
 		int def_pac = 0;
 		int pac_num;
-
+ 
 		printf ("\033[1;%dm Downgrade package: %s \033[0m \n", 31, package);
 		show_list = show_list;
 		int ret = GetChoiseForPackage(package);
-		if (ret) return 1; // exit with error
+		if (ret==1) { printf ("Sorry, internal error. Exiting\n"); return 1; }// exit with error
+		else if (ret==2) { printf ("Sorry, this feature temporary unavailable. Can`t read ARM. Exiting\n"); return 1; }
+
 		if (!strcmp(package_number,"d")) pac_num = def_pac;
 		else if (!strcmp(package_number,"q")) return 0;
 		else pac_num = atoi(package_number);
 		strcpy(install_command,"sudo pacman -U "); strcat(install_command, arm_pkgs[pac_num].link);
 		system(install_command);
 		PacmanDeinit();
-		*/
-		printf ("Sorry, this feature temporary unavailable\n");
 		return 0;
 	}
 	//////////////////////////// Downgrade single package

variables.h

@@ -9,7 +9,7 @@
 	char* IsPackageInArm(char *, char *);
 	int DowngradePackage(char *);
 	int GetChoiseForPackage(char *);
-
+ 
 	alpm_handle_t *alpm_handle;
 	alpm_db_t *db_local;
 	alpm_pkg_t *pkg;