From 7e9dc5f7fc048c24dabd25e55fe4d21eab72a2ba Mon Sep 17 00:00:00 2001 From: Joshua Harlow Date: Thu, 15 Mar 2012 12:15:26 -0700 Subject: [PATCH] Added license header --- devstack/distro.py | 17 +++++++++++++++++ stack | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/devstack/distro.py b/devstack/distro.py index 1f8000fc..9c5a88de 100644 --- a/devstack/distro.py +++ b/devstack/distro.py @@ -1,3 +1,20 @@ +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright (C) 2012 Yahoo! Inc. All Rights Reserved. +# Copyright (C) 2012 Dreamhost Inc. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + import glob import os import platform diff --git a/stack b/stack index 434c0519..532c1317 100755 --- a/stack +++ b/stack @@ -103,7 +103,6 @@ def load_rc_files(): def run(args): - dist = distro.Distro.get_current() action = args.pop("action").strip().lower() if not (action in settings.ACTIONS): print(utils.color_text("No valid action specified!", "red")) @@ -134,6 +133,7 @@ def run(args): # Stash the dryrun value (if any) into the global configuration sh.set_dryrun(args['dryrun']) + dist = distro.Distro.get_current() config = common.get_config() pw_gen = passwords.PasswordGenerator(config, args['prompt_for_passwords']) pkg_factory = dist.get_packager_factory()