openstack/devstack
Code Issues Proposed changes

Merge "Updates for tools/info.sh"

Browse Source
This commit is contained in:
Jenkins 2014-01-26 13:36:41 +00:00 committed by Gerrit Code Review
commit fd52f0ea99
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/info.sh
View File

@ -85,8 +85,8 @@ done
# Packages # Packages
# -------- # --------
# - We are going to check packages only for the services needed. # - Only check packages for the services enabled
# - We are parsing the packages files and detecting metadatas. # - Parse version info from the package metadata, not the package/file names
for p in $(get_packages $ENABLED_SERVICES); do for p in $(get_packages $ENABLED_SERVICES); do
if [[ "$os_PACKAGE" = "deb" ]]; then if [[ "$os_PACKAGE" = "deb" ]]; then
@ -141,9 +141,15 @@ rm $FREEZE_FILE
# Dump localrc with 'localrc|' prepended and comments and passwords left out # Dump localrc with 'localrc|' prepended and comments and passwords left out
if [[ -r $TOP_DIR/localrc ]]; then if [[ -r $TOP_DIR/localrc ]]; then
RC=$TOP_DIR/localrc
elif [[ -f $RC_DIR/.localrc.auto ]]; then
RC=$TOP_DIR/.localrc.auto
fi
if [[ -n $RC ]]; then
sed -e ' sed -e '
/PASSWORD/d; /^[ \t]*$/d;
/PASSWORD/s/=.*$/=\<password\>/;
/^#/d; /^#/d;
s/^/localrc\|/; s/^/localrc\|/;
' $TOP_DIR/localrc ' $RC
fi fi