x/anvil
Code Issues Proposed changes

Merge branch 'default_os_dir' of git://github.com/Thingee/Openstack-DevstackPy into Thingee-default_os_dir

Browse Source 
Conflicts:
	AUTHORS
This commit is contained in:
Joshua Harlow 2012-03-13 17:59:29 -07:00
commit 4276978427
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
AUTHORS
View File

@ -1,10 +1,12 @@
V2
--
Chris Wright <chrisw@sous-sol.org>
Gunther Hagleitner <hagleitn@yahoo-inc.com>
Jonathan Lacour <jonathan@dreamhost.com>
Joshua Harlow <harlowja@yahoo-inc.com>
Ken Thomas <krt@yahoo-inc.com>
Gunther Hagleitner <hagleitn@yahoo-inc.com>
Chris Wright <chrisw@sous-sol.org>
Ed Hall <edhall@yahoo-inc.com>
Mike Perez <thingee@gmail.com>
V1
--

4
devstack/opts.py
View File

@ -14,8 +14,6 @@
# License for the specific language governing permissions and limitations
# under the License.
import tempfile
from optparse import IndentedHelpFormatter
from optparse import OptionParser, OptionGroup
@ -63,7 +61,7 @@ def parse():
dest="action",
metavar="ACTION",
help="required action to perform: %s" % (_format_list(settings.ACTIONS)))
default_dir = sh.joinpths(tempfile.gettempdir(), DEF_OS_DIR)
default_dir = sh.joinpths(sh.gethomedir(), DEF_OS_DIR)
base_group.add_option("-d", "--directory",
action="store",
type="string",