Move storage default to /var/lib/layman

6 files changed, 17 insertions, 14 deletions

diff --git a/CHANGES b/CHANGES
index b4f24b9..c4da579 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,9 @@ CHANGES
 Version TODO
 =======================================
 
+ - Move storage default from /usr/local/portage/layman
+   to /var/lib/layman (fixes bug #253725)
+
  - Syncing failed for overlays that no longer exist in the remote
    lists with no need to (bug #301174)
 
diff --git a/doc/layman.8.xml b/doc/layman.8.xml
index 0ebf4d1..9dfb484 100644
--- a/doc/layman.8.xml
+++ b/doc/layman.8.xml
@@ -558,7 +558,7 @@
 	      <para>Directory that will be used to store the overlays
 	      and all additional data <command>layman</command>
 	      needs. The default is
-	      <filename>/usr/local/portage/layman</filename>. layman
+	      <filename>/var/lib/layman</filename>. layman
 	      uses a location within the /usr/portage hierarchy instead
 	      of <filename>/var</filename> in order to
 	      store its data. This decision has been made to support
@@ -607,7 +607,7 @@
 	      end of <filename>/etc/make.conf</filename>. This is the
 	      reason why <command>layman</command> suggests running
 	      "echo "source
-	      <filename>/usr/local/portage/layman/make.conf</filename>" >>
+	      <filename>/var/lib/layman/make.conf</filename>" >>
 	      <filename>/etc/make.conf</filename>" after it has been
 	      installed.</para>
 	    </listitem>
@@ -706,7 +706,7 @@
 
 	  <para><command>layman</command> stores a local copy of the
 	  fetched remote list. It will be stored in
-	  <filename>/usr/local/portage/layman/cache.xml</filename>
+	  <filename>/var/lib/layman/cache.xml</filename>
 	  by default. There exists only one such cache file and it
 	  will be overwritten every time you
 	  run <command>layman</command>.
@@ -741,9 +741,9 @@
 	  <filename>/etc/make.conf</filename> file:
 	  </para>
 
-	  <para>source /usr/local/portage/layman/make.conf</para>
+	  <para>source /var/lib/layman/make.conf</para>
 
-	  <para><filename>/usr/local/portage/layman/make.conf</filename>
+	  <para><filename>/var/lib/layman/make.conf</filename>
 	  is the default provided in the layman
 	  configuration. Change this file name in case you decide to
 	  store it somewhere else.
diff --git a/etc/layman.cfg b/etc/layman.cfg
index 53c9d2c..9db38ce 100644
--- a/etc/layman.cfg
+++ b/etc/layman.cfg
@@ -3,7 +3,7 @@
 #-----------------------------------------------------------
 # Defines the directory where overlays should be installed
 
-storage   : /usr/local/portage/layman
+storage   : /var/lib/layman
 
 #-----------------------------------------------------------
 # Remote overlay lists will be stored here
@@ -29,7 +29,7 @@ make_conf : %(storage)s/make.conf
 #overlays  : http://www.gentoo.org/proj/en/overlays/repositories.xml
 #            http://dev.gentoo.org/~wrobel/layman/global-overlays.xml
 #            http://mydomain.org/my-layman-list.xml
-#            file:///usr/local/portage/layman/my-list.xml
+#            file:///var/lib/layman/my-list.xml
 
 overlays  : http://www.gentoo.org/proj/en/overlays/repositories.xml
 
diff --git a/layman/config.py b/layman/config.py
index 905668b..a66ca25 100644
--- a/layman/config.py
+++ b/layman/config.py
@@ -64,7 +64,7 @@ class Config(object):
         '''
 
         self.defaults = {'config'    : '/etc/layman/layman.cfg',
-                         'storage'   : '/usr/local/portage/layman',
+                         'storage'   : '/var/lib/layman',
                          'cache'     : '%(storage)s/cache',
                          'local_list': '%(storage)s/overlays.xml',
                          'make_conf' : '%(storage)s/make.conf',
diff --git a/layman/db.py b/layman/db.py
index 7d7afad..3fde214 100644
--- a/layman/db.py
+++ b/layman/db.py
@@ -351,7 +351,7 @@ class MakeConf:
     ...           here + '/tests/testfiles/global-overlays.xml',
     ...           'make_conf' : here + '/tests/testfiles/make.conf',
     ...           'nocheck'    : True,
-    ...           'storage'   : '/usr/local/portage/layman',
+    ...           'storage'   : '/var/lib/layman',
     ...           'quietness':3}
     >>> b = DB(config)
     >>> a = MakeConf(config, b.overlays)
@@ -399,7 +399,7 @@ class MakeConf:
         ...           here + '/tests/testfiles/global-overlays.xml',
         ...           'make_conf' : here + '/tests/testfiles/make.conf',
         ...           'nocheck'    : True,
-        ...           'storage'   : '/usr/local/portage/layman',
+        ...           'storage'   : '/var/lib/layman',
         ...           'quietness':3}
         >>> c = DB(config)
         >>> a = MakeConf(config, c.overlays)
@@ -427,7 +427,7 @@ class MakeConf:
         ...           here + '/tests/testfiles/global-overlays.xml',
         ...           'make_conf' : here + '/tests/testfiles/make.conf',
         ...           'nocheck'    : True,
-        ...           'storage'   : '/usr/local/portage/layman',
+        ...           'storage'   : '/var/lib/layman',
         ...           'quietness':3}
         >>> c = DB(config)
         >>> a = MakeConf(config, c.overlays)
@@ -456,7 +456,7 @@ class MakeConf:
         ...           here + '/tests/testfiles/global-overlays.xml',
         ...           'make_conf' : here + '/tests/testfiles/make.conf',
         ...           'nocheck'    : True,
-        ...           'storage'   : '/usr/local/portage/layman',
+        ...           'storage'   : '/var/lib/layman',
         ...           'quietness':3}
         >>> c = DB(config)
         >>> a = MakeConf(config, c.overlays)
@@ -511,7 +511,7 @@ class MakeConf:
         ...           here + '/tests/testfiles/global-overlays.xml',
         ...           'make_conf' : here + '/tests/testfiles/make.conf',
         ...           'nocheck'    : True,
-        ...           'storage'   : '/usr/local/portage/layman',
+        ...           'storage'   : '/var/lib/layman',
         ...           'quietness':3}
         >>> c = DB(config)
         >>> a = MakeConf(config, c.overlays)
diff --git a/layman/tests/testfiles/make.conf b/layman/tests/testfiles/make.conf
index 894e724..9a8aac6 100644
--- a/layman/tests/testfiles/make.conf
+++ b/layman/tests/testfiles/make.conf
@@ -143,7 +143,7 @@ PORT_LOGDIR=/var/log/services/portage.d
 #     concern that they will be deleted by rsync updates. Default is not
 #     defined.
 PORTDIR_OVERLAY="
-/usr/local/portage/layman/wrobel-stable
+/var/lib/layman/wrobel-stable
 $PORTDIR_OVERLAY
 /usr/local/portage/ebuilds/testing
 /usr/local/portage/ebuilds/stable