summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--R_Overlay.html4
-rw-r--r--R_Overlay.txt4
-rw-r--r--index.html2
-rw-r--r--jkolo.html26
-rw-r--r--jkolo.txt10
-rw-r--r--miramir.html44
-rw-r--r--miramir.txt1
-rw-r--r--swegener.html2
-rw-r--r--swegener.txt2
-rw-r--r--xwing.html52
-rw-r--r--xwing.txt21
-rw-r--r--zugaina.html4
-rw-r--r--zugaina.txt4
13 files changed, 109 insertions, 67 deletions
diff --git a/R_Overlay.html b/R_Overlay.html
index a03f4f7cdcd3..321937a17b45 100644
--- a/R_Overlay.html
+++ b/R_Overlay.html
@@ -58,13 +58,13 @@
</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.96K
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Total bytes sent: 17.99K
</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.96K bytes received 2.77M bytes 1.86M bytes/sec
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>sent 17.99K 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.76M speedup is 23.94
</pre></td></tr>
diff --git a/R_Overlay.txt b/R_Overlay.txt
index 88cfa9cf5b57..c7468c4f541a 100644
--- a/R_Overlay.txt
+++ b/R_Overlay.txt
@@ -22,10 +22,10 @@ Matched data: 0 bytes
File list size: 2.42M
File list generation time: 0.001 seconds
File list transfer time: 0.000 seconds
-Total bytes sent: 17.96K
+Total bytes sent: 17.99K
Total bytes received: 2.77M
-sent 17.96K bytes received 2.77M bytes 1.86M bytes/sec
+sent 17.99K bytes received 2.77M bytes 1.86M bytes/sec
total size is 66.76M speedup is 23.94
*** synced R_Overlay
* Sync succeeded
diff --git a/index.html b/index.html
index 02f5fff8c0dd..bcd5aefb5793 100644
--- a/index.html
+++ b/index.html
@@ -779,7 +779,7 @@
</table>
- <address>Generated based on results from 2021-04-23 12:49:49 UTC</address>
+ <address>Generated based on results from 2021-04-23 13:04:51 UTC</address>
</body>
</html>
\ No newline at end of file
diff --git a/jkolo.html b/jkolo.html
index 7caea961f180..d1c0cd26932e 100644
--- a/jkolo.html
+++ b/jkolo.html
@@ -60,31 +60,19 @@
</pre></td></tr>
<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>fatal: unable to access &#x27;https://git.kolosowscy.pl/jurek/gentoo-overlay.git/&#x27;: Couldn&#x27;t resolve host &#x27;git.kolosowscy.pl&#x27;
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>!!! failed syncing jkolo
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced jkolo
</pre></td></tr>
- <tr class="err" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * Sync failed with 1
-</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Will try to re-create
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ pmaint sync jkolo
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing jkolo
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;...
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 jkolo
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced jkolo
-</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded after re-adding
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
-</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
-</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 jkolo
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/jkolo.txt b/jkolo.txt
index f9ca6156e5d5..4d3ad5fc1a5e 100644
--- a/jkolo.txt
+++ b/jkolo.txt
@@ -23,15 +23,9 @@ 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.
-fatal: unable to access 'https://git.kolosowscy.pl/jurek/gentoo-overlay.git/': Couldn't resolve host 'git.kolosowscy.pl'
-!!! failed syncing jkolo
- * Sync failed with 1
- * Will try to re-create
-$ pmaint sync jkolo
-*** syncing jkolo
-Cloning into '/var/lib/repo-mirror-ci/sync/jkolo'...
+Already up to date.
*** synced jkolo
- * 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 32 jkolo
diff --git a/miramir.html b/miramir.html
index a02512f5e92c..e006babf0405 100644
--- a/miramir.html
+++ b/miramir.html
@@ -30,49 +30,47 @@
</pre></td></tr>
<tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>$ pmaint sync miramir
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>*** syncing miramir
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing miramir
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull:
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation.
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date.
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** synced miramir
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced miramir
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * Sync succeeded
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>$ git log --format=%ci -1
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 miramir
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 miramir
-</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/miramir.txt b/miramir.txt
index d87e27970ed4..37b1f9953b44 100644
--- a/miramir.txt
+++ b/miramir.txt
@@ -8,7 +8,6 @@
'uri': 'https://github.com/miramir/miramir-layman.git'}],
'status': 'unofficial'}
$ pmaint sync miramir
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing miramir
warning: Pulling without specifying how to reconcile divergent branches is
discouraged. You can squelch this message by running one of the following
diff --git a/swegener.html b/swegener.html
index 4157b06fba3b..f4be58b7a4b5 100644
--- a/swegener.html
+++ b/swegener.html
@@ -102,7 +102,7 @@
</pre></td></tr>
<tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>sent 143 bytes received 5.09K bytes 1.50K bytes/sec
+ <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>sent 143 bytes received 5.09K bytes 2.09K bytes/sec
</pre></td></tr>
<tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>total size is 107.84K speedup is 20.60
</pre></td></tr>
diff --git a/swegener.txt b/swegener.txt
index 20a031527909..cdecb481f7a0 100644
--- a/swegener.txt
+++ b/swegener.txt
@@ -44,7 +44,7 @@ File list transfer time: 0.000 seconds
Total bytes sent: 143
Total bytes received: 5.09K
-sent 143 bytes received 5.09K bytes 1.50K bytes/sec
+sent 143 bytes received 5.09K bytes 2.09K bytes/sec
total size is 107.84K speedup is 20.60
*** synced swegener
* Sync succeeded
diff --git a/xwing.html b/xwing.html
index 6de5514ceacc..131d8a763b81 100644
--- a/xwing.html
+++ b/xwing.html
@@ -84,15 +84,57 @@
</pre></td></tr>
<tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>total size is 32 speedup is 0.15
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>*** synced xwing
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>This is xwing.info / alderaan.xwing.info
</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Sync succeeded
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>$ stat --format=%y .
+ <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>Contact Name : webmaster@xwing.info
</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 xwing
+ <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>
+</pre></td></tr>
+ <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>Number of files: 169 (reg: 111, dir: 58)
+</pre></td></tr>
+ <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>Number of created files: 0
+</pre></td></tr>
+ <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>Number of deleted files: 0
+</pre></td></tr>
+ <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>Number of regular files transferred: 23
+</pre></td></tr>
+ <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>Total file size: 134.31K bytes
+</pre></td></tr>
+ <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>Total transferred file size: 28.74K bytes
+</pre></td></tr>
+ <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>Literal data: 28.74K bytes
+</pre></td></tr>
+ <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>Matched data: 0 bytes
+</pre></td></tr>
+ <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>File list size: 5.57K
+</pre></td></tr>
+ <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>File list generation time: 0.001 seconds
+</pre></td></tr>
+ <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>File list transfer time: 0.000 seconds
+</pre></td></tr>
+ <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>Total bytes sent: 610
+</pre></td></tr>
+ <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>Total bytes received: 20.73K
+</pre></td></tr>
+ <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>
+</pre></td></tr>
+ <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>sent 610 bytes received 20.73K bytes 8.54K bytes/sec
+</pre></td></tr>
+ <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>total size is 134.31K speedup is 6.29
+</pre></td></tr>
+ <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>*** synced xwing
+</pre></td></tr>
+ <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * Sync succeeded
+</pre></td></tr>
+ <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre>$ stat --format=%y .
+</pre></td></tr>
+ <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 xwing
+</pre></td></tr>
+ <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/xwing.txt b/xwing.txt
index e6f09688228f..7486d516fc72 100644
--- a/xwing.txt
+++ b/xwing.txt
@@ -35,6 +35,27 @@ Total bytes received: 134
sent 85 bytes received 134 bytes 87.60 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: 169 (reg: 111, dir: 58)
+Number of created files: 0
+Number of deleted files: 0
+Number of regular files transferred: 23
+Total file size: 134.31K bytes
+Total transferred file size: 28.74K bytes
+Literal data: 28.74K bytes
+Matched data: 0 bytes
+File list size: 5.57K
+File list generation time: 0.001 seconds
+File list transfer time: 0.000 seconds
+Total bytes sent: 610
+Total bytes received: 20.73K
+
+sent 610 bytes received 20.73K bytes 8.54K bytes/sec
+total size is 134.31K speedup is 6.29
*** synced xwing
* Sync succeeded
$ stat --format=%y .
diff --git a/zugaina.html b/zugaina.html
index 12c5905e09b2..5d701867a23d 100644
--- a/zugaina.html
+++ b/zugaina.html
@@ -56,13 +56,13 @@
</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: 482
+ <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 482 bytes received 44.30K bytes 17.91K 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.90
</pre></td></tr>
diff --git a/zugaina.txt b/zugaina.txt
index 1548c032c50f..008d1a203ea2 100644
--- a/zugaina.txt
+++ b/zugaina.txt
@@ -21,10 +21,10 @@ Matched data: 0 bytes
File list size: 41.58K
File list generation time: 0.001 seconds
File list transfer time: 0.000 seconds
-Total bytes sent: 482
+Total bytes sent: 486
Total bytes received: 44.30K
-sent 482 bytes received 44.30K bytes 17.91K bytes/sec
+sent 486 bytes received 44.30K bytes 17.91K bytes/sec
total size is 2.01M speedup is 44.90
*** synced zugaina
* Sync succeeded