diff options
Diffstat (limited to 'sam_c.txt')
| -rw-r--r-- | sam_c.txt | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/sam_c.txt b/sam_c.txt index c84a423ca2f2..8a6e102cf948 100644 --- a/sam_c.txt +++ b/sam_c.txt @@ -4,29 +4,18 @@ 'name': 'sam_c', 'owner': [{'email': 'sam@cmpct.info', 'name': 'Sam James', 'type': 'person'}], 'quality': 'experimental', - 'source': [{'type': 'git', 'uri': 'https://github.com/thesamesam/overlay'}, + 'source': [{'type': 'git', 'uri': 'https://github.com/thesamesam/overlay.git'}, {'type': 'git', 'uri': 'git+ssh://git@github.com/thesamesam/overlay.git'}], 'status': 'unofficial'} -$ pmaint sync sam_c -warning: Pulling without specifying how to reconcile divergent branches is -discouraged. You can squelch this message by running one of the following -commands sometime before your next pull: +pkgcore 0.12.24 - git config pull.rebase false # merge (the default strategy) - git config pull.rebase true # rebase - git config pull.ff only # fast-forward only - -You can replace "git config" with "git config --global" to set a default -preference for all repositories. You can also pass --rebase, --no-rebase, -or --ff-only on the command line to override the configured default per -invocation. - -Already up to date. +$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync sam_c *** syncing sam_c +Already up to date. *** synced sam_c * Sync succeeded $ git log --format=%ci -1 $ git show -q --pretty=format:%G? HEAD -$ pmaint regen --use-local-desc --pkg-desc-index -t 1 sam_c +$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 sam_c * Cache regenerated successfully |