Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 313303 - app-portage/layman skips sunrise overlay
Summary: app-portage/layman skips sunrise overlay
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: High normal
Assignee: Sebastian Pipping
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2010-04-05 21:19 UTC by Mikel Olasagasti
Modified: 2010-04-08 16:14 UTC (History)
2 users (show)

See Also:
Package list:
Runtime testing required: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Mikel Olasagasti 2010-04-05 21:19:41 UTC
I'm trying to sync sunrise but layman skips. Works fine with gnome overlay.

fry ~ # layman -d sunrise
* Deleting directory "/var/lib/layman/sunrise"
* Successfully deleted overlay "sunrise".
fry ~ # layman -d sunrise
* Deleting directory "/var/lib/layman/sunrise"
* Successfully deleted overlay "sunrise".
fry ~ # layman -a sunrise
* Running command "/usr/bin/svn co "svn://overlays.gentoo.org/proj/sunrise/reviewed//@" "/var/lib/layman/sunrise""...
(...)
 U   /var/lib/layman/sunrise
Checked out revision 10402.
* Successfully added overlay "sunrise".
fry ~ # layman -s sunrise
* Running command "/usr/bin/svn up "/var/lib/layman/sunrise@""...
Skipped '/var/lib/layman/sunrise@'
* 
* Success:
* ------
* 
* Successfully synchronized overlay "sunrise".
Comment 1 Michael Weber (RETIRED) gentoo-dev 2010-04-05 21:25:44 UTC
maybe you want to look inside /var/lib/layman/sunrise and rm -r /var/lib/layman/sunrise after layman -d sunrise. you might be have some files over there which don't get removed on layman -d
Comment 2 Mikel Olasagasti 2010-04-05 21:54:17 UTC
fry ~ # layman -d sunrise
* Deleting directory "/var/lib/layman/sunrise"
* Successfully deleted overlay "sunrise".
fry ~ # ls /var/lib/layman/sunrise
ls: cannot access /var/lib/layman/sunrise: No such file or directory
fry ~ # layman -a sunrise
* Running command "/usr/bin/svn co "svn://overlays.gentoo.org/proj/sunrise/reviewed//@" "/var/lib/layman/sunrise""...
A    /var/lib/layman/sunrise/app-portage
A    /var/lib/layman/sunrise/app-portage/elog-list
(...)
 U   /var/lib/layman/sunrise
Checked out revision 10402.
* Successfully added overlay "sunrise".
fry ~ # layman -s sunrise
* Running command "/usr/bin/svn up "/var/lib/layman/sunrise@""...
Skipped '/var/lib/layman/sunrise@'
* 
* Success:
* ------
* 
* Successfully synchronized overlay "sunrise".

