ichavero pushed to openstack-packstack (f22). "Remove patch 0001-Fix-version-switch-error.patch"

[notifications at fedoraproject.org]

>From 754e9c8424ce16d376fdd2410dd60907fa9a627d Mon Sep 17 00:00:00 2001
From: Ivan Chavero <ichavero at redhat.com>
Date: Mon, 30 Mar 2015 01:11:51 -0700
Subject: Remove patch 0001-Fix-version-switch-error.patch


diff --git a/0001-Fix-version-switch-error.patch b/0001-Fix-version-switch-error.patch
deleted file mode 100644
index c88d385..0000000
--- a/0001-Fix-version-switch-error.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 2801d2788914d7e0b5f298afe85a101f434b4670 Mon Sep 17 00:00:00 2001
-From: Ivan Chavero <ichavero at redhat.com>
-Date: Mon, 12 Jan 2015 11:51:21 -0700
-Subject: [PATCH] Fix --version switch error
-
-When you use the --version switch you get this error:
-UnboundLocalError: local variable 'options' referenced before assignment
-
-Change-Id: I84fadc601c0b53e68b57a94d07fc735a04b33a96
-(cherry picked from commit 6f41529b222ad36222ceaf19ff667ae40447df84)
----
- packstack/installer/run_setup.py | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/packstack/installer/run_setup.py b/packstack/installer/run_setup.py
-index 30adf00..2026a76 100644
---- a/packstack/installer/run_setup.py
-+++ b/packstack/installer/run_setup.py
-@@ -943,6 +943,8 @@ def _set_command_line_values(options):
- 
- 
- def main():
-+    options = ""
-+
-     try:
-         # Load Plugins
-         loadPlugins()
--- 
-2.1.0
-
diff --git a/openstack-packstack.spec b/openstack-packstack.spec
index 6f5984e..f7333b9 100644
--- a/openstack-packstack.spec
+++ b/openstack-packstack.spec
@@ -6,7 +6,7 @@
 
 Name:           openstack-packstack
 Version:        2014.2
-Release:        0.19.dev%{git_snaptag}.%{git_commit}%{?dist}
+Release:        0.20.dev%{git_snaptag}.%{git_commit}%{?dist}
 Summary:        Openstack Install Utility
 
 Group:          Applications/System
@@ -15,8 +15,6 @@ URL:            https://github.com/stackforge/packstack
 # Tarball is created by bin/release.sh
 Source0:        http://mmagr.fedorapeople.org/downloads/packstack/packstack-%{version}.dev%{git_snaptag}.%{git_commit}.tar.gz
 
-Patch0001:      0001-Fix-version-switch-error.patch
-
 BuildArch:      noarch
 
 BuildRequires:  python2-devel
@@ -70,8 +68,6 @@ This package contains documentation files for Packstack.
 #%setup -n packstack-%{version}dev%{git_revno}
 %setup -n packstack-%{version}.dev%{git_snaptag}.%{git_commit}
 
-%patch0001 -p1
-
 # Sanitizing a lot of the files in the puppet modules
 find packstack/puppet/modules \( -name .fixtures.yml -o -name .gemfile -o -name ".travis.yml" -o -name .rspec \) -exec rm {} +
 find packstack/puppet/modules \( -name "*.py" -o -name "*.rb" -o -name "*.pl" \) -exec sed -i '/^#!/{d;q}' {} + -exec chmod -x {} +
@@ -144,6 +140,9 @@ install -p -D -m 644 docs/_build/man/*.1 %{buildroot}%{_mandir}/man1/
 # changelog --------------------------------------------------------------------
 
 %changelog
+* Sun Mar 29 2015 Iván Chavero <ichavero at redhat.com> - 2014.2-0.20.dev1466
+- [Packstack] Remove patch 0001-Fix-version-switch-error.patch
+
 * Sun Mar 29 2015 Iván Chavero <ichavero at redhat.com> - 2014.2-0.19.dev1466
 - [Nova] reflect puppet-nova changes for novncproxy_base_url (rhbz#1204482)
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/openstack-packstack.git/commit/?h=f22&id=754e9c8424ce16d376fdd2410dd60907fa9a627d