rpms/yum-langpacks/F-13 yum-langpacks-0.1.5-rm-rf-fix.patch,1.1,1.2

[James Antill]

Author: james

Update of /cvs/pkgs/rpms/yum-langpacks/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv26339

Modified Files:
	yum-langpacks-0.1.5-rm-rf-fix.patch 
Log Message:
* Sat Apr 24 2010 James Antill <james.antill at redhat.com> - 0.1.5-2
- Fix the problems where langpacks could delete the system.
- Resolves: bug#585424
- Register the package name, for yum history etc.


yum-langpacks-0.1.5-rm-rf-fix.patch:
 langpacks.py  |   11 ++++++++++-
 langpacks.py~ |only
 2 files changed, 10 insertions(+), 1 deletion(-)

Index: yum-langpacks-0.1.5-rm-rf-fix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/yum-langpacks/F-13/yum-langpacks-0.1.5-rm-rf-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- yum-langpacks-0.1.5-rm-rf-fix.patch	26 Apr 2010 13:26:33 -0000	1.1
+++ yum-langpacks-0.1.5-rm-rf-fix.patch	26 Apr 2010 13:44:22 -0000	1.2
@@ -1,48 +1,42 @@
 diff -ru yum-langpacks-0.1.5/langpacks.py yum-langpacks-0.1.5-rm-rf-fix/langpacks.py
---- yum-langpacks-0.1.5/langpacks.py	2010-04-24 10:45:53.000000000 -0400
-+++ yum-langpacks-0.1.5-rm-rf-fix/langpacks.py	2010-04-24 10:29:12.000000000 -0400
-@@ -77,8 +77,6 @@
-                 continue
-             if yb.tsInfo.matchNaevr(name=pkg.name):
-                 continue
--            if hasattr(conduit, 'registerPackageName'):
--                conduit.registerPackageName("yum-langpacks")
-             yb.install(pattern=pkg.name)
- 
- def remove_deps_from_ts(conduit, po):
-@@ -93,8 +91,6 @@
-     if not pkgmatches:
-         return
-     for pkg in yb.rpmdb.returnPackages(patterns=pkgmatches):
--        if hasattr(conduit, 'registerPackageName'):
--            conduit.registerPackageName("yum-langpacks")
-         yb.remove(pattern=pkg.name)
- 
- def postresolve_hook(conduit):
-diff -ru yum-langpacks-0.1.5/langpacks.py~ yum-langpacks-0.1.5-rm-rf-fix/langpacks.py~
---- yum-langpacks-0.1.5/langpacks.py~	2010-04-24 10:32:14.000000000 -0400
-+++ yum-langpacks-0.1.5-rm-rf-fix/langpacks.py~	2010-03-23 21:17:16.000000000 -0400
-@@ -54,7 +54,6 @@
+--- yum-langpacks-0.1.5/langpacks.py	2010-03-23 21:17:16.000000000 -0400
++++ yum-langpacks-0.1.5-rm-rf-fix/langpacks.py	2010-04-26 09:43:52.000000000 -0400
+@@ -54,6 +54,7 @@
  
      global langs
      
--    # NOTE: with LANG=C this returns (None, None), maybe we want a default?
++    # NOTE: with LANG=C this returns (None, None), maybe we want a default?
      (lang, encoding) = locale.getdefaultlocale()
      conflist = conduit.confString('main', 'langpack_locales', default=lang)
      if conflist:
-@@ -88,8 +87,6 @@
+@@ -76,6 +77,9 @@
+                 continue
+             if yb.tsInfo.matchNaevr(name=pkg.name):
+                 continue
++            if hasattr(conduit, 'registerPackageName'):
++                conduit.registerPackageName("yum-langpacks")
++
+             yb.install(pattern=pkg.name)
+ 
+ def remove_deps_from_ts(conduit, po):
+@@ -87,7 +91,12 @@
              pkgmatches.append(c % (lang,))
              shortlang = lang.split('_')[0]
              pkgmatches.append(c % (shortlang,))
--    if not pkgmatches:
--        return
++    if not pkgmatches:
++        return
      for pkg in yb.rpmdb.returnPackages(patterns=pkgmatches):
++        if hasattr(conduit, 'registerPackageName'):
++            conduit.registerPackageName("yum-langpacks")
++
          yb.remove(pattern=pkg.name)
  
-@@ -99,5 +96,5 @@
+ def postresolve_hook(conduit):
+@@ -96,5 +105,5 @@
          if po.name in conditional_pkgs:
              if member.ts_state in ('i', 'u'):
                  add_deps_to_ts(conduit, po)
--            elif member.ts_state == 'e': # FIXME: Obsoleted, use output_state
-+            elif member.ts_state in ('e', None):
+-            elif member.ts_state in ('e', None):
++            elif member.ts_state == 'e': # FIXME: Obsoleted, use output_state
                  remove_deps_from_ts(conduit, po)
+Only in yum-langpacks-0.1.5-rm-rf-fix: langpacks.py~