rpms/mirrormanager/EL-5 mirrormanager-1.3.3-confirm-delete.patch, NONE, 1.1 mirrormanager.spec, 1.13, 1.14

[Matt Domsch]

Author: mdomsch

Update of /cvs/extras/rpms/mirrormanager/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10732

Modified Files:
	mirrormanager.spec 
Added Files:
	mirrormanager-1.3.3-confirm-delete.patch 
Log Message:
add confirm-delete patch, bump release

mirrormanager-1.3.3-confirm-delete.patch:
 controllers.py |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE mirrormanager-1.3.3-confirm-delete.patch ---
>From 74e1fdc2ed6d7c92234cb6179d317ef7a5934beb Mon Sep 17 00:00:00 2001
From: BJ Dierkes <wdierkes at rackspace.com>
Date: Mon, 26 Oct 2009 20:08:40 -0500
Subject: [PATCH] Fix confirm delete method in webui.

---
 server/mirrormanager/controllers.py |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/mirrormanager/controllers.py b/server/mirrormanager/controllers.py
index f811c1f..3bf9560 100644
--- a/server/mirrormanager/controllers.py
+++ b/server/mirrormanager/controllers.py
@@ -844,10 +844,10 @@ class SimpleDbObjectController(controllers.Controller, identity.SecureResource,
             obj.destroySelf()
             turbogears.redirect("/adminview")
         else:
-            self.form = confirm_delete_form
-            self.title = "Item Deletion"
+            form = confirm_delete_form
+            title = "Item Deletion"
             submit_action = "/%s/%s/delete?confirmed=1" % (self.url_prefix, obj.id)
-            return dict(form=self.form, values=obj, action=submit_action, title=self.title)
+            return dict(form=form, values=obj, action=submit_action, title=title)
 
 
 #########################################################3
-- 
1.6.0.6



Index: mirrormanager.spec
===================================================================
RCS file: /cvs/extras/rpms/mirrormanager/EL-5/mirrormanager.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- mirrormanager.spec	26 Oct 2009 15:23:49 -0000	1.13
+++ mirrormanager.spec	27 Oct 2009 01:14:20 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           mirrormanager
 Version:        1.3.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Fedora mirror management system
 BuildArch:      noarch
 
@@ -8,6 +8,7 @@ Group:          Applications/Internet
 License:        MIT and GPLv2
 URL:            http://fedorahosted.org/mirrormanager
 Source0:        https://fedorahosted.org/releases/m/i/%{name}/%{name}-%{version}.tar.bz2
+Patch0:         mirrormanager-1.3.3-confirm-delete.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:  python
 Requires:       TurboGears, python-IPy, python-GeoIP, wget, yum, psmisc, python-dns, python-fedora >= 0.3.14, py-radix, mod_wsgi
@@ -37,6 +38,7 @@ mirror.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 
@@ -84,10 +86,15 @@ exit 0
 
 
 %changelog
-* Thu Sep 28 2009 Matt Domsch <mdomsch at fedoraproject.org> - 1.3.3-1
+* Mon Oct 26 2009 Matt Domsch <mdomsch at fedoraproject.org> - 1.3.3-2
+- add patch to fix confirm delete from webui
+
+* Mon Oct 26 2009 Matt Domsch <mdomsch at fedoraproject.org> - 1.3.3-1
 - initial setup patches from BJ Dierkes
   - simpler mirrormanager.initial, README.rpm_setup, prod.cfg
   - add user mirrormanager and group mirrormanager, content permissions
+- improved BGP ASN lookups using py-radix
+- create mirrormanager user and group if not already present
 
 * Thu Sep 28 2009 Matt Domsch <mdomsch at fedoraproject.org> - 1.3.2-1
 - add BGP ASN lookups