GV

GeezerVison

The World Wide Web, restored to 800 pixels of glory.

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Sign in
  • ActionsCI/CD and automation
  • CodespacesCloud development environments
  • All Features
  • Documentation
  • Training
  • Certifications
  • Build with Copilot
  • Customize Copilot
  • Integrations
  • Trending repos
  • GitHub Sponsors
  • Developer articles
  • Enterprises

This view

  • Original page
  • New address

GeezerVison is showing github.com — move the repository stage into the repodata file by Duncaen · Pull Request #575 · void-linux/xbps

move the repository stage into the repodata file #575

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Duncaen wants to merge 8 commits into void-linux:master from Duncaen:stagedata

Uh oh!

There was an error while loading. Please reload this page.

Closed

move the repository stage into the repodata file #575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
02584df
lib: move the repository stage into the repodata file
Duncaen Oct 28, 2023
8be8c21
bin/xbps-rindex: move the repository stage into the repodata file
Duncaen Oct 28, 2023
e8949ee
bin/xbps-query: for -L show if repositories are staged
Duncaen Oct 28, 2023
3f0ae8a
tests: move the repository stage into the repodata file
Duncaen Oct 28, 2023
1433031
lib: add xbps flag to enable using staged remote repositories
Duncaen Oct 31, 2023
a2344ba
bin/xbps-install: add --staging flag
Duncaen Oct 31, 2023
9efe510
bin/xbps-query: add --staging flag
Duncaen Oct 31, 2023
66c0093
bin/xbps-checkvers: add --staging flag
Duncaen Oct 31, 2023
File filter
Filter by extension

Clear filters
Conversations
Failed to load comments.
Loading

Uh oh!

There was an error while loading. Please reload this page.

Jump to
Jump to file
Failed to load files.
Loading

Uh oh!

There was an error while loading. Please reload this page.

Diff view
Diff view

There are no files selected for viewing

5 changes: 5 additions & 0 deletions 5 bin/xbps-checkvers/main.c
Show comments
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ show_usage(const char *prog, bool fail)
" -R, --repository=<url> Append repository to the head of repository list\n"
" -r, --rootdir <dir> Set root directory (defaults to /)\n"
" -s, --show-all List all packages, in the format 'pkgname repover srcver'\n"
" --staging Enable use of staged packages\n"
"\n [FILES...] Extra packages to process with the outdated\n"
" ones (only processed if missing).\n", prog);
return fail ? EXIT_FAILURE: EXIT_SUCCESS;
Expand Down Expand Up @@ -718,6 +719,7 @@ main(int argc, char **argv)
{ "rootdir", required_argument, NULL, 'r' },
{ "show-all", no_argument, NULL, 's' },
{ "version", no_argument, NULL, 'V' },
{ "staging", no_argument, NULL, 1 },
{ NULL, 0, NULL, 0 }
};

