diff options
| -rw-r--r-- | R_Overlay.html | 6 | ||||
| -rw-r--r-- | R_Overlay.txt | 6 | ||||
| -rw-r--r-- | index.html | 2 | ||||
| -rw-r--r-- | zugaina.html | 8 | ||||
| -rw-r--r-- | zugaina.txt | 8 | ||||
| -rw-r--r-- | zyrenth.html | 44 | ||||
| -rw-r--r-- | zyrenth.txt | 1 |
7 files changed, 36 insertions, 39 deletions
diff --git a/R_Overlay.html b/R_Overlay.html index 985885837e4d..f6fe825d5537 100644 --- a/R_Overlay.html +++ b/R_Overlay.html @@ -52,19 +52,19 @@ </pre></td></tr> <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>Matched data: 0 bytes </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>File list size: 2.32M + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>File list size: 2.13M </pre></td></tr> <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>File list generation time: 0.001 seconds </pre></td></tr> <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>File list transfer time: 0.000 seconds </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Total bytes sent: 17.95K + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Total bytes sent: 18.00K </pre></td></tr> <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Total bytes received: 2.77M </pre></td></tr> <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>sent 17.95K bytes received 2.77M bytes 1.11M bytes/sec + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>sent 18.00K bytes received 2.77M bytes 1.86M bytes/sec </pre></td></tr> <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>total size is 66.59M speedup is 23.92 </pre></td></tr> diff --git a/R_Overlay.txt b/R_Overlay.txt index 8fb953124728..9c0ba3da2b35 100644 --- a/R_Overlay.txt +++ b/R_Overlay.txt @@ -19,13 +19,13 @@ Total file size: 66.59M bytes Total transferred file size: 0 bytes Literal data: 0 bytes Matched data: 0 bytes -File list size: 2.32M +File list size: 2.13M File list generation time: 0.001 seconds File list transfer time: 0.000 seconds -Total bytes sent: 17.95K +Total bytes sent: 18.00K Total bytes received: 2.77M -sent 17.95K bytes received 2.77M bytes 1.11M bytes/sec +sent 18.00K bytes received 2.77M bytes 1.86M bytes/sec total size is 66.59M speedup is 23.92 *** synced R_Overlay * Sync succeeded diff --git a/index.html b/index.html index 9158260a054c..11f1d8915e71 100644 --- a/index.html +++ b/index.html @@ -779,7 +779,7 @@ </table> - <address>Generated based on results from 2021-04-23 04:34:51 UTC</address> + <address>Generated based on results from 2021-04-23 04:49:46 UTC</address> </body> </html>
\ No newline at end of file diff --git a/zugaina.html b/zugaina.html index 6c14ae4c0277..529ee306c17a 100644 --- a/zugaina.html +++ b/zugaina.html @@ -50,21 +50,21 @@ </pre></td></tr> <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>Matched data: 0 bytes </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>File list size: 39.78K + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>File list size: 40.14K </pre></td></tr> <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>File list generation time: 0.001 seconds </pre></td></tr> <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>File list transfer time: 0.000 seconds </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Total bytes sent: 490 + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Total bytes sent: 486 </pre></td></tr> <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Total bytes received: 44.30K </pre></td></tr> <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>sent 490 bytes received 44.30K bytes 17.92K bytes/sec + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>sent 486 bytes received 44.30K bytes 17.91K bytes/sec </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>total size is 2.01M speedup is 44.89 + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>total size is 2.01M speedup is 44.90 </pre></td></tr> <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced zugaina </pre></td></tr> diff --git a/zugaina.txt b/zugaina.txt index b1277d4ea71a..5d403e7e0bcf 100644 --- a/zugaina.txt +++ b/zugaina.txt @@ -18,14 +18,14 @@ Total file size: 2.01M bytes Total transferred file size: 0 bytes Literal data: 0 bytes Matched data: 0 bytes -File list size: 39.78K +File list size: 40.14K File list generation time: 0.001 seconds File list transfer time: 0.000 seconds -Total bytes sent: 490 +Total bytes sent: 486 Total bytes received: 44.30K -sent 490 bytes received 44.30K bytes 17.92K bytes/sec -total size is 2.01M speedup is 44.89 +sent 486 bytes received 44.30K bytes 17.91K bytes/sec +total size is 2.01M speedup is 44.90 *** synced zugaina * Sync succeeded $ stat --format=%y . diff --git a/zyrenth.html b/zyrenth.html index 25e9c8758410..15a07b11518a 100644 --- a/zyrenth.html +++ b/zyrenth.html @@ -42,49 +42,47 @@ </pre></td></tr> <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync zyrenth </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:zGentoo repo at '/var/lib/repo-mirror-ci/sync/zGentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing zyrenth </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing zyrenth + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date. + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced zyrenth </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced zyrenth + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded </pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1 </pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1 + <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD </pre></td></tr> - <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD + <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 zyrenth </pre></td></tr> - <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 zyrenth -</pre></td></tr> - <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regenerated successfully + <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> diff --git a/zyrenth.txt b/zyrenth.txt index 49ed66e3535d..6d24fc0a271f 100644 --- a/zyrenth.txt +++ b/zyrenth.txt @@ -14,7 +14,6 @@ 'uri': 'git@github.com:kabili207/zyrenth-overlay.git'}], 'status': 'unofficial'} $ pmaint sync zyrenth -WARNING:pkgcore:zGentoo repo at '/var/lib/repo-mirror-ci/sync/zGentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). *** syncing zyrenth warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following |