From: Michael Schroeder <mls@suse.de>
Date: Fri, 2 Nov 2012 13:05:44 +0000 (+0100)
Subject: small cleanup: move incomplete check into writecachedrepo
X-Git-Tag: upstream/0.2.3~87
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5839b7d92cb35c9169c0d7cca71f4216386c89ba;p=platform%2Fupstream%2Flibsolv.git

small cleanup: move incomplete check into writecachedrepo
---

diff --git a/examples/p5solv b/examples/p5solv
index a5193a5..103ee88 100755
--- a/examples/p5solv
+++ b/examples/p5solv
@@ -153,6 +153,7 @@ sub usecachedrepo {
 
 sub writecachedrepo {
   my ($self, $ext, $info) = @_;
+  return if $self->{'incomplete'} && !$ext;
   mkdir("/var/cache/solv", 0755) unless -d "/var/cache/solv";
   my ($f, $tmpname);
   eval {
@@ -315,7 +316,7 @@ sub load_if_changed {
     }
   }
   $self->add_exts();
-  $self->writecachedrepo() unless $self->{'incomplete'};
+  $self->writecachedrepo();
   $self->{'handle'}->create_stubs();
   return 1;
 }
@@ -448,7 +449,7 @@ sub load_if_changed {
     }
   }
   $self->add_exts();
-  $self->writecachedrepo() unless $self->{'incomplete'};
+  $self->writecachedrepo();
   $self->{'handle'}->create_stubs();
   return undef;
 }
diff --git a/examples/pysolv b/examples/pysolv
index 238e3e8..d4c7265 100755
--- a/examples/pysolv
+++ b/examples/pysolv
@@ -238,6 +238,8 @@ class repo_generic(dict):
         return True
 
     def writecachedrepo(self, ext, info=None):
+        if not ext and 'incomplete' in self:
+	    return
         try:
             if not os.path.isdir("/var/cache/solv"):
                 os.mkdir("/var/cache/solv", 0755)
@@ -334,8 +336,7 @@ class repo_repomd(repo_generic):
                 self.handle.add_updateinfoxml(f, 0)
                 solv.xfclose(f)
         self.add_exts()
-        if 'incomplete' not in self:
-            self.writecachedrepo(None)
+	self.writecachedrepo(None)
         # must be called after writing the repo
         self.handle.create_stubs()
         return True
@@ -447,8 +448,7 @@ class repo_susetags(repo_generic):
                         solv.xfclose(f)
                 self.handle.internalize()
         self.add_exts()
-        if 'incomplete' not in self:
-            self.writecachedrepo(None)
+	self.writecachedrepo(None)
         # must be called after writing the repo
         self.handle.create_stubs()
         return True
@@ -603,7 +603,7 @@ if os.path.isdir("/etc/zypp/repos.d"):
 else:
   reposdirs = [ "/etc/yum/repos.d" ]
 
-for reposdir in ["/etc/zypp/repos.d"]:
+for reposdir in reposdirs:
     if not os.path.isdir(reposdir):
         continue
     for reponame in sorted(glob.glob('%s/*.repo' % reposdir)):
diff --git a/examples/rbsolv b/examples/rbsolv
index 1d7369d..ba87aab 100755
--- a/examples/rbsolv
+++ b/examples/rbsolv
@@ -153,6 +153,7 @@ class Repo_generic
   end
 
   def writecachedrepo(ext, info = nil)
+    return if @incomplete && !ext
     begin
       Dir::mkdir("/var/cache/solv", 0755) unless FileTest.directory?("/var/cache/solv")
       f =  Tempfile.new('.newsolv-', '/var/cache/solv')
@@ -268,7 +269,7 @@ class Repo_rpmmd < Repo_generic
       end
     end
     add_exts()
-    writecachedrepo(nil) unless @incomplete
+    writecachedrepo(nil)
     @handle.create_stubs()
     return true
   end
@@ -384,7 +385,7 @@ class Repo_susetags < Repo_generic
       end
     end
     add_exts()
-    writecachedrepo(nil) unless @incomplete
+    writecachedrepo(nil)
     @handle.create_stubs()
     return true
   end