Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 161915 - mixed tab/spaces fixups
Summary: mixed tab/spaces fixups
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Hosted Projects
Classification: Unclassified
Component: Catalyst (show other bugs)
Hardware: All Linux
: High normal (vote)
Assignee: Gentoo Catalyst Developers
URL:
Whiteboard:
Keywords: InVCS
Depends on:
Blocks:
 
Reported: 2007-01-13 17:47 UTC by Andrew Gaffney (RETIRED)
Modified: 2007-02-06 22:54 UTC (History)
0 users

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


Attachments
a description to satisfy bugzie (catalyst_space.diff,14.67 KB, patch)
2007-01-13 17:47 UTC, Andrew Gaffney (RETIRED)
Details | Diff
new patch (catalyst.patch,14.57 KB, patch)
2007-01-17 15:42 UTC, Andrew Gaffney (RETIRED)
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Andrew Gaffney (RETIRED) gentoo-dev 2007-01-13 17:47:09 UTC
I ran a small script from the portage repo called tabcheck.py against the catalyst source, and I was quite frightened by what I saw. I'm sure there is a lot more that it didn't fine, but I've done some cleanup. A patch against SVN is attached.
Comment 1 Andrew Gaffney (RETIRED) gentoo-dev 2007-01-13 17:47:48 UTC
Created attachment 106823 [details, diff]
a description to satisfy bugzie
Comment 2 Chris Gianelloni (RETIRED) gentoo-dev 2007-01-17 15:19:14 UTC
OK, here's what I get after applying this patch...

vertigo i686 # catalyst -a -f livecd-stage1-large.spec 
Gentoo Catalyst, version 2.0.2
Copyright 2003-2006 The Gentoo Foundation
Distributed under the GNU General Public License version 2

Using default Catalyst configuration file, /etc/catalyst/catalyst.conf
Setting sharedir to config file value "/usr/lib/catalyst"
Setting snapshot_cache to default value "/var/tmp/catalyst/snapshot_cache"
Setting hash_function to config file value "crc32"
Setting storedir to config file value "/var/tmp/catalyst"
Setting portdir to default value "/usr/portage"
Setting distdir to config file value "/usr/portage/distfiles"
Setting options to config file value "autoresume kerncache pkgcache seedcache snapcache"
Autoresuming support enabled.
Kernel cache support enabled.
Package cache support enabled.
Seed cache support enabled.
Snapshot cache support enabled.
Envscript support enabled.
Using target: livecd-stage1
Building on amd64 for alternate machine type x86
Source path set to /var/tmp/catalyst/tmp/default/stage3-i686-desktop-2007.0/
        If this is not desired, remove this directory or turn of seedcache in the options of catalyst.conf
        the source path will then be /var/tmp/catalyst/builds/default/stage3-i686-desktop-2007.0.tar.bz2

Caching snapshot to /var/tmp/catalyst/snapshot_cache/2007.0/
The autoresume path is /var/tmp/catalyst/tmp/default/.autoresume-livecd-stage1-i686-installer-2007.0/
Catalyst aborting....
Traceback (most recent call last):
  File "/usr/bin/catalyst", line 384, in ?
    build_target(addlargs, targetmap)
  File "/usr/bin/catalyst", line 200, in build_target
    mytarget=targetmap[addlargs["target"]](conf_values, addlargs)
  File "/usr/lib/catalyst/modules/livecd_stage1_target.py", line 15, in __init__
    generic_stage_target.__init__(self,spec,addlargs)
  File "/usr/lib/catalyst/modules/generic_stage_target.py", line 183, in __init__
    print "Location of the package cache is " + self.settings["pkgcache_path"]
KeyError: 'pkgcache_path'


(I hate python tracebacks... ;p)
Comment 3 Andrew Gaffney (RETIRED) gentoo-dev 2007-01-17 15:42:03 UTC
Created attachment 107271 [details, diff]
new patch

It looks like I indented the 'else' in livecd_stage1_target.py's set_pkgcache_path() 1 level too far. This new patch corrects that.
Comment 4 Chris Gianelloni (RETIRED) gentoo-dev 2007-01-23 17:08:40 UTC
Added to subversion...
Comment 5 Chris Gianelloni (RETIRED) gentoo-dev 2007-02-06 22:54:39 UTC
Fixed in 2.0.2