swift-account-audit broken in 1.7.6

[Sergio Rubio]

swift-account-audit is currently broken (tested against 1.7.6)

root@swift-001:~# swift-account-audit AUTH_XXXXXXXXXXXXXXXXXX
Traceback (most recent call last):
  File "/usr/bin/swift-account-audit", line 361, in <module>
    auditor = Auditor(**options)
  File "/usr/bin/swift-account-audit", line 58, in __init__
    self.object_ring = Ring(os.path.join(swift_dir, ring_name='object'))
TypeError: join() got an unexpected keyword argument 'ring_name'

A quick look at the source code in the master branch reveals that it may also be broken there.

This has been reported before (see https://github.com/openstack/swift/pull/7/files)
and probably not submitted upstream using the regular workflow.

The proposed patch works for me. YMMV.

Let me know if you need more info.

[Sergio Rubio (rubiojr)]

Don't think it's relevant in this case but it has been tested in Ubuntu 12.04.2, using backported packages from the Raring archive:

DISTRIB_ID=Ubuntu
DISTRIB_RELEASE=12.04
DISTRIB_CODENAME=precise
DISTRIB_DESCRIPTION="Ubuntu 12.04.2 LTS"

root@swift-001:~# apt-cache policy swift-account
swift-account:
  Installed: 1.7.6-0ubuntu1~precise1
  Candidate: 1.7.6-0ubuntu1~precise1
  Version table:
 *** 1.7.6-0ubuntu1~precise1 0
        500 http://ppa.launchpad.net/bvox/ppa/ubuntu/ precise/main amd64 Packages
        100 /var/lib/dpkg/status
     1.7.4-0ubuntu2~cloud0 0
        500 http://ubuntu-cloud.archive.canonical.com/ubuntu/ precise-updates/folsom/main amd64 Packages
     1.4.8-0ubuntu2 0
        500 http://archive.ubuntu.com/ubuntu/ precise/main amd64 Packages

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/22793

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/22793
Committed: http://github.com/openstack/swift/commit/13eabdc7442d173fa4ccc75c741b1fe1c9c913c1
Submitter: Jenkins
Branch: master

commit 13eabdc7442d173fa4ccc75c741b1fe1c9c913c1
Author: Kun Huang <email address hidden>
Date: Sun Feb 24 19:52:15 2013 +0800

    Improve bin/swift-account-audit

    1.Correct the usage of initializing a Ring object.
    2.Fix typo.
    3.Align lines of print_status part. (keep origin author mind)

    note: Adam Kijak has commited it at early time, but didn't put it
          in Gerrit. I import his commit and send it in right Workflow.

    Fixes: bug #1131901

    Change-Id: If56316cc424045f7df662d60088382f7fd40e8b1