Comment 3 Michael Weber (RETIRED) gentoo-dev 2010-04-05 22:10:34 UTC
(In reply to comment #2)
> * Running command "/usr/bin/svn co
> "svn://overlays.gentoo.org/proj/sunrise/reviewed//@"

i tried to reproduce and my layman -a output hast no @ at the end of the url, nor does http://www.gentoo.org/proj/en/overlays/layman-global.txt mention this.

Please run 
layman -l 
layman -d sunrise
layman -a sunrise 
to refetch the overlay list and retry.
I assume your /etc/layman/layman.cfg points t
...
overlays  : http://www.gentoo.org/proj/en/overlays/layman-global.txt
...

Michael
Comment 4 Mikel Olasagasti 2010-04-05 22:25:28 UTC
fry ~ # layman -l
* gnome                     [Git       ] (git://git.overlays.gentoo.org/proj/gnome.git                                                                                                                            )
* sunrise                   [Subversion] (svn://overlays.gentoo.org/proj/sunrise/reviewed/         

-d and -a give the same output as above.

layman.cfg output at http://dpaste.com/179856/

I was using http://www.gentoo.org/proj/en/overlays/repositories.xml instead of http://www.gentoo.org/proj/en/overlays/layman-global.txt but changing doesn't fix the problem.
Comment 5 Michael Weber (RETIRED) gentoo-dev 2010-04-05 23:23:28 UTC
(In reply to comment #4)
> fry ~ # layman -l
please apologize, i meant layman -L (big L ) to reload the .xml files.

Both mention 
<source type="svn">svn://overlays.gentoo.org/proj/sunrise/reviewed/</source>
or 
src="svn://overlays.gentoo.org/proj/sunrise/reviewed/"
as source, without the @ sign.
Comment 6 Sebastian Pipping gentoo-dev 2010-04-05 23:58:20 UTC
Mikel, what does  layman --version  say?
Comment 7 Mikel Olasagasti 2010-04-06 16:13:08 UTC
fry ~ # layman -L |grep sunrise
* akoya                     [Mercurial ] (https://hg.poildetroll.net/hg/gent...)
* arcon                     [Mercurial ] (https://arcon.googlecode.com/hg/     )
* bazaar                    [Bzr       ] (lp:bzr-gentoo-overlay                )
* belak                     [Mercurial ] (http://bitbucket.org/belak/belak.g...)
* devnull                   [Mercurial ] (http://hg.core.ws/devnull            )
* ferringb                  [Bzr       ] (http://pkgcore.org/~ferringb/bzr/o...)
* haskell                   [Darcs     ] (http://code.haskell.org/gentoo/gen...)
* lxde                      [Mercurial ] (http://bitbucket.org/yngwin/lxde-o...)
* ohnobinki                 [Mercurial ] (http://ohnopublishing.net/hg/ohnob...)
* oss-overlay               [Mercurial ] (http://hg.atheme.org/users/majeru/...)
* rafaelmartins             [Mercurial ] (http://hg.rafaelmartins.eng.br/gen...)
* rion                      [Mercurial ] (http://rion-overlay.googlecode.com...)
* serkan-overlay            [Bzr       ] (http://bazaar.launchpad.net/~serka...)
* sunrise                   [Subversion] (svn://o.g.o/proj/sunrise/reviewed/   )
* tryton                    [Mercurial ] (http://www.tryton.org/hg/tryton-ov...)
fry ~ # layman -l
* gnome                     [Git       ] (git://git.overlays.gentoo.org/proj/gnome.git                                                                                                                            )
* sunrise                   [Subversion] (svn://overlays.gentoo.org/proj/sunrise/reviewed/                                                                                                                        )
fry ~ # layman --version
1.3.2_p2
Comment 8 Sebastian Pipping gentoo-dev 2010-04-07 09:39:21 UTC
please try both

  /usr/bin/svn up "/var/lib/layman/sunrise"
  /usr/bin/svn up "/var/lib/layman/sunrise@"

on a shell.  do both result in "Skipped?
also please post the output of

  ls -dal /var/lib/layman/sunrise

and

  svn --version | head -n 1

thanks!
Comment 9 Mikel Olasagasti 2010-04-07 16:44:46 UTC
fry ~ # /usr/bin/svn up "/var/lib/layman/sunrise"
At revision 10406.
fry ~ # /usr/bin/svn up "/var/lib/layman/sunrise@"
Skipped '/var/lib/layman/sunrise@'
fry ~ # ls -dal /var/lib/layman/sunrise
drwxr-xr-x 114 root root 4096 Apr  6 17:09 /var/lib/layman/sunrise
fry ~ # svn --version | head -n 1
svn, version 1.6.1 (r37116)
fry ~ # ls -dal /var/lib/layman/gnome/ 
drwxr-xr-x 35 root root 4096 Apr  3 14:03 /var/lib/layman/gnome/
Comment 10 Sebastian Pipping gentoo-dev 2010-04-07 18:26:52 UTC
(In reply to comment #9)
> fry ~ # /usr/bin/svn up "/var/lib/layman/sunrise"
> At revision 10406.
> fry ~ # /usr/bin/svn up "/var/lib/layman/sunrise@"
> Skipped '/var/lib/layman/sunrise@'

Very interesting.

One more experiment please:
# ln -s /var/lib/layman/sunrise /var/lib/layman/foobar@
# /usr/bin/svn up /var/lib/layman/foobar
# /usr/bin/svn up /var/lib/layman/foobar@
# /usr/bin/svn up /var/lib/layman/foobar@@

Please post the output of this.
Comment 11 Mikel Olasagasti 2010-04-07 20:23:44 UTC
fry ~ # ln -s /var/lib/layman/sunrise /var/lib/layman/foobar@
fry ~ # /usr/bin/svn up /var/lib/layman/foobar
Skipped '/var/lib/layman/foobar'
fry ~ # /usr/bin/svn up /var/lib/layman/foobar@
At revision 10409.
fry ~ # /usr/bin/svn up /var/lib/layman/foobar@@
Skipped '/var/lib/layman/foobar@@'
fry ~ # 
Comment 12 Sebastian Pipping gentoo-dev 2010-04-08 07:20:24 UTC
My SVN behaves differently:


# /usr/bin/svn up /var/lib/layman/sunrise                                                                                                                    
At revision 10413.                                                                                                                                                     
                                                                                                                                                                       
# /usr/bin/svn up /var/lib/layman/sunrise@                                                                                                                   
At revision 10413.                                                                                                                                                     

# ln -s /var/lib/layman/sunrise /var/lib/layman/foobar@

# /usr/bin/svn up /var/lib/layman/foobar
Skipped '/var/lib/layman/foobar'

# /usr/bin/svn up /var/lib/layman/foobar@
Skipped '/var/lib/layman/foobar'

# /usr/bin/svn up /var/lib/layman/foobar@@
At revision 10413.
                                                                                                                                                                       
# svn --version | head -n 1
svn, version 1.6.9 (r901367)


I suppose it's the difference in version.
Looking at the log of changes [1] I found

  * fix peg revision parsing in filenames like 'dir/@file.txt' (issue #3416)

for 1.6.5.  That's between your and my version and could be related.
As 1.6.9 is the only version of SVN in Gentoo by now I propose:

 - you upgrade to dev-util/svn-1.6.9

 - I make layman depend on >=dev-util/svn-1.6.9
 
 - I save myself parsing the output of svn --version
   (which may break whenever upstream changes format)
   and comparing it against "1.6.5 or later".

Could you be happy with that?


[1] http://svn.apache.org/repos/asf/subversion/trunk/CHANGES
Comment 13 Sebastian Pipping gentoo-dev 2010-04-08 08:21:56 UTC
(In reply to comment #12)
>  - you upgrade to dev-util/svn-1.6.9

After posting I came to this:
- You probably have a reason to still be using 1.6.1
- It could be fixed for 95% of the cases where the folder
  name does not contain '@' somewhere, easily

So I made a patch [1] that has potential to work well for you.
You can try it out rather conveniently by emerging =app-portage/layman-9999.

Please report back how it works for you.

PS: The reason why I append '@' at all is documented in bug #295018, btw.


[1] http://layman.git.sourceforge.net/git/gitweb.cgi?p=layman/layman;a=commitdiff;h=bcc193c6e2a30ad8b22c6bdb239f63187b10151c
Comment 14 Mikel Olasagasti 2010-04-08 16:14:32 UTC
fry ~ # layman --version
1.3.2_p2

fry ~ # svn --version |head -n1
svn, version 1.6.1 (r37116)

fry ~ # layman -s sunrise
* Running command "/usr/bin/svn up "/var/lib/layman/sunrise""...
At revision 10416.
* 
* Success:
* ------
* 
* Successfully synchronized overlay "sunrise".




fry ~ # svn --version |head -n1
svn, version 1.6.9 (r901367)


fry ~ # layman -s sunrise
* Running command "/usr/bin/svn up "/var/lib/layman/sunrise""...
At revision 10417.
* 
* Success:
* ------
* 
* Successfully synchronized overlay "sunrise".


Thanks for all guys ;)