extras-repoclosure repoclosure.patch,1.2,1.3 rc-modified,1.2,1.3

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/fedora/extras-repoclosure
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5433

Modified Files:
	repoclosure.patch rc-modified 
Log Message:
safer indentation

repoclosure.patch:

Index: repoclosure.patch
===================================================================
RCS file: /cvs/fedora/extras-repoclosure/repoclosure.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- repoclosure.patch	19 May 2006 22:50:18 -0000	1.2
+++ repoclosure.patch	19 May 2006 22:53:12 -0000	1.3
@@ -1,5 +1,5 @@
 --- /usr/bin/repoclosure	2006-05-07 04:20:57.000000000 +0200
-+++ rc-modified	2006-05-20 00:43:58.000000000 +0200
++++ rc-modified	2006-05-20 00:53:04.000000000 +0200
 @@ -43,6 +43,8 @@
          help="specify repo ids to query, can be specified multiple times (default is all enabled)")
      parser.add_option("-t", "--tempcache", default=False, action="store_true", 
@@ -21,20 +21,26 @@
          else:
              pkgs = self.pkgSack
  
-@@ -144,8 +149,11 @@
+@@ -144,11 +149,14 @@
              else:
                  repo.enable()
  
 -    if os.geteuid() != 0 or opts.tempcache:
 -        cachedir = getCacheDir()
+-        if cachedir is None:
+-            print "Error: Could not make cachedir, exiting"
+-            sys.exit(50)
 +    if os.geteuid() != 0 or opts.tempcache or opts.cachedir != '':
 +        if opts.cachedir != '':
 +            cachedir = opts.cachedir
 +        else:
 +            cachedir = getCacheDir()
-         if cachedir is None:
-             print "Error: Could not make cachedir, exiting"
-             sys.exit(50)
++            if cachedir is None:
++                print "Error: Could not make cachedir, exiting"
++                sys.exit(50)
+             
+         my.repos.setCacheDir(cachedir)
+ 
 @@ -167,7 +175,11 @@
  
      baddeps = my.getBrokenDeps(opts.newest)


Index: rc-modified
===================================================================
RCS file: /cvs/fedora/extras-repoclosure/rc-modified,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rc-modified	19 May 2006 22:50:18 -0000	1.2
+++ rc-modified	19 May 2006 22:53:12 -0000	1.3
@@ -154,9 +154,9 @@
             cachedir = opts.cachedir
         else:
             cachedir = getCacheDir()
-        if cachedir is None:
-            print "Error: Could not make cachedir, exiting"
-            sys.exit(50)
+            if cachedir is None:
+                print "Error: Could not make cachedir, exiting"
+                sys.exit(50)
             
         my.repos.setCacheDir(cachedir)