Radish alpha
H
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
pkg_compat: register mtree/display and conflicts
Philippe Pepiot committed 15 years ago
commit a6dcde7ed0f8b1f2308262a06bf5669e4c69b06b
parent 12487f0
1 file changed +14 -1
modified libpkg/pkg_compat.c
@@ -85,6 +85,7 @@ pkg_compat_plist_cmd(char *s, char **arg)
					break;
				default:
					return str2plist[i].val;
+
					break;
			}
		}
	}
@@ -180,12 +181,24 @@ pkg_compat_read_plist(cJSON *pkg, char *plist_str)
				cJSON_AddItemToArray(cJSON_GetObjectItem(pkg, "deps"), object);
				break;

+
			case PLIST_MTREE:
+
			case PLIST_DISPLAY:
+
				snprintf(path_file, MAXPATHLEN, "%s/%s", prefix, cp);
+
				cJSON_AddStringToObject(pkg, (cmd == PLIST_MTREE) ? "mtree" : "display", path_file);
+
				break;
+

+
			case PLIST_CONFLICTS:
+
				cJSON_AddItemToArray(cJSON_GetObjectItem(pkg, "conflicts"), cJSON_CreateString(cp));
+
				break;
+

			case PLIST_DIR_RM:
+
			case PLIST_COMMENT:
+
			case PLIST_IGNORE:
				/* IGNORING */
				break;

			default:
-
				warn("====> Unknown %s", cp);
+
				warnx("====> unparsed line: '%s'", buf);
				break;
		}
		buf = next;