Shawn Walker wrote:
On 01/ 6/10 05:50 PM, Danek Duvall wrote:
Shawn Walker wrote:

On 01/ 5/10 01:04 PM, Danek Duvall wrote:
Brock Pytlik wrote:

http://cr.opensolaris.org/~bpytlik/ips-13485-v1/

indexer.py:

   - It could just be a slow brain, but this modifies the fmris in the
catalog itself, right? Wait, fmris() uses the old catalog file, so how
     does this work at all?

fmris() doesn't use the "old catalog file".  Confusion here?  Ignore
server/catalog.py; it isn't used here at all.

It's kind of hard to ignore; Brock is changing it!  Will
ServerCatalog.refresh_index() ever be called? If not, then can Brock just
eliminate that change?  If so, then it calls self.fmris(), which very
definitely opens a file called "catalog" and expects it to have entries
like "V pkg ..." in it.

What else am I missing?

You're not missing anything; there's no point in changing server/catalog.py. Most of that's essentially dead code. I swear I filed a cleanup bug for this, but can't find it at the moment. However, I intend to nuke most of that soon.

I changed the code there because the function signature changed, so it seemed wise to change it in all the places it was called. I'm happy to a) just pretend the file doesn't exist and make no changes in it b) leave the changes in it in case we ever do make a trip through those lines c) delete the entire function in server/catalog.py.

Just let me know which is the preferred way forward. (As a side note, I've just run the test suite and confirmed that it passes if the changes to that file are removed.)

Brock
_______________________________________________
pkg-discuss mailing list
pkg-discuss@opensolaris.org
http://mail.opensolaris.org/mailman/listinfo/pkg-discuss

Reply via email to