Expand Down Expand Up @@ -765,6 +767,9 @@ main(int argc, char **argv)
case 'V':
printf("%s\n", XBPS_RELVER);
exit(EXIT_SUCCESS);
case 1:
rcv.xhp.flags |= XBPS_FLAG_USE_STAGE;
break;
case '?':
default:
return show_usage(prog, true);
Expand Down
2 changes: 2 additions & 0 deletions 2 bin/xbps-checkvers/xbps-checkvers.1
Show comments
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,8 @@ tree and prints version available in repository and srcpkgs with the following f
If any version can't be resolved,
.Em ?
is printed instead.
.It Fl -staging
Enables the use of staged packages from remote repositories.
.It Fl V, Fl -version
Show the version information.
.El
Expand Down
5 changes: 5 additions & 0 deletions 5 bin/xbps-install/main.c
Show comments
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ usage(bool fail)
" This option can be specified multiple times\n"
" -r, --rootdir <dir> Full path to rootdir\n"
" --reproducible Enable reproducible mode in pkgdb\n"
" --staging Enable use of staged packages\n"
" -S, --sync Sync remote repository index\n"
" -u, --update Update target package(s)\n"
" -v, --verbose Verbose messages\n"
Expand Down Expand Up @@ -118,6 +119,7 @@ main(int argc, char **argv)
{ "version", no_argument, NULL, 'V' },
{ "yes", no_argument, NULL, 'y' },
{ "reproducible", no_argument, NULL, 1 },
{ "staging", no_argument, NULL, 2 },
{ NULL, 0, NULL, 0 }
};
struct xbps_handle xh;
Expand All @@ -138,6 +140,9 @@ main(int argc, char **argv)
case 1:
flags |= XBPS_FLAG_INSTALL_REPRO;
break;
case 2:
flags |= XBPS_FLAG_USE_STAGE;
break;
case 'A':
flags |= XBPS_FLAG_INSTALL_AUTO;
break;
Expand Down
2 changes: 2 additions & 0 deletions 2 bin/xbps-install/xbps-install.1
Show comments
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,8 @@ The
and
.Ar repository
package objects are not stored in pkgdb.
.It Fl -staging
Enables the use of staged packages from remote repositories.
.It Fl r , Fl -rootdir Ar dir
Specifies a full path for the target root directory.
.It Fl S , Fl -sync
Expand Down
2 changes: 2 additions & 0 deletions 2 bin/xbps-query/list.c
Show comments
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,8 @@ repo_list_uri(struct xbps_repo *repo)
printf("%5zd %s",
repo->idx ? (ssize_t)xbps_dictionary_count(repo->idx) : -1,
repo->uri);
if (repo->stage && xbps_dictionary_count(repo->stage) > 0)
printf(" (Staged)");
printf(" (RSA %s)\n", repo->is_signed ? "signed" : "unsigned");
if (repo->xhp->flags & XBPS_FLAG_VERBOSE) {
xbps_data_t pubkey;
Expand Down
5 changes: 5 additions & 0 deletions 5 bin/xbps-query/main.c
Show comments
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ usage(bool fail)
" --repository <url> Enable repository mode and add repository\n"
" to the top of the list. This option can be\n"
" specified multiple times\n"
" --staging Enable use of staged packages\n"
" --regex Use Extended Regular Expressions to match\n"
" --fulldeptree Full dependency tree for -x/--deps\n"
" -r, --rootdir <dir> Full path to rootdir\n"
Expand Down Expand Up @@ -105,6 +106,7 @@ main(int argc, char **argv)
{ "regex", no_argument, NULL, 0 },
{ "fulldeptree", no_argument, NULL, 1 },
{ "cat", required_argument, NULL, 2 },
{ "staging", required_argument, NULL, 5 },
{ NULL, 0, NULL, 0 },
};
struct xbps_handle xh;
Expand Down Expand Up @@ -208,6 +210,9 @@ main(int argc, char **argv)
xbps_repo_store(&xh, optarg);
repo_mode = true;
break;
case 5:
flags |= XBPS_FLAG_USE_STAGE;
break;
case '?':
default:
usage(true);
Expand Down
2 changes: 2 additions & 0 deletions 2 bin/xbps-query/xbps-query.1
Show comments
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,8 @@ and
modes.
.It Fl -fulldeptree
Prints a full dependency tree in the
.It Fl -staging
Enables the use of staged packages from remote repositories.
.Sy show dependencies
mode.
.It Fl r, Fl -rootdir Ar dir
Expand Down
5 changes: 3 additions & 2 deletions 5 bin/xbps-rindex/defs.h
Show comments
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ int sign_repo(struct xbps_handle *, const char *, const char *,
int sign_pkgs(struct xbps_handle *, int, int, char **, const char *, bool);

/* From repoflush.c */
bool repodata_flush(struct xbps_handle *, const char *, const char *,
xbps_dictionary_t, xbps_dictionary_t, const char *);
int repodata_flush(const char *repodir, const char *arch,
xbps_dictionary_t index, xbps_dictionary_t stage, xbps_dictionary_t meta,
const char *compression);

#endif /* !_XBPS_RINDEX_DEFS_H_ */
Loading
Oops, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews. Suggestions cannot be applied on multi-line comments. Suggestions cannot be applied while the pull request is queued to merge. Suggestion cannot be applied right now. Please check back later.
You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.