diff options
| -rw-r--r-- | booboo.html | 54 | ||||
| -rw-r--r-- | booboo.txt | 24 | ||||
| -rw-r--r-- | index.html | 2 | ||||
| -rw-r--r-- | spark-overlay.html | 40 | ||||
| -rw-r--r-- | spark-overlay.txt | 15 | ||||
| -rw-r--r-- | xwing.html | 52 | ||||
| -rw-r--r-- | xwing.txt | 21 | ||||
| -rw-r--r-- | zugaina.html | 2 | ||||
| -rw-r--r-- | zugaina.txt | 2 |
9 files changed, 25 insertions, 187 deletions
diff --git a/booboo.html b/booboo.html index 6ad536f7561a..443c014615af 100644 --- a/booboo.html +++ b/booboo.html @@ -42,59 +42,19 @@ </pre></td></tr> <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing booboo </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>From https://github.com/l29ah/booboo + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>Already up to date. </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + 2efff44...3afd710 master -> origin/master (forced update) + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** synced booboo </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>hint: You have divergent branches and need to specify how to reconcile them. + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> * Sync succeeded </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>hint: You can do so by running one of the following commands sometime before + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ git log --format=%ci -1 </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>hint: your next pull: + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>hint: + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 booboo </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>hint: git config pull.rebase false # merge -</pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>hint: git config pull.rebase true # rebase -</pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>hint: git config pull.ff only # fast-forward only -</pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>hint: -</pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>hint: You can replace "git config" with "git config --global" to set a default -</pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>hint: preference for all repositories. You can also pass --rebase, --no-rebase, -</pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>hint: or --ff-only on the command line to override the configured default per -</pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>hint: invocation. -</pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>fatal: Need to specify how to reconcile divergent branches. -</pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>!!! failed syncing booboo -</pre></td></tr> - <tr class="err" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync failed with 1 -</pre></td><td>[FATAL]</td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Will try to re-create -</pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync booboo -</pre></td></tr> - <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>*** syncing booboo -</pre></td></tr> - <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>Cloning into '/var/lib/repo-mirror-ci/sync/booboo'... -</pre></td></tr> - <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>*** synced booboo -</pre></td></tr> - <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Sync succeeded after re-adding -</pre></td></tr> - <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>$ git log --format=%ci -1 -</pre></td></tr> - <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD -</pre></td></tr> - <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 booboo -</pre></td></tr> - <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * Cache regenerated successfully + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> diff --git a/booboo.txt b/booboo.txt index 376c998ef54c..dec1b970cb7c 100644 --- a/booboo.txt +++ b/booboo.txt @@ -14,29 +14,9 @@ pkgcore 0.12.11 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync booboo *** syncing booboo -From https://github.com/l29ah/booboo - + 2efff44...3afd710 master -> origin/master (forced update) -hint: You have divergent branches and need to specify how to reconcile them. -hint: You can do so by running one of the following commands sometime before -hint: your next pull: -hint: -hint: git config pull.rebase false # merge -hint: git config pull.rebase true # rebase -hint: git config pull.ff only # fast-forward only -hint: -hint: You can replace "git config" with "git config --global" to set a default -hint: preference for all repositories. You can also pass --rebase, --no-rebase, -hint: or --ff-only on the command line to override the configured default per -hint: invocation. -fatal: Need to specify how to reconcile divergent branches. -!!! failed syncing booboo - * Sync failed with 1 - * Will try to re-create -$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync booboo -*** syncing booboo -Cloning into '/var/lib/repo-mirror-ci/sync/booboo'... +Already up to date. *** synced booboo - * Sync succeeded after re-adding + * Sync succeeded $ git log --format=%ci -1 $ git show -q --pretty=format:%G? HEAD $ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 booboo diff --git a/index.html b/index.html index a34237fc4e7a..a57b6395e5bb 100644 --- a/index.html +++ b/index.html @@ -791,7 +791,7 @@ </table> - <address>Generated based on results from 2022-07-03 15:01:21 UTC</address> + <address>Generated based on results from 2022-07-03 15:17:04 UTC</address> </body> </html>
\ No newline at end of file diff --git a/spark-overlay.html b/spark-overlay.html index ebe8e7bf01bc..db9848d8db8a 100644 --- a/spark-overlay.html +++ b/spark-overlay.html @@ -42,45 +42,19 @@ </pre></td></tr> <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing spark-overlay </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>From https://github.com/6-6-6/spark-overlay + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>Already up to date. </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> c52df31f..f72f7032 master -> origin/master + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** synced spark-overlay </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>Updating c52df31f..f72f7032 + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> * Sync succeeded </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>Fast-forward + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ git log --format=%ci -1 </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> dev-java/guice-servlet/guice-servlet-4.1-r1.ebuild | 2 +- + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> dev-python/pyspark/pyspark-3.1.2.ebuild | 22 ---------------------- + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 spark-overlay </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> .../default/package.accept_keywords/gentoo | 2 -- -</pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> .../unstable/package.mask/perl-5.36 | 4 ++++ -</pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> tests/resources/leaf-ebuilds/test-case-tmpl.sh | 5 ++--- -</pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> tests/test-cases/h2o.sh | 5 ++--- -</pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> tests/test-cases/spark.sh | 5 ++--- -</pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> 7 files changed, 11 insertions(+), 34 deletions(-) -</pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> delete mode 100644 dev-python/pyspark/pyspark-3.1.2.ebuild -</pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> create mode 100644 tests/portage-configs/unstable/package.mask/perl-5.36 -</pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced spark-overlay -</pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded -</pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1 -</pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD -</pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 spark-overlay -</pre></td></tr> - <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> diff --git a/spark-overlay.txt b/spark-overlay.txt index 29b9f500439e..a65775388484 100644 --- a/spark-overlay.txt +++ b/spark-overlay.txt @@ -14,20 +14,7 @@ pkgcore 0.12.11 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync spark-overlay *** syncing spark-overlay -From https://github.com/6-6-6/spark-overlay - c52df31f..f72f7032 master -> origin/master -Updating c52df31f..f72f7032 -Fast-forward - dev-java/guice-servlet/guice-servlet-4.1-r1.ebuild | 2 +- - dev-python/pyspark/pyspark-3.1.2.ebuild | 22 ---------------------- - .../default/package.accept_keywords/gentoo | 2 -- - .../unstable/package.mask/perl-5.36 | 4 ++++ - tests/resources/leaf-ebuilds/test-case-tmpl.sh | 5 ++--- - tests/test-cases/h2o.sh | 5 ++--- - tests/test-cases/spark.sh | 5 ++--- - 7 files changed, 11 insertions(+), 34 deletions(-) - delete mode 100644 dev-python/pyspark/pyspark-3.1.2.ebuild - create mode 100644 tests/portage-configs/unstable/package.mask/perl-5.36 +Already up to date. *** synced spark-overlay * Sync succeeded $ git log --format=%ci -1 diff --git a/xwing.html b/xwing.html index 23a461efc2aa..adddbbfdf966 100644 --- a/xwing.html +++ b/xwing.html @@ -80,57 +80,15 @@ </pre></td></tr> <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>total size is 32 speedup is 0.15 </pre></td></tr> - <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>This is xwing.info / alderaan.xwing.info + <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>*** synced xwing </pre></td></tr> - <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> + <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Sync succeeded </pre></td></tr> - <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>Contact Name : webmaster@xwing.info + <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ stat --format=%y . </pre></td></tr> - <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> + <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 xwing </pre></td></tr> - <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> -</pre></td></tr> - <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>Number of files: 113 (reg: 75, dir: 38) -</pre></td></tr> - <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>Number of created files: 0 -</pre></td></tr> - <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>Number of deleted files: 0 -</pre></td></tr> - <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>Number of regular files transferred: 16 -</pre></td></tr> - <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>Total file size: 68.40K bytes -</pre></td></tr> - <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>Total transferred file size: 11.75K bytes -</pre></td></tr> - <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>Literal data: 11.75K bytes -</pre></td></tr> - <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>Matched data: 0 bytes -</pre></td></tr> - <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>File list size: 3.74K -</pre></td></tr> - <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>File list generation time: 0.001 seconds -</pre></td></tr> - <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>File list transfer time: 0.000 seconds -</pre></td></tr> - <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>Total bytes sent: 446 -</pre></td></tr> - <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>Total bytes received: 11.93K -</pre></td></tr> - <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> -</pre></td></tr> - <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>sent 446 bytes received 11.93K bytes 4.95K bytes/sec -</pre></td></tr> - <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>total size is 68.40K speedup is 5.53 -</pre></td></tr> - <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>*** synced xwing -</pre></td></tr> - <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * Sync succeeded -</pre></td></tr> - <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>$ stat --format=%y . -</pre></td></tr> - <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 xwing -</pre></td></tr> - <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * Cache regenerated successfully + <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> diff --git a/xwing.txt b/xwing.txt index 54048d324bb4..516d2f97e35d 100644 --- a/xwing.txt +++ b/xwing.txt @@ -33,27 +33,6 @@ Total bytes received: 132 sent 85 bytes received 132 bytes 86.80 bytes/sec total size is 32 speedup is 0.15 -This is xwing.info / alderaan.xwing.info - -Contact Name : webmaster@xwing.info - - -Number of files: 113 (reg: 75, dir: 38) -Number of created files: 0 -Number of deleted files: 0 -Number of regular files transferred: 16 -Total file size: 68.40K bytes -Total transferred file size: 11.75K bytes -Literal data: 11.75K bytes -Matched data: 0 bytes -File list size: 3.74K -File list generation time: 0.001 seconds -File list transfer time: 0.000 seconds -Total bytes sent: 446 -Total bytes received: 11.93K - -sent 446 bytes received 11.93K bytes 4.95K bytes/sec -total size is 68.40K speedup is 5.53 *** synced xwing * Sync succeeded $ stat --format=%y . diff --git a/zugaina.html b/zugaina.html index 6fa2b3d07a6e..bb7525bcabc3 100644 --- a/zugaina.html +++ b/zugaina.html @@ -68,7 +68,7 @@ </pre></td></tr> <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>sent 190 bytes received 11.56K bytes 4.70K bytes/sec + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>sent 190 bytes received 11.56K bytes 7.83K bytes/sec </pre></td></tr> <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>total size is 305.10K speedup is 25.96 </pre></td></tr> diff --git a/zugaina.txt b/zugaina.txt index 1e8a07a4e22d..fbe79fd1d25f 100644 --- a/zugaina.txt +++ b/zugaina.txt @@ -27,7 +27,7 @@ File list transfer time: 0.000 seconds Total bytes sent: 190 Total bytes received: 11.56K -sent 190 bytes received 11.56K bytes 4.70K bytes/sec +sent 190 bytes received 11.56K bytes 7.83K bytes/sec total size is 305.10K speedup is 25.96 *** synced zugaina * Sync succeeded |