summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'gentoo.txt')
-rw-r--r--gentoo.txt28
1 files changed, 14 insertions, 14 deletions
diff --git a/gentoo.txt b/gentoo.txt
index e87c47dee44e..f167cd0a8f62 100644
--- a/gentoo.txt
+++ b/gentoo.txt
@@ -12,22 +12,22 @@
'uri': 'git+ssh://git@git.gentoo.org/repo/gentoo.git'}],
'status': 'official'}
$ pmaint sync gentoo
-You are not currently on a branch.
-Please specify which branch you want to merge with.
-See git-pull(1) for details.
-
- git pull <remote> <branch>
-
-*** syncing gentoo
-!!! failed syncing gentoo
- * Sync failed with 1
- * Will try to re-create
-$ pmaint sync gentoo
-Cloning into '/var/lib/repo-mirror-ci/sync/gentoo'...
-Updating files: 19% (17717/92225) Updating files: 20% (18445/92225) Updating files: 21% (19368/92225) Updating files: 22% (20290/92225) Updating files: 23% (21212/92225) Updating files: 24% (22134/92225) Updating files: 25% (23057/92225) Updating files: 26% (23979/92225) Updating files: 27% (24901/92225) Updating files: 28% (25823/92225) Updating files: 29% (26746/92225) Updating files: 30% (27668/92225) Updating files: 31% (28590/92225) Updating files: 32% (29512/92225) Updating files: 33% (30435/92225) Updating files: 34% (31357/92225) Updating files: 35% (32279/92225) Updating files: 36% (33201/92225) Updating files: 37% (34124/92225) Updating files: 38% (35046/92225) Updating files: 39% (35968/92225) Updating files: 39% (36140/92225) Updating files: 40% (36890/92225) Updating files: 41% (37813/92225) Updating files: 42% (38735/92225) Updating files: 43% (39657/92225) Updating files: 44% (40579/92225) Updating files: 45% (41502/92225) Updating files: 46% (42424/92225) Updating files: 47% (43346/92225) Updating files: 48% (44268/92225) Updating files: 49% (45191/92225) Updating files: 50% (46113/92225) Updating files: 51% (47035/92225) Updating files: 52% (47957/92225) Updating files: 53% (48880/92225) Updating files: 54% (49802/92225) Updating files: 55% (50724/92225) Updating files: 56% (51646/92225) Updating files: 57% (52569/92225) Updating files: 57% (53469/92225) Updating files: 58% (53491/92225) Updating files: 59% (54413/92225) Updating files: 60% (55335/92225) Updating files: 61% (56258/92225) Updating files: 62% (57180/92225) Updating files: 63% (58102/92225) Updating files: 64% (59024/92225) Updating files: 65% (59947/92225) Updating files: 66% (60869/92225) Updating files: 67% (61791/92225) Updating files: 68% (62713/92225) Updating files: 69% (63636/92225) Updating files: 70% (64558/92225) Updating files: 71% (65480/92225) Updating files: 72% (66402/92225) Updating files: 73% (67325/92225) Updating files: 74% (68247/92225) Updating files: 75% (69169/92225) Updating files: 76% (70091/92225) Updating files: 77% (71014/92225) Updating files: 77% (71091/92225) Updating files: 78% (71936/92225) Updating files: 79% (72858/92225) Updating files: 80% (73780/92225) Updating files: 81% (74703/92225) Updating files: 82% (75625/92225) Updating files: 83% (76547/92225) Updating files: 84% (77469/92225) Updating files: 85% (78392/92225) Updating files: 86% (79314/92225) Updating files: 87% (80236/92225) Updating files: 88% (81158/92225) Updating files: 89% (82081/92225) Updating files: 90% (83003/92225) Updating files: 91% (83925/92225) Updating files: 91% (84673/92225) Updating files: 92% (84847/92225) Updating files: 93% (85770/92225) Updating files: 94% (86692/92225) Updating files: 95% (87614/92225) Updating files: 96% (88536/92225) Updating files: 97% (89459/92225) Updating files: 98% (90381/92225) Updating files: 99% (91303/92225) Updating files: 100% (92225/92225) Updating files: 100% (92225/92225), done.
+From https://anongit.gentoo.org/git/repo/gentoo
+ d21af373b9e..6557642b5b2 master -> origin/master
+Updating d21af373b9e..6557642b5b2
+Fast-forward
+ app-i18n/ibus-typing-booster/Manifest | 2 +-
+ ...typing-booster-2.6.0.ebuild => ibus-typing-booster-2.8.0.ebuild} | 2 +-
+ profiles/arch/arm64/package.use.stable.mask | 4 ++++
+ profiles/arch/ia64/package.use.mask | 4 ++++
+ profiles/arch/s390/package.use.stable.mask | 6 ++++++
+ profiles/arch/sparc/package.use.mask | 4 ++++
+ 6 files changed, 20 insertions(+), 2 deletions(-)
+ rename app-i18n/ibus-typing-booster/{ibus-typing-booster-2.6.0.ebuild => ibus-typing-booster-2.8.0.ebuild} (96%)
+ create mode 100644 profiles/arch/s390/package.use.stable.mask
*** syncing gentoo
*** synced gentoo
- * Sync succeeded after re-adding
+ * Sync succeeded
$ git log --format=%ci -1
$ git show -q --pretty=format:%G? HEAD
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gentoo