diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2021-03-03 03:06:58 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2021-03-03 03:06:58 +0000 |
| commit | 014b943b60d0498a6eb8f64ca5e97777af6730a8 (patch) | |
| tree | 810731576b4d6b92e02570411d373ea269baabfc | |
| parent | 2021-03-03T02:45:01Z (diff) | |
| download | repos-014b943b60d0498a6eb8f64ca5e97777af6730a8.tar.gz repos-014b943b60d0498a6eb8f64ca5e97777af6730a8.tar.bz2 repos-014b943b60d0498a6eb8f64ca5e97777af6730a8.zip | |
2021-03-03T03:00:01Z
| -rw-r--r-- | R_Overlay.html | 4 | ||||
| -rw-r--r-- | R_Overlay.txt | 4 | ||||
| -rw-r--r-- | dm9pZCAq.html | 44 | ||||
| -rw-r--r-- | dm9pZCAq.txt | 1 | ||||
| -rw-r--r-- | dmchurch.html | 44 | ||||
| -rw-r--r-- | dmchurch.txt | 1 | ||||
| -rw-r--r-- | index.html | 2 | ||||
| -rw-r--r-- | quarks.html | 44 | ||||
| -rw-r--r-- | quarks.txt | 16 | ||||
| -rw-r--r-- | rion.html | 58 | ||||
| -rw-r--r-- | rion.txt | 1 | ||||
| -rw-r--r-- | robert7k.html | 44 | ||||
| -rw-r--r-- | robert7k.txt | 1 | ||||
| -rw-r--r-- | robertgzr.html | 44 | ||||
| -rw-r--r-- | robertgzr.txt | 1 | ||||
| -rw-r--r-- | roslin.html | 44 | ||||
| -rw-r--r-- | roslin.txt | 1 | ||||
| -rw-r--r-- | rpm.html | 112 | ||||
| -rw-r--r-- | rpm.txt | 1 | ||||
| -rw-r--r-- | ruby.html | 44 | ||||
| -rw-r--r-- | ruby.txt | 1 | ||||
| -rw-r--r-- | rukruk.html | 44 | ||||
| -rw-r--r-- | rukruk.txt | 1 | ||||
| -rw-r--r-- | rust.html | 44 | ||||
| -rw-r--r-- | rust.txt | 1 | ||||
| -rw-r--r-- | ryans.html | 44 | ||||
| -rw-r--r-- | ryans.txt | 1 | ||||
| -rw-r--r-- | sabayon-distro.html | 100 | ||||
| -rw-r--r-- | sabayon-distro.txt | 1 | ||||
| -rw-r--r-- | sabayon.html | 118 | ||||
| -rw-r--r-- | sabayon.txt | 1 | ||||
| -rw-r--r-- | sage-on-gentoo.html | 44 | ||||
| -rw-r--r-- | sage-on-gentoo.txt | 1 | ||||
| -rw-r--r-- | salfter.html | 136 | ||||
| -rw-r--r-- | salfter.txt | 1 | ||||
| -rw-r--r-- | sam_c.html | 44 | ||||
| -rw-r--r-- | sam_c.txt | 1 | ||||
| -rw-r--r-- | sarnex-overlay.html | 44 | ||||
| -rw-r--r-- | sarnex-overlay.txt | 1 | ||||
| -rw-r--r-- | sattvik.html | 44 | ||||
| -rw-r--r-- | sattvik.txt | 1 | ||||
| -rw-r--r-- | science.html | 44 | ||||
| -rw-r--r-- | science.txt | 1 | ||||
| -rw-r--r-- | scrill.html | 44 | ||||
| -rw-r--r-- | scrill.txt | 1 | ||||
| -rw-r--r-- | seadep.html | 46 | ||||
| -rw-r--r-- | seadep.txt | 1 | ||||
| -rw-r--r-- | seden.html | 44 | ||||
| -rw-r--r-- | seden.txt | 1 | ||||
| -rw-r--r-- | seeds.html | 66 | ||||
| -rw-r--r-- | seeds.txt | 1 | ||||
| -rw-r--r-- | setkeh.html | 44 | ||||
| -rw-r--r-- | setkeh.txt | 1 | ||||
| -rw-r--r-- | sevcsik.html | 44 | ||||
| -rw-r--r-- | sevcsik.txt | 1 | ||||
| -rw-r--r-- | sft.html | 44 | ||||
| -rw-r--r-- | sft.txt | 1 | ||||
| -rw-r--r-- | sgs.html | 44 | ||||
| -rw-r--r-- | sgs.txt | 1 | ||||
| -rw-r--r-- | shnurise.html | 134 | ||||
| -rw-r--r-- | shnurise.txt | 1 | ||||
| -rw-r--r-- | sihnon.html | 44 | ||||
| -rw-r--r-- | sihnon.txt | 1 | ||||
| -rw-r--r-- | simonvanderveldt.html | 44 | ||||
| -rw-r--r-- | simonvanderveldt.txt | 1 | ||||
| -rw-r--r-- | sinustrom.html | 44 | ||||
| -rw-r--r-- | sinustrom.txt | 1 | ||||
| -rw-r--r-- | sk-overlay.html | 44 | ||||
| -rw-r--r-- | sk-overlay.txt | 1 | ||||
| -rw-r--r-- | slonko.html | 44 | ||||
| -rw-r--r-- | slonko.txt | 1 | ||||
| -rw-r--r-- | slyfox.html | 44 | ||||
| -rw-r--r-- | slyfox.txt | 1 | ||||
| -rw-r--r-- | smaeul.html | 44 | ||||
| -rw-r--r-- | smaeul.txt | 1 | ||||
| -rw-r--r-- | swegener.html | 6 | ||||
| -rw-r--r-- | swegener.txt | 6 | ||||
| -rw-r--r-- | vayerx.html | 58 | ||||
| -rw-r--r-- | vayerx.txt | 1 | ||||
| -rw-r--r-- | vdr-devel.html | 44 | ||||
| -rw-r--r-- | vdr-devel.txt | 1 | ||||
| -rw-r--r-- | vifino-overlay.html | 44 | ||||
| -rw-r--r-- | vifino-overlay.txt | 1 | ||||
| -rw-r--r-- | vklimovs.html | 44 | ||||
| -rw-r--r-- | vklimovs.txt | 1 | ||||
| -rw-r--r-- | vmacs.html | 44 | ||||
| -rw-r--r-- | vmacs.txt | 1 | ||||
| -rw-r--r-- | wdzierzan.html | 44 | ||||
| -rw-r--r-- | wdzierzan.txt | 1 | ||||
| -rw-r--r-- | webos.html | 44 | ||||
| -rw-r--r-- | webos.txt | 1 | ||||
| -rw-r--r-- | weuxel.html | 44 | ||||
| -rw-r--r-- | weuxel.txt | 1 | ||||
| -rw-r--r-- | what4-java.html | 44 | ||||
| -rw-r--r-- | what4-java.txt | 1 | ||||
| -rw-r--r-- | wichtounet.html | 44 | ||||
| -rw-r--r-- | wichtounet.txt | 1 | ||||
| -rw-r--r-- | wine.html | 44 | ||||
| -rw-r--r-- | wine.txt | 1 | ||||
| -rw-r--r-- | xwing.html | 60 | ||||
| -rw-r--r-- | xwing.txt | 27 | ||||
| -rw-r--r-- | zugaina.html | 4 | ||||
| -rw-r--r-- | zugaina.txt | 4 |
103 files changed, 1338 insertions, 1341 deletions
diff --git a/R_Overlay.html b/R_Overlay.html index 020e4ec564df..e023ebdf28d6 100644 --- a/R_Overlay.html +++ b/R_Overlay.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: 17.61K + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Total bytes sent: 17.59K </pre></td></tr> <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Total bytes received: 2.62M </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 17.61K bytes received 2.62M bytes 1.76M bytes/sec + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>sent 17.59K bytes received 2.62M bytes 1.76M bytes/sec </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>total size is 61.12M speedup is 23.18 </pre></td></tr> diff --git a/R_Overlay.txt b/R_Overlay.txt index 033d521eb589..37b96f3fccec 100644 --- a/R_Overlay.txt +++ b/R_Overlay.txt @@ -21,10 +21,10 @@ Matched data: 0 bytes File list size: 2.35M File list generation time: 0.001 seconds File list transfer time: 0.000 seconds -Total bytes sent: 17.61K +Total bytes sent: 17.59K Total bytes received: 2.62M -sent 17.61K bytes received 2.62M bytes 1.76M bytes/sec +sent 17.59K bytes received 2.62M bytes 1.76M bytes/sec total size is 61.12M speedup is 23.18 *** syncing R_Overlay *** synced R_Overlay diff --git a/dm9pZCAq.html b/dm9pZCAq.html index 9ad502d94a15..acf96f17a10e 100644 --- a/dm9pZCAq.html +++ b/dm9pZCAq.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 dm9pZCAq </pre></td></tr> - <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>WARNING:pkgcore:cynede repo at '/var/lib/repo-mirror-ci/sync/cynede', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). + <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <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 + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <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 + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <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, + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <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 + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Already up to date. </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>*** syncing dm9pZCAq </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** syncing dm9pZCAq + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** synced dm9pZCAq </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced dm9pZCAq + <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 dm9pZCAq </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 dm9pZCAq -</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/dm9pZCAq.txt b/dm9pZCAq.txt index 21f3a91a03b9..811950b4f272 100644 --- a/dm9pZCAq.txt +++ b/dm9pZCAq.txt @@ -8,7 +8,6 @@ 'uri': 'https://notabug.org/dm9pZCAq/dm9pZCAq-overlay.git'}], 'status': 'unofficial'} $ pmaint sync dm9pZCAq -WARNING:pkgcore:cynede repo at '/var/lib/repo-mirror-ci/sync/cynede', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). 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: diff --git a/dmchurch.html b/dmchurch.html index b06ed7e23b07..bfe6d865f129 100644 --- a/dmchurch.html +++ b/dmchurch.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 dmchurch </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:cynede repo at '/var/lib/repo-mirror-ci/sync/cynede', 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>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <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 + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <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 + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only + <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>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <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 + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <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, + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <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 + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. + <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> + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing dmchurch </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** syncing dmchurch + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced dmchurch </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced dmchurch + <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 dmchurch </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 dmchurch -</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/dmchurch.txt b/dmchurch.txt index 20c9a8feb418..9b4af70e302f 100644 --- a/dmchurch.txt +++ b/dmchurch.txt @@ -14,7 +14,6 @@ 'uri': 'git@github.com:dmchurch/portage-overlay.git'}], 'status': 'unofficial'} $ pmaint sync dmchurch -WARNING:pkgcore:cynede repo at '/var/lib/repo-mirror-ci/sync/cynede', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). 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: diff --git a/index.html b/index.html index 46c1eb36a9dd..1b382f05a6bc 100644 --- a/index.html +++ b/index.html @@ -919,7 +919,7 @@ </table> - <address>Generated based on results from 2021-03-03 02:51:46 UTC</address> + <address>Generated based on results from 2021-03-03 03:06:51 UTC</address> </body> </html>
\ No newline at end of file diff --git a/quarks.html b/quarks.html index 5a12be63e2fb..ab56350dddfa 100644 --- a/quarks.html +++ b/quarks.html @@ -32,25 +32,49 @@ </pre></td></tr> <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> 'status': 'unofficial'} </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> * Adding new repository + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync quarks </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync quarks + <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 </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>Cloning into '/var/lib/repo-mirror-ci/sync/quarks'... + <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 </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing quarks + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** synced quarks + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> * Sync succeeded + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ git log --format=%ci -1 + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 quarks + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> * Cache regenerated successfully + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default +</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, +</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 +</pre></td></tr> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. +</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>Already up to date. +</pre></td></tr> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing quarks +</pre></td></tr> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced quarks +</pre></td></tr> + <tr class="" id="l29"><td><a href="#l29"><span>29</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>$ git log --format=%ci -1 +</pre></td></tr> + <tr class="" id="l31"><td><a href="#l31"><span>31</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>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 quarks +</pre></td></tr> + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> diff --git a/quarks.txt b/quarks.txt index 6ec35b55bd27..0607b4823ac8 100644 --- a/quarks.txt +++ b/quarks.txt @@ -9,9 +9,21 @@ 'source': [{'type': 'git', 'uri': 'https://git.zero-downtime.net/quark/quarks.git'}], 'status': 'unofficial'} - * Adding new repository $ pmaint sync quarks -Cloning into '/var/lib/repo-mirror-ci/sync/quarks'... +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: + + 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. *** syncing quarks *** synced quarks * Sync succeeded diff --git a/rion.html b/rion.html index 5beb41afb56a..19868ea1c97d 100644 --- a/rion.html +++ b/rion.html @@ -40,63 +40,61 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync rion </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: + <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> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing rion </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing rion + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced rion </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced rion + <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> * Sync succeeded + <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 log --format=%ci -1 + <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>$ git show -q --pretty=format:%G? HEAD + <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 rion </pre></td></tr> - <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 rion -</pre></td></tr> - <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * app-text/makedict-0.4.1_beta1-r1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * app-text/makedict-0.4.1_beta1-r1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * app-text/makedict-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * app-text/makedict-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * app-text/rst2epub-20120114: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * app-text/rst2epub-20120114: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * app-text/rst2epub-99999999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * app-text/rst2epub-99999999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * dev-python/rcore-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * dev-python/rcore-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * net-misc/hermes-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * net-misc/hermes-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * sys-apps/openwsman-2.6.3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * sys-apps/openwsman-2.6.3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * Cache regen failed with 1 + <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * Cache regen failed with 1 </pre></td></tr> </table> @@ -13,7 +13,6 @@ 'uri': 'git+ssh://git@github.com/rion-overlay/rion-overlay.git'}], 'status': 'unofficial'} $ pmaint sync rion -WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). 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: diff --git a/robert7k.html b/robert7k.html index 3ee039fc1254..675b23b32ca4 100644 --- a/robert7k.html +++ b/robert7k.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 robert7k </pre></td></tr> - <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). + <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <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 + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <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 + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <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, + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <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 + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Already up to date. </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>*** syncing robert7k </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** syncing robert7k + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** synced robert7k </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced robert7k + <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 robert7k </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 robert7k -</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/robert7k.txt b/robert7k.txt index 9a59dd8d5c92..17abbe898dc3 100644 --- a/robert7k.txt +++ b/robert7k.txt @@ -8,7 +8,6 @@ 'uri': 'https://github.com/robert7k/gentoo-overlay.git'}], 'status': 'unofficial'} $ pmaint sync robert7k -WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). 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: diff --git a/robertgzr.html b/robertgzr.html index fa22b257dbfc..cba79ffd27c5 100644 --- a/robertgzr.html +++ b/robertgzr.html @@ -34,49 +34,47 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync robertgzr </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). + <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 </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <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 </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <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, </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <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 </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. + <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>Already up to date. </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing robertgzr </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing robertgzr + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced robertgzr </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced robertgzr + <tr class="" id="l29"><td><a href="#l29"><span>29</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> * Sync succeeded + <tr class="" id="l30"><td><a href="#l30"><span>30</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>$ git log --format=%ci -1 + <tr class="" id="l31"><td><a href="#l31"><span>31</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>$ git show -q --pretty=format:%G? HEAD + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 robertgzr </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 robertgzr -</pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> diff --git a/robertgzr.txt b/robertgzr.txt index f9b5106a5fed..03b7979c2aac 100644 --- a/robertgzr.txt +++ b/robertgzr.txt @@ -10,7 +10,6 @@ {'type': 'git', 'uri': 'ssh://git@git.sr.ht:~robertgzr/portage'}], 'status': 'unofficial'} $ pmaint sync robertgzr -WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). 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: diff --git a/roslin.html b/roslin.html index 58ea78ba555d..3e68acb2e230 100644 --- a/roslin.html +++ b/roslin.html @@ -38,49 +38,47 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync roslin </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <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> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing roslin </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing roslin + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced roslin </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced roslin + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1 </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1 + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD </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 + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 roslin </pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 roslin -</pre></td></tr> - <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully + <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> diff --git a/roslin.txt b/roslin.txt index b4be9b334ce2..149148c55215 100644 --- a/roslin.txt +++ b/roslin.txt @@ -12,7 +12,6 @@ 'uri': 'https://gitlab.com/roslin-uberlay/roslin.git'}], 'status': 'unofficial'} $ pmaint sync roslin -WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). 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: @@ -32,117 +32,115 @@ </pre></td></tr> <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync rpm </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). + <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 "git config" with "git config --global" 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 "git config" with "git config --global" 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>*** syncing rpm </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing rpm + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced rpm </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced rpm + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * Sync succeeded </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Sync succeeded + <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="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git log --format=%ci -1 + <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="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD + <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 rpm </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 rpm -</pre></td></tr> - <tr class="err" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * app-arch/rpm-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * app-arch/rpm-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * dev-python/bunch-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * dev-python/bunch-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * dev-python/cccolutils-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * dev-python/cccolutils-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * dev-python/copr-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * dev-python/copr-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * dev-python/dockerfile-parse-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * dev-python/dockerfile-parse-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * dev-python/kitchen-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * dev-python/kitchen-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * dev-python/kobo-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * dev-python/kobo-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * dev-python/marshmallow-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * dev-python/marshmallow-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * dev-python/munch-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * dev-python/munch-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * dev-python/offtrac-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * dev-python/offtrac-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * dev-python/osbs-client-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * dev-python/osbs-client-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * dev-python/pyroute2-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * dev-python/pyroute2-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * dev-python/python-bugzilla-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * dev-python/python-bugzilla-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * dev-python/python-fedora-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * dev-python/python-fedora-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * dev-python/python-krbV-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * dev-python/python-krbV-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * dev-python/python-ptrace-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * dev-python/python-ptrace-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * dev-python/repoze-who-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * dev-python/repoze-who-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * dev-python/repoze-who-friendlyform-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * dev-python/repoze-who-friendlyform-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * dev-python/requests-kerberos-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * dev-python/requests-kerberos-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * dev-python/urlgrabber-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * dev-python/urlgrabber-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * dev-util/bodhi-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * dev-util/bodhi-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * dev-util/centpkg-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * dev-util/centpkg-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * dev-util/copr-cli-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * dev-util/copr-cli-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * dev-util/fedora-packager-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * dev-util/fedora-packager-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * dev-util/fedora-review-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * dev-util/fedora-review-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * dev-util/fedpkg-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * dev-util/fedpkg-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * dev-util/koji-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * dev-util/koji-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * dev-util/mock-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * dev-util/mock-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * dev-util/packagedb-cli-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * dev-util/packagedb-cli-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> * dev-util/rebase-helper-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * dev-util/rebase-helper-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> * dev-util/rpkg-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> * dev-util/rpkg-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> * dev-util/rpmdevtools-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> * dev-util/rpmdevtools-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> * dev-util/rpmlint-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> * dev-util/rpmlint-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre> * dev-util/tito-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> * dev-util/tito-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre> * Cache regen failed with 1 + <tr class="" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre> * Cache regen failed with 1 </pre></td></tr> </table> @@ -9,7 +9,6 @@ 'source': [{'type': 'git', 'uri': 'https://github.com/pavlix/gentoo-rpm.git'}], 'status': 'unofficial'} $ pmaint sync rpm -WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). 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: diff --git a/ruby.html b/ruby.html index e906c751d21c..8b6173f4b67d 100644 --- a/ruby.html +++ b/ruby.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 ruby </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', 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>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <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 + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <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 + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only + <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>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <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 + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <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, + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <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 + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. + <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> + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing ruby </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** syncing ruby + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced ruby </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced ruby + <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 ruby </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 ruby -</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> @@ -14,7 +14,6 @@ 'uri': 'git+ssh://git@git.gentoo.org/proj/ruby-overlay.git'}], 'status': 'official'} $ pmaint sync ruby -WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). 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: diff --git a/rukruk.html b/rukruk.html index b25874570b00..512990584ad4 100644 --- a/rukruk.html +++ b/rukruk.html @@ -38,49 +38,47 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync rukruk </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <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> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing rukruk </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing rukruk + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced rukruk </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced rukruk + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1 </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1 + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD </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 + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 rukruk </pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 rukruk -</pre></td></tr> - <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully + <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> diff --git a/rukruk.txt b/rukruk.txt index 1fea219e63c2..78ef6a7e5884 100644 --- a/rukruk.txt +++ b/rukruk.txt @@ -12,7 +12,6 @@ {'type': 'git', 'uri': 'git@github.com:Atoms/rukruk.git'}], 'status': 'unofficial'} $ pmaint sync rukruk -WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). 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: diff --git a/rust.html b/rust.html index 9e72730f112a..5689f2347c4c 100644 --- a/rust.html +++ b/rust.html @@ -36,49 +36,47 @@ </pre></td></tr> <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync rust </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <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>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <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> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing rust </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing rust + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced rust </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced rust + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1 </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1 + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 rust </pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 rust -</pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> @@ -11,7 +11,6 @@ {'type': 'git', 'uri': 'git@github.com:gentoo/gentoo-rust.git'}], 'status': 'unofficial'} $ pmaint sync rust -WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). 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: diff --git a/ryans.html b/ryans.html index d32dfe988de6..774776c668ee 100644 --- a/ryans.html +++ b/ryans.html @@ -32,49 +32,47 @@ </pre></td></tr> <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync ryans </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). + <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 "git config" with "git config --global" 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 "git config" with "git config --global" 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>*** syncing ryans </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing ryans + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced ryans </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced ryans + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * Sync succeeded </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Sync succeeded + <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="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git log --format=%ci -1 + <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="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD + <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 ryans </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 ryans -</pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</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/ryans.txt b/ryans.txt index 67b4dbdd1486..7caf7588398c 100644 --- a/ryans.txt +++ b/ryans.txt @@ -9,7 +9,6 @@ {'type': 'git', 'uri': 'git@github.com:bekcpear/ryans-repos.git'}], 'status': 'unofficial'} $ pmaint sync ryans -WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). 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: diff --git a/sabayon-distro.html b/sabayon-distro.html index 1a9b1a588757..ebb5341c0fb5 100644 --- a/sabayon-distro.html +++ b/sabayon-distro.html @@ -36,105 +36,103 @@ </pre></td></tr> <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync sabayon-distro </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <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>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <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> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing sabayon-distro </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing sabayon-distro + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced sabayon-distro </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced sabayon-distro + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1 </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1 + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 sabayon-distro </pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 sabayon-distro -</pre></td></tr> - <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * app-crypt/pinentry-base-1.1.0-r2: failed sourcing ebuild: EAPI=6 is not supported + <tr class="err" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * app-crypt/pinentry-base-1.1.0-r2: failed sourcing ebuild: EAPI=6 is not supported </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * app-crypt/pinentry-qt5-1.1.0-r2: failed sourcing ebuild: EAPI=6 is not supported + <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * app-crypt/pinentry-qt5-1.1.0-r2: failed sourcing ebuild: EAPI=6 is not supported </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * app-text/pastebunz-1.4-r1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * app-text/pastebunz-1.4-r1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * dev-libs/libcec-raspberrypi-4.0.2-r1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * dev-libs/libcec-raspberrypi-4.0.2-r1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * dev-python/ccxt-1.10.475: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * dev-python/ccxt-1.10.475: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * dev-python/ccxt-1.10.707: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * dev-python/ccxt-1.10.707: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * dev-python/pygobject-cairo-3.24.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * dev-python/pygobject-cairo-3.24.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * dev-python/pygobject-cairo-3.28.3: failed sourcing ebuild: No supported implementations match python_gen_usedep patterns: python2_7 + <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * dev-python/pygobject-cairo-3.28.3: failed sourcing ebuild: No supported implementations match python_gen_usedep patterns: python2_7 </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * dev-python/shyaml-0.5.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * dev-python/shyaml-0.5.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * dev-python/shyaml-0.6.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * dev-python/shyaml-0.6.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * dev-vcs/subversion-1.12.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * dev-vcs/subversion-1.12.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * dev-vcs/subversion-1.12.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * dev-vcs/subversion-1.12.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * media-tv/kodi-raspberrypi-16.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * media-tv/kodi-raspberrypi-16.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * media-tv/kodi-raspberrypi-16.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * media-tv/kodi-raspberrypi-16.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * media-tv/kodi-raspberrypi-17.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * media-tv/kodi-raspberrypi-17.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * net-dns/avahi-mono-0.7-r3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * net-dns/avahi-mono-0.7-r3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * net-p2p/bittorrent-4.4.0-r5: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * net-p2p/bittorrent-4.4.0-r5: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * net-p2p/transmission-qt5-2.94: failed sourcing ebuild: EAPI=6 is not supported + <tr class="err" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * net-p2p/transmission-qt5-2.94: failed sourcing ebuild: EAPI=6 is not supported </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * sys-apps/portage-2.3.69: failed sourcing ebuild: No supported implementations match python_gen_usedep patterns: python2* + <tr class="err" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * sys-apps/portage-2.3.69: failed sourcing ebuild: No supported implementations match python_gen_usedep patterns: python2* </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * sys-boot/grub-0.97-r22: failed sourcing ebuild: mount-boot: EAPI 5 not supported + <tr class="err" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * sys-boot/grub-0.97-r22: failed sourcing ebuild: mount-boot: EAPI 5 not supported </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * x11-drivers/nvidia-drivers-390.116: failed sourcing ebuild: Unsupported EAPI=6 (too old) for nvidia-driver + <tr class="err" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * x11-drivers/nvidia-drivers-390.116: failed sourcing ebuild: Unsupported EAPI=6 (too old) for nvidia-driver </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * x11-drivers/nvidia-drivers-430.14: failed sourcing ebuild: Unsupported EAPI=6 (too old) for nvidia-driver + <tr class="err" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * x11-drivers/nvidia-drivers-430.14: failed sourcing ebuild: Unsupported EAPI=6 (too old) for nvidia-driver </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * x11-drivers/nvidia-drivers-430.26: failed sourcing ebuild: Unsupported EAPI=6 (too old) for nvidia-driver + <tr class="err" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * x11-drivers/nvidia-drivers-430.26: failed sourcing ebuild: Unsupported EAPI=6 (too old) for nvidia-driver </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * x11-drivers/nvidia-userspace-390.116: failed sourcing ebuild: Unsupported EAPI=6 (too old) for nvidia-driver + <tr class="err" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * x11-drivers/nvidia-userspace-390.116: failed sourcing ebuild: Unsupported EAPI=6 (too old) for nvidia-driver </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * x11-drivers/nvidia-userspace-430.14: failed sourcing ebuild: Unsupported EAPI=6 (too old) for nvidia-driver + <tr class="err" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * x11-drivers/nvidia-userspace-430.14: failed sourcing ebuild: Unsupported EAPI=6 (too old) for nvidia-driver </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * x11-drivers/nvidia-userspace-430.26: failed sourcing ebuild: Unsupported EAPI=6 (too old) for nvidia-driver + <tr class="err" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * x11-drivers/nvidia-userspace-430.26: failed sourcing ebuild: Unsupported EAPI=6 (too old) for nvidia-driver </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * x11-misc/lightdm-base-1.28.0: failed sourcing ebuild: EAPI=6 is not supported + <tr class="err" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * x11-misc/lightdm-base-1.28.0: failed sourcing ebuild: EAPI=6 is not supported </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> * x11-misc/lightdm-qt5-1.28.0: failed sourcing ebuild: EAPI=6 is not supported + <tr class="err" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * x11-misc/lightdm-qt5-1.28.0: failed sourcing ebuild: EAPI=6 is not supported </pre></td><td>[FATAL]</td></tr> - <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> * Cache regen failed with 1 + <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> * Cache regen failed with 1 </pre></td></tr> </table> diff --git a/sabayon-distro.txt b/sabayon-distro.txt index 1ef038555ab9..d890492481f1 100644 --- a/sabayon-distro.txt +++ b/sabayon-distro.txt @@ -11,7 +11,6 @@ 'uri': 'git://github.com/Sabayon/sabayon-distro.git'}], 'status': 'unofficial'} $ pmaint sync sabayon-distro -WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). 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: diff --git a/sabayon.html b/sabayon.html index 609bf40ca59e..1c2ce4960c9d 100644 --- a/sabayon.html +++ b/sabayon.html @@ -40,123 +40,121 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync sabayon </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: + <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> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing sabayon </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing sabayon + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced sabayon </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced sabayon + <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> * Sync succeeded + <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 log --format=%ci -1 + <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>$ git show -q --pretty=format:%G? HEAD + <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 sabayon </pre></td></tr> - <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 sabayon -</pre></td></tr> - <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * app-admin/authconfig-6.2.10: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * app-admin/authconfig-6.2.10: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * app-admin/authconfig-7.0.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * app-admin/authconfig-7.0.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * app-admin/authconfig-7.0.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * app-admin/authconfig-7.0.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * app-admin/equo-322: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * app-admin/equo-322: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * app-admin/equo-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * app-admin/equo-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * app-admin/matter-322: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * app-admin/matter-322: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * app-admin/rigo-320: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass + <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * app-admin/rigo-320: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * app-admin/rigo-322: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass + <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * app-admin/rigo-322: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * app-admin/rigo-323: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass + <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * app-admin/rigo-323: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * app-admin/rigo-324-r2: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass + <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * app-admin/rigo-324-r2: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * app-i18n/langtable-0.0.41: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * app-i18n/langtable-0.0.41: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * app-i18n/langtable-0.0.42: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * app-i18n/langtable-0.0.42: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * app-i18n/langtable-0.0.43: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * app-i18n/langtable-0.0.43: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * app-misc/kupfer-319: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * app-misc/kupfer-319: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * app-misc/magneto-loader-320: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * app-misc/magneto-loader-320: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * app-misc/magneto-loader-322: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * app-misc/magneto-loader-322: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * dev-python/oursql-0.9.3.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * dev-python/oursql-0.9.3.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * dev-python/pylons-1.0.1-r3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * dev-python/pylons-1.0.1-r3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * kde-misc/magneto-kde-320: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * kde-misc/magneto-kde-320: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * kde-misc/magneto-kde-322: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * kde-misc/magneto-kde-322: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * media-sound/idjc-0.8.14: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * media-sound/idjc-0.8.14: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * net-libs/libturpial-1.7.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * net-libs/libturpial-1.7.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * net-libs/libturpial-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * net-libs/libturpial-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * sys-apps/entropy-322: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * sys-apps/entropy-322: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * sys-apps/entropy-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * sys-apps/entropy-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> * sys-apps/entropy-server-322: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * sys-apps/entropy-server-322: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> * sys-apps/entropy-server-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> * sys-apps/entropy-server-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> * sys-apps/magneto-core-320: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> * sys-apps/magneto-core-320: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> * sys-apps/magneto-core-322: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> * sys-apps/magneto-core-322: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre> * sys-apps/rigo-daemon-320: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> * sys-apps/rigo-daemon-320: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre> * sys-apps/rigo-daemon-322: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre> * sys-apps/rigo-daemon-322: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre> * x11-misc/magneto-gtk-320: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre> * x11-misc/magneto-gtk-320: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre> * x11-misc/magneto-gtk-322: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre> * x11-misc/magneto-gtk-322: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l70"><td><a href="#l70"><span>70</span></a></td><td><pre> * x11-misc/magneto-gtk-323: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre> * x11-misc/magneto-gtk-323: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l71"><td><a href="#l71"><span>71</span></a></td><td><pre> * x11-misc/magneto-gtk-324-r2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l70"><td><a href="#l70"><span>70</span></a></td><td><pre> * x11-misc/magneto-gtk-324-r2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l72"><td><a href="#l72"><span>72</span></a></td><td><pre> * x11-misc/magneto-gtk3-320: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l71"><td><a href="#l71"><span>71</span></a></td><td><pre> * x11-misc/magneto-gtk3-320: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l73"><td><a href="#l73"><span>73</span></a></td><td><pre> * x11-misc/magneto-gtk3-322: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l72"><td><a href="#l72"><span>72</span></a></td><td><pre> * x11-misc/magneto-gtk3-322: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="" id="l74"><td><a href="#l74"><span>74</span></a></td><td><pre> * Cache regen failed with 1 + <tr class="" id="l73"><td><a href="#l73"><span>73</span></a></td><td><pre> * Cache regen failed with 1 </pre></td></tr> </table> diff --git a/sabayon.txt b/sabayon.txt index 0b0ed19b4118..46988fa95e81 100644 --- a/sabayon.txt +++ b/sabayon.txt @@ -13,7 +13,6 @@ 'source': [{'type': 'git', 'uri': 'git://github.com/Sabayon/for-gentoo.git'}], 'status': 'unofficial'} $ pmaint sync sabayon -WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). 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: diff --git a/sage-on-gentoo.html b/sage-on-gentoo.html index c446aaaf460a..958956abd043 100644 --- a/sage-on-gentoo.html +++ b/sage-on-gentoo.html @@ -38,49 +38,47 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync sage-on-gentoo </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <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> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing sage-on-gentoo </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing sage-on-gentoo + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced sage-on-gentoo </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced sage-on-gentoo + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1 </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1 + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD </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 + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 sage-on-gentoo </pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 sage-on-gentoo -</pre></td></tr> - <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully + <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> diff --git a/sage-on-gentoo.txt b/sage-on-gentoo.txt index 2f06d97f3ba2..b3c884f1a4ad 100644 --- a/sage-on-gentoo.txt +++ b/sage-on-gentoo.txt @@ -12,7 +12,6 @@ 'uri': 'https://github.com/cschwan/sage-on-gentoo.git'}], 'status': 'unofficial'} $ pmaint sync sage-on-gentoo -WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). 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: diff --git a/salfter.html b/salfter.html index 995bdfe552db..b2ef1bc3337a 100644 --- a/salfter.html +++ b/salfter.html @@ -30,141 +30,139 @@ </pre></td></tr> <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>$ pmaint sync salfter </pre></td></tr> - <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). + <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <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 + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <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 + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <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, + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <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 + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Already up to date. </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>*** syncing salfter </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** syncing salfter + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** synced salfter </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced salfter + <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 salfter </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 salfter -</pre></td></tr> - <tr class="err" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * app-accessibility/onboard-1.4.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * app-accessibility/onboard-1.4.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * dev-libs/libarcus-3.6.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * dev-libs/libarcus-3.6.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * dev-libs/libarcus-4.0.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * dev-libs/libarcus-4.0.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * dev-libs/libcharon-3.6.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * dev-libs/libcharon-3.6.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * dev-libs/libcharon-4.0.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * dev-libs/libcharon-4.0.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * dev-python/ProfitLib-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * dev-python/ProfitLib-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * dev-python/PyCCEX-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * dev-python/PyCCEX-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * dev-python/PyCryptopia-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * dev-python/PyCryptopia-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * dev-python/PyCryptsy-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * dev-python/PyCryptsy-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * dev-python/bitcoin-abe-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * dev-python/bitcoin-abe-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * dev-python/bleuBot-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * dev-python/bleuBot-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * dev-python/boto_utils-0.3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * dev-python/boto_utils-0.3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * dev-python/cython-hidapi-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * dev-python/cython-hidapi-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * dev-python/docopts-0.6.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * dev-python/docopts-0.6.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * dev-python/filetype-1.0.5: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * dev-python/filetype-1.0.5: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * dev-python/flask-assets-0.10: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * dev-python/flask-assets-0.10: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * dev-python/imap-cli-0.8: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * dev-python/imap-cli-0.8: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * dev-python/jsonrpc-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * dev-python/jsonrpc-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * dev-python/litecoin_scrypt-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * dev-python/litecoin_scrypt-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * dev-python/poloniex-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * dev-python/poloniex-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * dev-python/pybitcoin-0.9.9: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * dev-python/pybitcoin-0.9.9: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * dev-python/pycgminer-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * dev-python/pycgminer-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * dev-python/pycoin-0.80: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * dev-python/pycoin-0.80: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * dev-python/pylcdsysinfo-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * dev-python/pylcdsysinfo-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * dev-python/python-bitcoinrpc-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * dev-python/python-bitcoinrpc-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * dev-python/python-bittrex-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * dev-python/python-bittrex-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * dev-python/python-mnemonic-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * dev-python/python-mnemonic-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * dev-python/python-nmap-0.6.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * dev-python/python-nmap-0.6.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * dev-python/python-pushover-0.3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * dev-python/python-pushover-0.3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * dev-python/python-sane-2.8.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * dev-python/python-sane-2.8.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> * dev-python/savitar-3.6.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * dev-python/savitar-3.6.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> * dev-python/savitar-4.0.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> * dev-python/savitar-4.0.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> * dev-python/typing-3.6.6: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> * dev-python/typing-3.6.6: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> * dev-python/uranium-3.6.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> * dev-python/uranium-3.6.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre> * dev-python/uranium-4.0.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> * dev-python/uranium-4.0.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre> * dev-vcs/gitmon-0.3.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre> * dev-vcs/gitmon-0.3.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre> * media-gfx/cura-3.6.0: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass + <tr class="err" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre> * media-gfx/cura-3.6.0: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre> * media-gfx/cura-4.0.0: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass + <tr class="err" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre> * media-gfx/cura-4.0.0: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l70"><td><a href="#l70"><span>70</span></a></td><td><pre> * media-sound/pykaraoke-0.7.5: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre> * media-sound/pykaraoke-0.7.5: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l71"><td><a href="#l71"><span>71</span></a></td><td><pre> * media-tv/mythtv-0.28.1-r4: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l70"><td><a href="#l70"><span>70</span></a></td><td><pre> * media-tv/mythtv-0.28.1-r4: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l72"><td><a href="#l72"><span>72</span></a></td><td><pre> * net-fs/greyhole-0.10.14: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l71"><td><a href="#l71"><span>71</span></a></td><td><pre> * net-fs/greyhole-0.10.14: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l73"><td><a href="#l73"><span>73</span></a></td><td><pre> * sci-biology/fah-control-7.5.1-r8: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l72"><td><a href="#l72"><span>72</span></a></td><td><pre> * sci-biology/fah-control-7.5.1-r8: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l74"><td><a href="#l74"><span>74</span></a></td><td><pre> * sci-electronics/apio-0.5.4: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l73"><td><a href="#l73"><span>73</span></a></td><td><pre> * sci-electronics/apio-0.5.4: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l75"><td><a href="#l75"><span>75</span></a></td><td><pre> * sci-electronics/boms-away-20171029: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l74"><td><a href="#l74"><span>74</span></a></td><td><pre> * sci-electronics/boms-away-20171029: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l76"><td><a href="#l76"><span>76</span></a></td><td><pre> * sci-electronics/kifield-0.1.12: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l75"><td><a href="#l75"><span>75</span></a></td><td><pre> * sci-electronics/kifield-0.1.12: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l77"><td><a href="#l77"><span>77</span></a></td><td><pre> * sci-libs/Shapely-1.6.4: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l76"><td><a href="#l76"><span>76</span></a></td><td><pre> * sci-libs/Shapely-1.6.4: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="" id="l78"><td><a href="#l78"><span>78</span></a></td><td><pre> * Cache regen failed with 1 + <tr class="" id="l77"><td><a href="#l77"><span>77</span></a></td><td><pre> * Cache regen failed with 1 </pre></td></tr> </table> diff --git a/salfter.txt b/salfter.txt index cd7dee779baf..b850aae9995c 100644 --- a/salfter.txt +++ b/salfter.txt @@ -8,7 +8,6 @@ 'source': [{'type': 'git', 'uri': 'https://gitlab.com/salfter/portage.git'}], 'status': 'unofficial'} $ pmaint sync salfter -WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). 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: diff --git a/sam_c.html b/sam_c.html index e546dea7a33e..6597e2d3d9fc 100644 --- a/sam_c.html +++ b/sam_c.html @@ -32,49 +32,47 @@ </pre></td></tr> <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync sam_c </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). + <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 "git config" with "git config --global" 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 "git config" with "git config --global" 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>*** syncing sam_c </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing sam_c + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced sam_c </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced sam_c + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * Sync succeeded </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Sync succeeded + <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="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git log --format=%ci -1 + <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="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD + <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 sam_c </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 sam_c -</pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</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/sam_c.txt b/sam_c.txt index 19866c2e717b..614fad37f6e7 100644 --- a/sam_c.txt +++ b/sam_c.txt @@ -9,7 +9,6 @@ 'uri': 'git+ssh://git@github.com/thesamesam/overlay.git'}], 'status': 'unofficial'} $ pmaint sync sam_c -WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). 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: diff --git a/sarnex-overlay.html b/sarnex-overlay.html index 0ea6617c6590..70ca451cc35b 100644 --- a/sarnex-overlay.html +++ b/sarnex-overlay.html @@ -38,49 +38,47 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync sarnex-overlay </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <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> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing sarnex-overlay </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing sarnex-overlay + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced sarnex-overlay </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced sarnex-overlay + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1 </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1 + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD </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 + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 sarnex-overlay </pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 sarnex-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="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> diff --git a/sarnex-overlay.txt b/sarnex-overlay.txt index e4c593fbd9fc..6ae703c2bba8 100644 --- a/sarnex-overlay.txt +++ b/sarnex-overlay.txt @@ -12,7 +12,6 @@ 'uri': 'git+ssh://git@github.com/sarnex/sarnex-overlay.git'}], 'status': 'unofficial'} $ pmaint sync sarnex-overlay -WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). 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: diff --git a/sattvik.html b/sattvik.html index a3eff8323a36..ab9f5ab0a465 100644 --- a/sattvik.html +++ b/sattvik.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 sattvik </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', 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>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <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 + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <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 + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only + <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>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <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 + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <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, + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <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 + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. + <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> + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing sattvik </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** syncing sattvik + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced sattvik </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced sattvik + <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 sattvik </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 sattvik -</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/sattvik.txt b/sattvik.txt index 0c45bc91a01c..581503012cd5 100644 --- a/sattvik.txt +++ b/sattvik.txt @@ -14,7 +14,6 @@ 'uri': 'git+ssh://git@git.gentoo.org/user/sattvik.git'}], 'status': 'unofficial'} $ pmaint sync sattvik -WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). 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: diff --git a/science.html b/science.html index 1f7dbc7dc72c..902bde2fdd03 100644 --- a/science.html +++ b/science.html @@ -66,49 +66,47 @@ </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>$ pmaint sync science </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> </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>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>invocation. + <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> + <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>Already up to date. </pre></td></tr> - <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>Already up to date. + <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>*** syncing science </pre></td></tr> - <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>*** syncing science + <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>*** synced science </pre></td></tr> - <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>*** synced science + <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * Sync succeeded </pre></td></tr> - <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * Sync succeeded + <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>$ git log --format=%ci -1 </pre></td></tr> - <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>$ git log --format=%ci -1 + <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD </pre></td></tr> - <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD + <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 science </pre></td></tr> - <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 science -</pre></td></tr> - <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * Cache regenerated successfully + <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> diff --git a/science.txt b/science.txt index 48638d50046d..e83db5e377e4 100644 --- a/science.txt +++ b/science.txt @@ -26,7 +26,6 @@ {'type': 'git', 'uri': 'git@github.com:gentoo-science/sci.git'}], 'status': 'official'} $ pmaint sync science -WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). 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: diff --git a/scrill.html b/scrill.html index 5a844e91456d..38018e5966fa 100644 --- a/scrill.html +++ b/scrill.html @@ -34,49 +34,47 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync scrill </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). + <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 </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <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 </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <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, </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <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 </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. + <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>Already up to date. </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing scrill </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing scrill + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced scrill </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced scrill + <tr class="" id="l29"><td><a href="#l29"><span>29</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> * Sync succeeded + <tr class="" id="l30"><td><a href="#l30"><span>30</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>$ git log --format=%ci -1 + <tr class="" id="l31"><td><a href="#l31"><span>31</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>$ git show -q --pretty=format:%G? HEAD + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 scrill </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 scrill -</pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> diff --git a/scrill.txt b/scrill.txt index 7f21e8271c89..21334707b84f 100644 --- a/scrill.txt +++ b/scrill.txt @@ -10,7 +10,6 @@ 'uri': 'git://github.com/scrill/scrill-overlay.git'}], 'status': 'unofficial'} $ pmaint sync scrill -WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). 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: diff --git a/seadep.html b/seadep.html index 3a14d0158ff1..1c53e483fe0e 100644 --- a/seadep.html +++ b/seadep.html @@ -42,51 +42,49 @@ </pre></td></tr> <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync seadep </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', 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>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <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 + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <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 + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only + <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>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <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 + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <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, + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <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 + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. + <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> + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing seadep </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** syncing seadep + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced seadep </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced seadep + <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 seadep </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 seadep -</pre></td></tr> - <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * gnome-extra/gnome-twitch-0.4.1: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass + <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * gnome-extra/gnome-twitch-0.4.1: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass </pre></td><td>[FATAL]</td></tr> - <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Cache regen failed with 1 + <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regen failed with 1 </pre></td></tr> </table> diff --git a/seadep.txt b/seadep.txt index 029de94316ec..3f05fbd9ba41 100644 --- a/seadep.txt +++ b/seadep.txt @@ -14,7 +14,6 @@ 'uri': 'git@github.com:Keepco/gentoo-overlay-seadep.git'}], 'status': 'unofficial'} $ pmaint sync seadep -WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). 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: diff --git a/seden.html b/seden.html index bd42fb50353c..56f1b405e6eb 100644 --- a/seden.html +++ b/seden.html @@ -40,49 +40,47 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync seden </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: + <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> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing seden </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing seden + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced seden </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced seden + <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> * Sync succeeded + <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 log --format=%ci -1 + <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>$ git show -q --pretty=format:%G? HEAD + <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 seden </pre></td></tr> - <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 seden -</pre></td></tr> - <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully + <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> diff --git a/seden.txt b/seden.txt index d6c8048d2b94..6e0265477a73 100644 --- a/seden.txt +++ b/seden.txt @@ -13,7 +13,6 @@ 'uri': 'git+ssh://git@git.gentoo.org/user/seden.git'}], 'status': 'unofficial'} $ pmaint sync seden -WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). 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: diff --git a/seeds.html b/seeds.html index e52d35095b1b..177eae8b1d25 100644 --- a/seeds.html +++ b/seeds.html @@ -32,71 +32,69 @@ </pre></td></tr> <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync seeds </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). + <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 "git config" with "git config --global" 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 "git config" with "git config --global" 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>*** syncing seeds </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing seeds + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced seeds </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced seeds + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * Sync succeeded </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Sync succeeded + <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="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git log --format=%ci -1 + <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="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD + <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 seeds </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 seeds -</pre></td></tr> - <tr class="err" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * dev-python/ewmh-0.1.5-r1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * dev-python/ewmh-0.1.5-r1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * dev-python/ewmh-0.1.6: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * dev-python/ewmh-0.1.6: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * dev-python/petsc4py-3.5: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * dev-python/petsc4py-3.5: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * media-sound/deadbeef-0.6.1: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass + <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * media-sound/deadbeef-0.6.1: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * media-sound/deadbeef-0.7.0: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass + <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * media-sound/deadbeef-0.7.0: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * media-sound/deadbeef-0.7.2: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass + <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * media-sound/deadbeef-0.7.2: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * net-libs/gupnp-0.20.10: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * net-libs/gupnp-0.20.10: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * sci-mathematics/petsc-3.5.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * sci-mathematics/petsc-3.5.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * x11-misc/caffeine-2.9.3-r1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * x11-misc/caffeine-2.9.3-r1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * x11-misc/caffeine-2.9.3-r2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * x11-misc/caffeine-2.9.3-r2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * x11-misc/caffeine-2.9.4: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * x11-misc/caffeine-2.9.4: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * Cache regen failed with 1 + <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * Cache regen failed with 1 </pre></td></tr> </table> diff --git a/seeds.txt b/seeds.txt index f72e0f2f804e..7293afb7c235 100644 --- a/seeds.txt +++ b/seeds.txt @@ -9,7 +9,6 @@ 'source': [{'type': 'git', 'uri': 'git://github.com/vonavi/seeds.git'}], 'status': 'unofficial'} $ pmaint sync seeds -WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). 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: diff --git a/setkeh.html b/setkeh.html index 5b37714ab1b7..207bc70bc94c 100644 --- a/setkeh.html +++ b/setkeh.html @@ -38,49 +38,47 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync setkeh </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <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> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing setkeh </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing setkeh + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced setkeh </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced setkeh + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1 </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1 + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD </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 + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 setkeh </pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 setkeh -</pre></td></tr> - <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully + <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> diff --git a/setkeh.txt b/setkeh.txt index 698885c9ab30..ee19a8c98f18 100644 --- a/setkeh.txt +++ b/setkeh.txt @@ -12,7 +12,6 @@ 'uri': 'git+ssh://git@github.com:setkeh/Portage-Overlay.git'}], 'status': 'unofficial'} $ pmaint sync setkeh -WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). 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: diff --git a/sevcsik.html b/sevcsik.html index 5e84bf4c2695..81f0501fcf35 100644 --- a/sevcsik.html +++ b/sevcsik.html @@ -36,49 +36,47 @@ </pre></td></tr> <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync sevcsik </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <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>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <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> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing sevcsik </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing sevcsik + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced sevcsik </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced sevcsik + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1 </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1 + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 sevcsik </pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 sevcsik -</pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> diff --git a/sevcsik.txt b/sevcsik.txt index 0e81d6437964..d35627a493be 100644 --- a/sevcsik.txt +++ b/sevcsik.txt @@ -11,7 +11,6 @@ {'type': 'git', 'uri': 'git@github.com:sevcsik/overlay.git'}], 'status': 'unofficial'} $ pmaint sync sevcsik -WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). 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: @@ -34,49 +34,47 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync sft </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). + <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 </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <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 </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <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, </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <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 </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. + <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>Already up to date. </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing sft </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing sft + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced sft </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced sft + <tr class="" id="l29"><td><a href="#l29"><span>29</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> * Sync succeeded + <tr class="" id="l30"><td><a href="#l30"><span>30</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>$ git log --format=%ci -1 + <tr class="" id="l31"><td><a href="#l31"><span>31</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>$ git show -q --pretty=format:%G? HEAD + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 sft </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 sft -</pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> @@ -10,7 +10,6 @@ 'uri': 'https://github.com/SFTtech/gentoo-overlay.git'}], 'status': 'unofficial'} $ pmaint sync sft -WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). 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: @@ -38,49 +38,47 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync sgs </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <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> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing sgs </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing sgs + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced sgs </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced sgs + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1 </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1 + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD </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 + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 sgs </pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 sgs -</pre></td></tr> - <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully + <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> @@ -12,7 +12,6 @@ 'uri': 'git+ssh://git@github.com:blackm0re/sgs-overlay.git'}], 'status': 'unofficial'} $ pmaint sync sgs -WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). 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: diff --git a/shnurise.html b/shnurise.html index 6f00e7b7136c..c9f6e3ae4b35 100644 --- a/shnurise.html +++ b/shnurise.html @@ -44,139 +44,137 @@ </pre></td></tr> <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync shnurise </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). + <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>*** syncing shnurise </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** syncing shnurise + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced shnurise </pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>*** synced shnurise + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded </pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Sync succeeded + <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 log --format=%ci -1 + <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>$ git show -q --pretty=format:%G? HEAD + <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 shnurise </pre></td></tr> - <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 shnurise -</pre></td></tr> - <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * dev-db/sharphsql-1.4-r20150714: failed sourcing ebuild: this eclass doesn't support EAPI-5 + <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * dev-db/sharphsql-1.4-r20150714: failed sourcing ebuild: this eclass doesn't support EAPI-5 </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * dev-dotnet/antlr3-runtime-3.1.3-r1: failed sourcing ebuild: this eclass doesn't support EAPI-6 + <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * dev-dotnet/antlr3-runtime-3.1.3-r1: failed sourcing ebuild: this eclass doesn't support EAPI-6 </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * dev-dotnet/antlr3-runtime-3.5.2_beta1_p2017080216-r3: failed sourcing ebuild: this eclass doesn't support EAPI-6 + <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * dev-dotnet/antlr3-runtime-3.5.2_beta1_p2017080216-r3: failed sourcing ebuild: this eclass doesn't support EAPI-6 </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * dev-dotnet/aspnetwebstack-2014.10.27: failed sourcing ebuild: this eclass doesn't support EAPI-5 + <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * dev-dotnet/aspnetwebstack-2014.10.27: failed sourcing ebuild: this eclass doesn't support EAPI-5 </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * dev-dotnet/autofac-configuration-3.5.2: failed sourcing ebuild: this eclass doesn't support EAPI-6 + <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * dev-dotnet/autofac-configuration-3.5.2: failed sourcing ebuild: this eclass doesn't support EAPI-6 </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * dev-dotnet/autofac-web-3.0.0.0-r1: failed sourcing ebuild: this eclass doesn't support EAPI-6 + <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * dev-dotnet/autofac-web-3.0.0.0-r1: failed sourcing ebuild: this eclass doesn't support EAPI-6 </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * dev-dotnet/castle-core-1.2.0-r2: failed sourcing ebuild: this eclass doesn't support EAPI-6 + <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * dev-dotnet/castle-core-1.2.0-r2: failed sourcing ebuild: this eclass doesn't support EAPI-6 </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * dev-dotnet/castle-core-4.0.0_beta1-r1: failed sourcing ebuild: this eclass doesn't support EAPI-6 + <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * dev-dotnet/castle-core-4.0.0_beta1-r1: failed sourcing ebuild: this eclass doesn't support EAPI-6 </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * dev-dotnet/cecil-0.10_beta7_p2018031901-r1: failed sourcing ebuild: this eclass doesn't support EAPI-6 + <tr class="err" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * dev-dotnet/cecil-0.10_beta7_p2018031901-r1: failed sourcing ebuild: this eclass doesn't support EAPI-6 </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * dev-dotnet/fluent-nhibernate-2.0.2-r1: failed sourcing ebuild: this eclass doesn't support EAPI-6 + <tr class="err" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * dev-dotnet/fluent-nhibernate-2.0.2-r1: failed sourcing ebuild: this eclass doesn't support EAPI-6 </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * dev-dotnet/htmlparsersharp-1.0.0.0-r20150614: failed sourcing ebuild: this eclass doesn't support EAPI-5 + <tr class="err" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * dev-dotnet/htmlparsersharp-1.0.0.0-r20150614: failed sourcing ebuild: this eclass doesn't support EAPI-5 </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * dev-dotnet/icsharpcode-nrefactory-5.5.1: failed sourcing ebuild: this eclass doesn't support EAPI-6 + <tr class="err" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * dev-dotnet/icsharpcode-nrefactory-5.5.1: failed sourcing ebuild: this eclass doesn't support EAPI-6 </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * dev-dotnet/irony-daxnet-1.0.0_p2017083101: failed sourcing ebuild: this eclass doesn't support EAPI-6 + <tr class="err" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * dev-dotnet/irony-daxnet-1.0.0_p2017083101: failed sourcing ebuild: this eclass doesn't support EAPI-6 </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * dev-dotnet/microsoft-extensions-commandlineutils-2.3.4: failed sourcing ebuild: this eclass doesn't support EAPI-6 + <tr class="err" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * dev-dotnet/microsoft-extensions-commandlineutils-2.3.4: failed sourcing ebuild: this eclass doesn't support EAPI-6 </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * dev-dotnet/nhibernate-4.1.1: failed sourcing ebuild: this eclass doesn't support EAPI-6 + <tr class="err" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * dev-dotnet/nhibernate-4.1.1: failed sourcing ebuild: this eclass doesn't support EAPI-6 </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * dev-dotnet/nhibernate-core-3.3.4-r2: failed sourcing ebuild: this eclass doesn't support EAPI-6 + <tr class="err" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * dev-dotnet/nhibernate-core-3.3.4-r2: failed sourcing ebuild: this eclass doesn't support EAPI-6 </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * dev-dotnet/nhibernate-core-5.0.0-r2: failed sourcing ebuild: this eclass doesn't support EAPI-6 + <tr class="err" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * dev-dotnet/nhibernate-core-5.0.0-r2: failed sourcing ebuild: this eclass doesn't support EAPI-6 </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * dev-dotnet/nhibernate-iesi-collections-4.0.2-r2: failed sourcing ebuild: this eclass doesn't support EAPI-6 + <tr class="err" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * dev-dotnet/nhibernate-iesi-collections-4.0.2-r2: failed sourcing ebuild: this eclass doesn't support EAPI-6 </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * dev-dotnet/nhibernate-linq-1.0.0.0_p2010050601-r1: failed sourcing ebuild: this eclass doesn't support EAPI-6 + <tr class="err" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * dev-dotnet/nhibernate-linq-1.0.0.0_p2010050601-r1: failed sourcing ebuild: this eclass doesn't support EAPI-6 </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * dev-dotnet/npgsql-3.1.6-r2: failed sourcing ebuild: this eclass doesn't support EAPI-6 + <tr class="err" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * dev-dotnet/npgsql-3.1.6-r2: failed sourcing ebuild: this eclass doesn't support EAPI-6 </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * dev-dotnet/npgsql-4.0.4: failed sourcing ebuild: this eclass doesn't support EAPI-6 + <tr class="err" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * dev-dotnet/npgsql-4.0.4: failed sourcing ebuild: this eclass doesn't support EAPI-6 </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * dev-dotnet/pliant-0.4.2.1: failed sourcing ebuild: this eclass doesn't support EAPI-6 + <tr class="err" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * dev-dotnet/pliant-0.4.2.1: failed sourcing ebuild: this eclass doesn't support EAPI-6 </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * dev-dotnet/remotion-linq-2.1.2-r1: failed sourcing ebuild: this eclass doesn't support EAPI-6 + <tr class="err" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * dev-dotnet/remotion-linq-2.1.2-r1: failed sourcing ebuild: this eclass doesn't support EAPI-6 </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> * dev-dotnet/remotion-linq-eagerfetching-2.1.0-r1: failed sourcing ebuild: this eclass doesn't support EAPI-6 + <tr class="err" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * dev-dotnet/remotion-linq-eagerfetching-2.1.0-r1: failed sourcing ebuild: this eclass doesn't support EAPI-6 </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> * dev-dotnet/roslyn-tools-0.0.0_p2019011903: failed sourcing ebuild: this eclass doesn't support EAPI-6 + <tr class="err" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> * dev-dotnet/roslyn-tools-0.0.0_p2019011903: failed sourcing ebuild: this eclass doesn't support EAPI-6 </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> * dev-dotnet/slntools-1.1.3_p201508170-r2: failed sourcing ebuild: this eclass doesn't support EAPI-6 + <tr class="err" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> * dev-dotnet/slntools-1.1.3_p201508170-r2: failed sourcing ebuild: this eclass doesn't support EAPI-6 </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> * dev-gaclibs/Autopsy-Formats-PeCoff-1.0: failed sourcing ebuild: this eclass doesn't support EAPI-5 + <tr class="err" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> * dev-gaclibs/Autopsy-Formats-PeCoff-1.0: failed sourcing ebuild: this eclass doesn't support EAPI-5 </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre> * dev-gaclibs/github-api-0.0-r20150331: failed sourcing ebuild: this eclass doesn't support EAPI-5 + <tr class="err" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> * dev-gaclibs/github-api-0.0-r20150331: failed sourcing ebuild: this eclass doesn't support EAPI-5 </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre> * dev-lang/mono-patched-6.12.0.102: failed sourcing ebuild: versionator: banned in EAPI=7; use ver_* instead + <tr class="err" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre> * dev-lang/mono-patched-6.12.0.102: failed sourcing ebuild: versionator: banned in EAPI=7; use ver_* instead </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre> * dev-util/antlrcs-3.5.2_beta1_p2017080216-r1: failed sourcing ebuild: this eclass doesn't support EAPI 0..6 + <tr class="err" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre> * dev-util/antlrcs-3.5.2_beta1_p2017080216-r1: failed sourcing ebuild: this eclass doesn't support EAPI 0..6 </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre> * dev-util/asmspy-1.2.0: failed sourcing ebuild: this eclass doesn't support EAPI-6 + <tr class="err" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre> * dev-util/asmspy-1.2.0: failed sourcing ebuild: this eclass doesn't support EAPI-6 </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l70"><td><a href="#l70"><span>70</span></a></td><td><pre> * dev-util/gplex-dbremner-1.2.2_p2015112101-r1: failed sourcing ebuild: this eclass doesn't support EAPI-6 + <tr class="err" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre> * dev-util/gplex-dbremner-1.2.2_p2015112101-r1: failed sourcing ebuild: this eclass doesn't support EAPI-6 </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l71"><td><a href="#l71"><span>71</span></a></td><td><pre> * dev-util/gppg-dbremner-1.5.2_p2015112101-r1: failed sourcing ebuild: this eclass doesn't support EAPI-6 + <tr class="err" id="l70"><td><a href="#l70"><span>70</span></a></td><td><pre> * dev-util/gppg-dbremner-1.5.2_p2015112101-r1: failed sourcing ebuild: this eclass doesn't support EAPI-6 </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l72"><td><a href="#l72"><span>72</span></a></td><td><pre> * dev-util/monodevelop-5.9.5.9: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass + <tr class="err" id="l71"><td><a href="#l71"><span>71</span></a></td><td><pre> * dev-util/monodevelop-5.9.5.9: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l73"><td><a href="#l73"><span>73</span></a></td><td><pre> * dev-util/monodevelop-5.10.0.609: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass + <tr class="err" id="l72"><td><a href="#l72"><span>72</span></a></td><td><pre> * dev-util/monodevelop-5.10.0.609: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l74"><td><a href="#l74"><span>74</span></a></td><td><pre> * dev-util/monodevelop-5.10.3.51: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass + <tr class="err" id="l73"><td><a href="#l73"><span>73</span></a></td><td><pre> * dev-util/monodevelop-5.10.3.51: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l75"><td><a href="#l75"><span>75</span></a></td><td><pre> * dev-util/monodevelop-6.0.0.4761: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass + <tr class="err" id="l74"><td><a href="#l74"><span>74</span></a></td><td><pre> * dev-util/monodevelop-6.0.0.4761: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l76"><td><a href="#l76"><span>76</span></a></td><td><pre> * dev-util/monodevelop-6.1_p2016062206: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass + <tr class="err" id="l75"><td><a href="#l75"><span>75</span></a></td><td><pre> * dev-util/monodevelop-6.1_p2016062206: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l77"><td><a href="#l77"><span>77</span></a></td><td><pre> * dev-util/monodevelop-9999: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass + <tr class="err" id="l76"><td><a href="#l76"><span>76</span></a></td><td><pre> * dev-util/monodevelop-9999: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l78"><td><a href="#l78"><span>78</span></a></td><td><pre> * dev-util/naive-language-tools-1.13.11.16: failed sourcing ebuild: this eclass doesn't support EAPI-6 + <tr class="err" id="l77"><td><a href="#l77"><span>77</span></a></td><td><pre> * dev-util/naive-language-tools-1.13.11.16: failed sourcing ebuild: this eclass doesn't support EAPI-6 </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l79"><td><a href="#l79"><span>79</span></a></td><td><pre> * dev-util/nunit2-2.6.4_p2015011102-r2: failed sourcing ebuild: this eclass doesn't support EAPI-6 + <tr class="err" id="l78"><td><a href="#l78"><span>78</span></a></td><td><pre> * dev-util/nunit2-2.6.4_p2015011102-r2: failed sourcing ebuild: this eclass doesn't support EAPI-6 </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l80"><td><a href="#l80"><span>80</span></a></td><td><pre> * dev-util/repository-analyser-1.0.0.0: failed sourcing ebuild: this eclass doesn't support EAPI-6 + <tr class="err" id="l79"><td><a href="#l79"><span>79</span></a></td><td><pre> * dev-util/repository-analyser-1.0.0.0: failed sourcing ebuild: this eclass doesn't support EAPI-6 </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l81"><td><a href="#l81"><span>81</span></a></td><td><pre> * dev-util/t4-1.3.1_p2018020903-r1: failed sourcing ebuild: this eclass doesn't support EAPI-6 + <tr class="err" id="l80"><td><a href="#l80"><span>80</span></a></td><td><pre> * dev-util/t4-1.3.1_p2018020903-r1: failed sourcing ebuild: this eclass doesn't support EAPI-6 </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l82"><td><a href="#l82"><span>82</span></a></td><td><pre> * media-gfx/pinta-1.6: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass + <tr class="err" id="l81"><td><a href="#l81"><span>81</span></a></td><td><pre> * media-gfx/pinta-1.6: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l83"><td><a href="#l83"><span>83</span></a></td><td><pre> * www-apps/orchard-cms-1.7.3-r3: failed sourcing ebuild: this eclass doesn't support EAPI-6 + <tr class="err" id="l82"><td><a href="#l82"><span>82</span></a></td><td><pre> * www-apps/orchard-cms-1.7.3-r3: failed sourcing ebuild: this eclass doesn't support EAPI-6 </pre></td><td>[FATAL]</td></tr> - <tr class="" id="l84"><td><a href="#l84"><span>84</span></a></td><td><pre> * Cache regen failed with 1 + <tr class="" id="l83"><td><a href="#l83"><span>83</span></a></td><td><pre> * Cache regen failed with 1 </pre></td></tr> </table> diff --git a/shnurise.txt b/shnurise.txt index 6b02f3ac7639..9c62f8ae619d 100644 --- a/shnurise.txt +++ b/shnurise.txt @@ -15,7 +15,6 @@ 'uri': 'git@github.com:ArsenShnurkov/shnurise.git'}], 'status': 'unofficial'} $ pmaint sync shnurise -WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). 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: diff --git a/sihnon.html b/sihnon.html index be9af9917bc4..a8ecd67dfa16 100644 --- a/sihnon.html +++ b/sihnon.html @@ -38,49 +38,47 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync sihnon </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <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> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing sihnon </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing sihnon + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced sihnon </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced sihnon + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1 </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1 + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD </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 + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 sihnon </pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 sihnon -</pre></td></tr> - <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully + <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> diff --git a/sihnon.txt b/sihnon.txt index ac844d1bf63e..0bc6e426530c 100644 --- a/sihnon.txt +++ b/sihnon.txt @@ -12,7 +12,6 @@ 'uri': 'git@github.com:optiz0r/gentoo-overlay.git'}], 'status': 'unofficial'} $ pmaint sync sihnon -WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). 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: diff --git a/simonvanderveldt.html b/simonvanderveldt.html index f977b34561b2..391f18ff903a 100644 --- a/simonvanderveldt.html +++ b/simonvanderveldt.html @@ -44,49 +44,47 @@ </pre></td></tr> <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync simonvanderveldt </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). + <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>*** syncing simonvanderveldt </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** syncing simonvanderveldt + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced simonvanderveldt </pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>*** synced simonvanderveldt + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded </pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Sync succeeded + <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 log --format=%ci -1 + <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>$ git show -q --pretty=format:%G? HEAD + <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 simonvanderveldt </pre></td></tr> - <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 simonvanderveldt -</pre></td></tr> - <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Cache regenerated successfully + <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> diff --git a/simonvanderveldt.txt b/simonvanderveldt.txt index d80601ac1a27..74648db1c59d 100644 --- a/simonvanderveldt.txt +++ b/simonvanderveldt.txt @@ -15,7 +15,6 @@ 'uri': 'git@github.com:simonvanderveldt/simonvanderveldt-overlay.git'}], 'status': 'unofficial'} $ pmaint sync simonvanderveldt -WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). 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: diff --git a/sinustrom.html b/sinustrom.html index 4da29d411013..884a63c2958f 100644 --- a/sinustrom.html +++ b/sinustrom.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 sinustrom </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', 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>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <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 + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <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 + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only + <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>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <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 + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <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, + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <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 + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. + <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> + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing sinustrom </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** syncing sinustrom + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced sinustrom </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced sinustrom + <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 sinustrom </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 sinustrom -</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/sinustrom.txt b/sinustrom.txt index 9c7ffaa51ebf..fef56e7f1d8e 100644 --- a/sinustrom.txt +++ b/sinustrom.txt @@ -14,7 +14,6 @@ 'uri': 'git@github.com:zpuskas/sinustrom-gentoo-overlay.git'}], 'status': 'unofficial'} $ pmaint sync sinustrom -WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). 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: diff --git a/sk-overlay.html b/sk-overlay.html index 9233b8ff769b..583184a3585a 100644 --- a/sk-overlay.html +++ b/sk-overlay.html @@ -40,49 +40,47 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync sk-overlay </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: + <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> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing sk-overlay </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing sk-overlay + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced sk-overlay </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced sk-overlay + <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> * Sync succeeded + <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 log --format=%ci -1 + <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>$ git show -q --pretty=format:%G? HEAD + <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 sk-overlay </pre></td></tr> - <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 sk-overlay -</pre></td></tr> - <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully + <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> diff --git a/sk-overlay.txt b/sk-overlay.txt index fb24d592d608..78ace0f3df97 100644 --- a/sk-overlay.txt +++ b/sk-overlay.txt @@ -13,7 +13,6 @@ {'type': 'git', 'uri': 'git@github.com:scriptkitties/overlay.git'}], 'status': 'unofficial'} $ pmaint sync sk-overlay -WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). 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: diff --git a/slonko.html b/slonko.html index 4317a5e6aa7a..02c6a874c35c 100644 --- a/slonko.html +++ b/slonko.html @@ -32,49 +32,47 @@ </pre></td></tr> <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync slonko </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). + <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 "git config" with "git config --global" 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 "git config" with "git config --global" 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>*** syncing slonko </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing slonko + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced slonko </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced slonko + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * Sync succeeded </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Sync succeeded + <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="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git log --format=%ci -1 + <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="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD + <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 slonko </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 slonko -</pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</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/slonko.txt b/slonko.txt index 878a570dc485..991019761918 100644 --- a/slonko.txt +++ b/slonko.txt @@ -9,7 +9,6 @@ 'source': [{'type': 'git', 'uri': 'https://slonko.net/git/portage'}], 'status': 'unofficial'} $ pmaint sync slonko -WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). 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: diff --git a/slyfox.html b/slyfox.html index f0fed3c81803..1641be704e57 100644 --- a/slyfox.html +++ b/slyfox.html @@ -32,49 +32,47 @@ </pre></td></tr> <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync slyfox </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). + <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 "git config" with "git config --global" 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 "git config" with "git config --global" 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>*** syncing slyfox </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing slyfox + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced slyfox </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced slyfox + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * Sync succeeded </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Sync succeeded + <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="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git log --format=%ci -1 + <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="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD + <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 slyfox </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 slyfox -</pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</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/slyfox.txt b/slyfox.txt index 07e70b5bb054..648a869318f9 100644 --- a/slyfox.txt +++ b/slyfox.txt @@ -9,7 +9,6 @@ 'source': [{'type': 'git', 'uri': 'https://github.com/trofi/slyfox-gentoo'}], 'status': 'official'} $ pmaint sync slyfox -WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). 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: diff --git a/smaeul.html b/smaeul.html index e081c2f4ddca..d949d8594adb 100644 --- a/smaeul.html +++ b/smaeul.html @@ -40,49 +40,47 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync smaeul </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: + <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> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing smaeul </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing smaeul + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced smaeul </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced smaeul + <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> * Sync succeeded + <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 log --format=%ci -1 + <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>$ git show -q --pretty=format:%G? HEAD + <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 smaeul </pre></td></tr> - <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 smaeul -</pre></td></tr> - <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully + <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> diff --git a/smaeul.txt b/smaeul.txt index 3b9bc1b0d564..2d73c98216f4 100644 --- a/smaeul.txt +++ b/smaeul.txt @@ -13,7 +13,6 @@ 'uri': 'git+ssh://git@github.com/smaeul/portage-overlay.git'}], 'status': 'unofficial'} $ pmaint sync smaeul -WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). 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: diff --git a/swegener.html b/swegener.html index f43afba697ff..cda54dd3a9c4 100644 --- a/swegener.html +++ b/swegener.html @@ -94,15 +94,15 @@ </pre></td></tr> <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>File list transfer time: 0.000 seconds </pre></td></tr> - <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>Total bytes sent: 147 + <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>Total bytes sent: 143 </pre></td></tr> <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>Total bytes received: 5.38K </pre></td></tr> <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>sent 147 bytes received 5.38K bytes 1.58K bytes/sec + <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>sent 143 bytes received 5.38K bytes 2.21K bytes/sec </pre></td></tr> - <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>total size is 105.64K speedup is 19.10 + <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>total size is 105.64K speedup is 19.12 </pre></td></tr> <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>*** syncing swegener </pre></td></tr> diff --git a/swegener.txt b/swegener.txt index d51665d542de..7190ea096659 100644 --- a/swegener.txt +++ b/swegener.txt @@ -40,11 +40,11 @@ Matched data: 0 bytes File list size: 5.29K File list generation time: 0.001 seconds File list transfer time: 0.000 seconds -Total bytes sent: 147 +Total bytes sent: 143 Total bytes received: 5.38K -sent 147 bytes received 5.38K bytes 1.58K bytes/sec -total size is 105.64K speedup is 19.10 +sent 143 bytes received 5.38K bytes 2.21K bytes/sec +total size is 105.64K speedup is 19.12 *** syncing swegener *** synced swegener * Sync succeeded diff --git a/vayerx.html b/vayerx.html index 524908b879f0..755e32990040 100644 --- a/vayerx.html +++ b/vayerx.html @@ -38,63 +38,61 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync vayerx </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <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> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing vayerx </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing vayerx + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced vayerx </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced vayerx + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1 </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1 + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD </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 + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 vayerx </pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 vayerx -</pre></td></tr> - <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * dev-python/elasticsearch-py-2.5.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * dev-python/elasticsearch-py-2.5.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * dev-python/portalocker-1.2.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * dev-python/portalocker-1.2.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * dev-python/py-postgresql-1.2.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * dev-python/py-postgresql-1.2.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * dev-python/python-json-logger-0.1.8: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * dev-python/python-json-logger-0.1.8: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * dev-python/radar-0.3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * dev-python/radar-0.3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * games-engines/renpy-6.18.3-r667: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * games-engines/renpy-6.18.3-r667: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * x11-misc/obkey-1.0-r2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * x11-misc/obkey-1.0-r2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * Cache regen failed with 1 + <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * Cache regen failed with 1 </pre></td></tr> </table> diff --git a/vayerx.txt b/vayerx.txt index 4acabe4fe0a8..d4efdfb1e010 100644 --- a/vayerx.txt +++ b/vayerx.txt @@ -12,7 +12,6 @@ {'type': 'git', 'uri': 'git@github.com:vayerx/vayerx-gentoo.git'}], 'status': 'unofficial'} $ pmaint sync vayerx -WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). 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: diff --git a/vdr-devel.html b/vdr-devel.html index 8b53bd413f0e..958c6d986993 100644 --- a/vdr-devel.html +++ b/vdr-devel.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 vdr-devel </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', 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>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <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 + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <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 + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only + <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>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <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 + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <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, + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <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 + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. + <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> + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing vdr-devel </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** syncing vdr-devel + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced vdr-devel </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced vdr-devel + <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 vdr-devel </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 vdr-devel -</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/vdr-devel.txt b/vdr-devel.txt index 2d214f025d16..3030c6762174 100644 --- a/vdr-devel.txt +++ b/vdr-devel.txt @@ -14,7 +14,6 @@ 'uri': 'git+ssh://git@git.gentoo.org/proj/vdr/devel.git'}], 'status': 'official'} $ pmaint sync vdr-devel -WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). 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: diff --git a/vifino-overlay.html b/vifino-overlay.html index abbb9d4861fc..6e160c224a66 100644 --- a/vifino-overlay.html +++ b/vifino-overlay.html @@ -40,49 +40,47 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync vifino-overlay </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: + <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> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing vifino-overlay </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing vifino-overlay + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced vifino-overlay </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced vifino-overlay + <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> * Sync succeeded + <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 log --format=%ci -1 + <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>$ git show -q --pretty=format:%G? HEAD + <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 vifino-overlay </pre></td></tr> - <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 vifino-overlay -</pre></td></tr> - <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully + <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> diff --git a/vifino-overlay.txt b/vifino-overlay.txt index b4d7eb198a1c..b0f4462d7de7 100644 --- a/vifino-overlay.txt +++ b/vifino-overlay.txt @@ -13,7 +13,6 @@ {'type': 'git', 'uri': 'git@github.com:vifino/vifino-overlay.git'}], 'status': 'unofficial'} $ pmaint sync vifino-overlay -WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). 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: diff --git a/vklimovs.html b/vklimovs.html index aa35005d097c..9475c0576cb1 100644 --- a/vklimovs.html +++ b/vklimovs.html @@ -38,49 +38,47 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync vklimovs </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <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> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing vklimovs </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing vklimovs + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced vklimovs </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced vklimovs + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1 </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1 + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD </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 + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 vklimovs </pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 vklimovs -</pre></td></tr> - <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully + <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> diff --git a/vklimovs.txt b/vklimovs.txt index 14229cf51a99..fe881afef31a 100644 --- a/vklimovs.txt +++ b/vklimovs.txt @@ -12,7 +12,6 @@ 'uri': 'git+ssh://git@github.com/vklimovs/portage-overlay.git'}], 'status': 'unofficial'} $ pmaint sync vklimovs -WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). 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: diff --git a/vmacs.html b/vmacs.html index b23d8ab3ade6..6fe101216e92 100644 --- a/vmacs.html +++ b/vmacs.html @@ -40,49 +40,47 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync vmacs </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: + <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> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing vmacs </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing vmacs + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced vmacs </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced vmacs + <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> * Sync succeeded + <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 log --format=%ci -1 + <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>$ git show -q --pretty=format:%G? HEAD + <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 vmacs </pre></td></tr> - <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 vmacs -</pre></td></tr> - <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully + <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> diff --git a/vmacs.txt b/vmacs.txt index 1fced5b6a9bc..82100ff3383e 100644 --- a/vmacs.txt +++ b/vmacs.txt @@ -13,7 +13,6 @@ 'uri': 'git+ssh://git@git.gentoo.org/user/vmacs.git'}], 'status': 'unofficial'} $ pmaint sync vmacs -WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). 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: diff --git a/wdzierzan.html b/wdzierzan.html index 2ffe53967e8f..0cfc3231ff91 100644 --- a/wdzierzan.html +++ b/wdzierzan.html @@ -42,47 +42,49 @@ </pre></td></tr> <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync wdzierzan </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <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>commands sometime before your next pull: + <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> + <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> git config pull.rebase false # merge (the default strategy) + <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> git config pull.rebase true # rebase + <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.ff only # fast-forward only + <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> + <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>You can replace "git config" with "git config --global" to set a default + <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>preference for all repositories. You can also pass --rebase, --no-rebase, + <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>or --ff-only on the command line to override the configured default per + <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>invocation. + <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> + <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>Already up to date. + <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>*** syncing wdzierzan + <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>*** synced wdzierzan + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** syncing wdzierzan </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced wdzierzan </pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1 + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded </pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD + <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>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 wdzierzan + <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> * Cache regenerated successfully + <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 wdzierzan +</pre></td></tr> + <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> diff --git a/wdzierzan.txt b/wdzierzan.txt index 9c69103aa5a0..beef1feb3b4e 100644 --- a/wdzierzan.txt +++ b/wdzierzan.txt @@ -14,6 +14,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/user/wdzierzan.git'}], 'status': 'unofficial'} $ pmaint sync wdzierzan +WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). 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: diff --git a/webos.html b/webos.html index 141611afa300..566dcbf8467b 100644 --- a/webos.html +++ b/webos.html @@ -40,47 +40,49 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync webos </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <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>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <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>*** syncing webos + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced webos + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing webos </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced webos </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1 + <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>$ git show -q --pretty=format:%G? HEAD + <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>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 webos + <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> * Cache regenerated successfully + <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 webos +</pre></td></tr> + <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/webos.txt b/webos.txt index 5420d4b5d41c..8e9ef5d5a3f7 100644 --- a/webos.txt +++ b/webos.txt @@ -13,6 +13,7 @@ {'type': 'git', 'uri': 'git@github.com:feniksa/webos-overlay.git'}], 'status': 'unofficial'} $ pmaint sync webos +WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). 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: diff --git a/weuxel.html b/weuxel.html index e6f3dcbcc74a..67b89c0804ab 100644 --- a/weuxel.html +++ b/weuxel.html @@ -40,47 +40,49 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync weuxel </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <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>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <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>*** syncing weuxel + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced weuxel + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing weuxel </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced weuxel </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1 + <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>$ git show -q --pretty=format:%G? HEAD + <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>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 weuxel + <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> * Cache regenerated successfully + <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 weuxel +</pre></td></tr> + <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/weuxel.txt b/weuxel.txt index cd9de4a5f284..98bb527bdf3d 100644 --- a/weuxel.txt +++ b/weuxel.txt @@ -13,6 +13,7 @@ {'type': 'git', 'uri': 'git@github.com:Weuxel/portage-weuxel.git'}], 'status': 'unofficial'} $ pmaint sync weuxel +WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). 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: diff --git a/what4-java.html b/what4-java.html index af879c3084ec..0d38588f86c1 100644 --- a/what4-java.html +++ b/what4-java.html @@ -34,47 +34,49 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync what4-java </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>WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). </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>warning: Pulling without specifying how to reconcile divergent branches is </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>discouraged. You can squelch this message by running one of the following </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>commands sometime before your next pull: </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> </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.rebase false # merge (the default strategy) </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> git config pull.rebase true # rebase </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> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <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>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>You can replace "git config" with "git config --global" to set a default </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>preference for all repositories. You can also pass --rebase, --no-rebase, </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>or --ff-only on the command line to override the configured default per </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>invocation. </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> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing what4-java + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced what4-java + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing what4-java </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Sync succeeded + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced what4-java </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git log --format=%ci -1 + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1 </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 what4-java + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Cache regenerated successfully + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 what4-java +</pre></td></tr> + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> diff --git a/what4-java.txt b/what4-java.txt index a7537d7a7074..5352b7973162 100644 --- a/what4-java.txt +++ b/what4-java.txt @@ -10,6 +10,7 @@ 'uri': 'https://github.com/kwhat/gentoo-what4-java-overlay.git'}], 'status': 'unofficial'} $ pmaint sync what4-java +WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). 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: diff --git a/wichtounet.html b/wichtounet.html index e41afc76591a..edf273697fed 100644 --- a/wichtounet.html +++ b/wichtounet.html @@ -42,47 +42,49 @@ </pre></td></tr> <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync wichtounet </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <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>commands sometime before your next pull: + <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> + <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> git config pull.rebase false # merge (the default strategy) + <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> git config pull.rebase true # rebase + <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.ff only # fast-forward only + <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> + <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>You can replace "git config" with "git config --global" to set a default + <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>preference for all repositories. You can also pass --rebase, --no-rebase, + <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>or --ff-only on the command line to override the configured default per + <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>invocation. + <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> + <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>Already up to date. + <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>*** syncing wichtounet + <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>*** synced wichtounet + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** syncing wichtounet </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced wichtounet </pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1 + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded </pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD + <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>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 wichtounet + <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> * Cache regenerated successfully + <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 wichtounet +</pre></td></tr> + <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> diff --git a/wichtounet.txt b/wichtounet.txt index 8ef025e2c242..4707ca6777fc 100644 --- a/wichtounet.txt +++ b/wichtounet.txt @@ -14,6 +14,7 @@ 'uri': 'git@github.com:wichtounet/wichtounet-overlay.git'}], 'status': 'unofficial'} $ pmaint sync wichtounet +WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). 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: diff --git a/wine.html b/wine.html index ba0fa2370481..5db9eb1ccf68 100644 --- a/wine.html +++ b/wine.html @@ -38,47 +38,49 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync wine </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <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> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </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.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing wine + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced wine + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing wine </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced wine </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1 + <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 show -q --pretty=format:%G? HEAD + <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>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 wine + <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> * Cache regenerated successfully + <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 wine +</pre></td></tr> + <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> @@ -12,6 +12,7 @@ 'uri': 'git://anongit.gentoo.org/repo/proj/wine.git'}], 'status': 'official'} $ pmaint sync wine +WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). 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: diff --git a/xwing.html b/xwing.html index d0aec6374630..ba13109eed14 100644 --- a/xwing.html +++ b/xwing.html @@ -66,7 +66,7 @@ </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Matched data: 0 bytes </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>File list size: 48 + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>File list size: 47 </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>File list generation time: 0.001 seconds </pre></td></tr> @@ -74,25 +74,67 @@ </pre></td></tr> <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Total bytes sent: 85 </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Total bytes received: 134 + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Total bytes received: 131 </pre></td></tr> <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>sent 85 bytes received 134 bytes 87.60 bytes/sec + <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>sent 85 bytes received 131 bytes 86.40 bytes/sec </pre></td></tr> <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>total size is 32 speedup is 0.15 </pre></td></tr> - <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>*** syncing xwing + <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>This is xwing.info / alderaan.xwing.info </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> </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>Contact Name : webmaster@xwing.info </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> </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>Number of files: 168 (reg: 111, dir: 57) +</pre></td></tr> + <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>Number of created files: 0 +</pre></td></tr> + <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>Number of deleted files: 0 +</pre></td></tr> + <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>Number of regular files transferred: 24 +</pre></td></tr> + <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>Total file size: 132.73K bytes +</pre></td></tr> + <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>Total transferred file size: 31.07K bytes +</pre></td></tr> + <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>Literal data: 31.07K bytes +</pre></td></tr> + <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>Matched data: 0 bytes +</pre></td></tr> + <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>File list size: 5.44K +</pre></td></tr> + <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>File list generation time: 0.001 seconds +</pre></td></tr> + <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>File list transfer time: 0.000 seconds +</pre></td></tr> + <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>Total bytes sent: 636 +</pre></td></tr> + <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>Total bytes received: 22.76K +</pre></td></tr> + <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> +</pre></td></tr> + <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>sent 636 bytes received 22.76K bytes 9.36K bytes/sec +</pre></td></tr> + <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>total size is 132.73K speedup is 5.67 +</pre></td></tr> + <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>*** syncing xwing +</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 674126a68e1c..4158900a54de 100644 --- a/xwing.txt +++ b/xwing.txt @@ -26,14 +26,35 @@ Total file size: 32 bytes Total transferred file size: 32 bytes Literal data: 32 bytes Matched data: 0 bytes -File list size: 48 +File list size: 47 File list generation time: 0.001 seconds File list transfer time: 0.000 seconds Total bytes sent: 85 -Total bytes received: 134 +Total bytes received: 131 -sent 85 bytes received 134 bytes 87.60 bytes/sec +sent 85 bytes received 131 bytes 86.40 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: 168 (reg: 111, dir: 57) +Number of created files: 0 +Number of deleted files: 0 +Number of regular files transferred: 24 +Total file size: 132.73K bytes +Total transferred file size: 31.07K bytes +Literal data: 31.07K bytes +Matched data: 0 bytes +File list size: 5.44K +File list generation time: 0.001 seconds +File list transfer time: 0.000 seconds +Total bytes sent: 636 +Total bytes received: 22.76K + +sent 636 bytes received 22.76K bytes 9.36K bytes/sec +total size is 132.73K speedup is 5.67 *** syncing xwing *** synced xwing * Sync succeeded diff --git a/zugaina.html b/zugaina.html index 0cb2451fb737..b1eca3264e81 100644 --- a/zugaina.html +++ b/zugaina.html @@ -48,7 +48,7 @@ </pre></td></tr> <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>Matched data: 0 bytes </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>File list size: 43.57K + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>File list size: 43.29K </pre></td></tr> <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>File list generation time: 0.001 seconds </pre></td></tr> @@ -60,7 +60,7 @@ </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>sent 491 bytes received 46.48K bytes 13.42K bytes/sec + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>sent 491 bytes received 46.48K bytes 18.79K bytes/sec </pre></td></tr> <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>total size is 2.19M speedup is 46.61 </pre></td></tr> diff --git a/zugaina.txt b/zugaina.txt index 27efca0a5455..91b6c8988bef 100644 --- a/zugaina.txt +++ b/zugaina.txt @@ -17,13 +17,13 @@ Total file size: 2.19M bytes Total transferred file size: 0 bytes Literal data: 0 bytes Matched data: 0 bytes -File list size: 43.57K +File list size: 43.29K File list generation time: 0.001 seconds File list transfer time: 0.000 seconds Total bytes sent: 491 Total bytes received: 46.48K -sent 491 bytes received 46.48K bytes 13.42K bytes/sec +sent 491 bytes received 46.48K bytes 18.79K bytes/sec total size is 2.19M speedup is 46.61 *** syncing zugaina *** synced zugaina |