commit: 70ae729d89ea25a2c6b8e0769368450317c30d1f
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 17 01:31:16 2014 +0000
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Sun Aug 17 01:31:16 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/layman.git;a=commit;h=70ae729d
config.py: Blanks out squashfs_command
Due to squashfs not needing to run a command aside from mount and
umount (which are handled by the Mounter() class), the config
option was set to a blank value.
layman.cfg: Reflects change to squashfs_command option with
explanation to user.
config.py: Also removes clean_tar from the true false check in favor
of the clean_archive config option.
---
etc/layman.cfg | 4 +++-
layman/config.py | 5 +++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/etc/layman.cfg b/etc/layman.cfg
index efd990c..4e9aad9 100644
--- a/etc/layman.cfg
+++ b/etc/layman.cfg
@@ -198,9 +198,11 @@ news_reporter: portage
#git_command : /usr/bin/git
#mercurial_command : /usr/bin/hg
#rsync_command : /usr/bin/rsync
+#left intentionally blank since squashfs only needs to
+#mount the squashfs image.
+#squashfs-command :
#svn_command : /usr/bin/svn
#tar_command : /bin/tar
-#g-common_command : /usr/bin/g-common
#g-sorcery_command : /usr/bin/g-sorcery
diff --git a/layman/config.py b/layman/config.py
index adfd2de..4fbff5d 100644
--- a/layman/config.py
+++ b/layman/config.py
@@ -123,11 +123,12 @@ class BareConfig(object):
'g-common_command': path([self.root, EPREFIX,'/usr/bin/g-common']),
'g-sorcery_command': path([self.root,
EPREFIX,'/usr/bin/g-sorcery']),
'mercurial_command': path([self.root, EPREFIX,'/usr/bin/hg']),
- 'squashfs_command': path([self.root,
EPREFIX,'/usr/bin/unsquashfs']),
+ # left blank due to squashfs only needing to mount the image.
+ 'squashfs_command': '',
'rsync_command': path([self.root, EPREFIX,'/usr/bin/rsync']),
'svn_command': path([self.root, EPREFIX,'/usr/bin/svn']),
'tar_command': path([self.root, EPREFIX,'/bin/tar']),
- 't/f_options': ['check_official', 'clean_tar', 'nocheck',
'require_repoconfig'],
+ 't/f_options': ['check_official', 'clean_archive', 'nocheck',
'require_repoconfig'],
'bzr_addopts' : '',
'bzr_syncopts' : '',
'cvs_addopts' : '',
