emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xbps-checkvers: add --manual flag to only process listed templates

Browse Source
This commit is contained in:
Duncaen 2019-06-13 12:32:49 +02:00 committed by Duncan Overbruck
parent 7a104fa911
commit a99283bcdb
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bin/xbps-checkvers/main.c
View File

@ -200,6 +200,7 @@ show_usage(const char *prog)
" -I,--installed Check for outdated packages in rootdir, rather\n" " -I,--installed Check for outdated packages in rootdir, rather\n"
" than in the XBPS repositories.\n" " than in the XBPS repositories.\n"
" -i,--ignore-conf-repos Ignore repositories defined in xbps.d.\n" " -i,--ignore-conf-repos Ignore repositories defined in xbps.d.\n"
" -m,--manual Only process listed files.\n"
" -R,--repository=URL Append repository to the head of repository list.\n" " -R,--repository=URL Append repository to the head of repository list.\n"
" -r,--rootdir=DIRECTORY Set root directory (defaults to /).\n" " -r,--rootdir=DIRECTORY Set root directory (defaults to /).\n"
" -s,--show-all List all packages, in the format 'pkgname repover srcver'.\n" " -s,--show-all List all packages, in the format 'pkgname repover srcver'.\n"
@ -695,7 +696,7 @@ main(int argc, char **argv)
int i, c; int i, c;
rcv_t rcv; rcv_t rcv;
char *distdir = NULL; char *distdir = NULL;
const char *prog = argv[0], *sopts = "hC:D:diIR:r:sV", *tmpl; const char *prog = argv[0], *sopts = "hC:D:diImR:r:sV", *tmpl;
const struct option lopts[] = { const struct option lopts[] = {
{ "help", no_argument, NULL, 'h' }, { "help", no_argument, NULL, 'h' },
{ "config", required_argument, NULL, 'C' }, { "config", required_argument, NULL, 'C' },
@ -703,6 +704,7 @@ main(int argc, char **argv)
{ "debug", no_argument, NULL, 'd' }, { "debug", no_argument, NULL, 'd' },
{ "installed", no_argument, NULL, 'I' }, { "installed", no_argument, NULL, 'I' },
{ "ignore-conf-repos", no_argument, NULL, 'i' }, { "ignore-conf-repos", no_argument, NULL, 'i' },
{ "manual", no_argument, NULL, 'm' },
{ "repository", required_argument, NULL, 'R' }, { "repository", required_argument, NULL, 'R' },
{ "rootdir", required_argument, NULL, 'r' }, { "rootdir", required_argument, NULL, 'r' },
{ "show-all", no_argument, NULL, 's' }, { "show-all", no_argument, NULL, 's' },
@ -711,6 +713,7 @@ main(int argc, char **argv)
}; };
memset(&rcv, 0, sizeof(rcv_t)); memset(&rcv, 0, sizeof(rcv_t));
rcv.manual = false;
while ((c = getopt_long(argc, argv, sopts, lopts, NULL)) != -1) { while ((c = getopt_long(argc, argv, sopts, lopts, NULL)) != -1) {
switch (c) { switch (c) {
@ -731,6 +734,9 @@ main(int argc, char **argv)
case 'I': case 'I':
rcv.installed = true; rcv.installed = true;
break; break;
case 'm':
rcv.manual = true;
break;
case 'R': case 'R':
if (rcv.xhp.repositories == NULL) if (rcv.xhp.repositories == NULL)
rcv.xhp.repositories = xbps_array_create(); rcv.xhp.repositories = xbps_array_create();
@ -762,8 +768,14 @@ main(int argc, char **argv)
argv += optind; argv += optind;
rcv_init(&rcv, prog); rcv_init(&rcv, prog);
rcv.manual = false;
if (!rcv.manual) {
rcv_process_dir(&rcv, rcv.pkgdir, rcv_process_file); rcv_process_dir(&rcv, rcv.pkgdir, rcv_process_file);
} else if ((chdir(rcv.pkgdir)) == -1) {
fprintf(stderr, "Error: while processing dir '%s': %s\n", rcv.pkgdir,
strerror(errno));
exit(1);
}
rcv.manual = true; rcv.manual = true;
for (i = 0; i < argc; i++) { for (i = 0; i < argc; i++) {
tmpl = argv[i] + (strlen(argv[i]) - strlen("template")); tmpl = argv[i] + (strlen(argv[i]) - strlen("template"));