summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'java.txt')
-rw-r--r--java.txt22
1 files changed, 5 insertions, 17 deletions
diff --git a/java.txt b/java.txt
index 4675d948e7f4..e0de21e34fb1 100644
--- a/java.txt
+++ b/java.txt
@@ -12,26 +12,14 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/proj/java.git'}],
'status': 'official'}
-$ pmaint sync java
-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 java
*** syncing java
+Already up to date.
*** synced java
* Sync succeeded
$ git log --format=%ci -1
$ git show -q --pretty=format:%G? HEAD
-$ pmaint regen --use-local-desc --pkg-desc-index -t 1 java
- * media-sound/tuxguitar-1.1-r1: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
- * Cache regen failed with 1
+$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 java
+ * Cache regenerated successfully