From: Michael Schroeder <mls@suse.de>
Date: Fri, 28 Aug 2015 12:20:56 +0000 (+0200)
Subject: examples: initialize extcookie
X-Git-Tag: 0.6.12~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fac11abc557fa0efe73f6b2aa3645310271f9434;p=thirdparty%2Flibsolv.git

examples: initialize extcookie
---

diff --git a/examples/p5solv b/examples/p5solv
index 864cf3eb..68be64f8 100755
--- a/examples/p5solv
+++ b/examples/p5solv
@@ -65,6 +65,7 @@ sub load {
     $dorefresh = 0 if @s && ($self->{metadata_expire} == -1 || time() - $s[9] < $self->{metadata_expire});
   }
   $self->{cookie} = '';
+  $self->{extcookie} = '';
   if (!$dorefresh && $self->usecachedrepo()) {
     print "repo: '$self->{alias}' cached\n";
     return 1;
diff --git a/examples/pysolv b/examples/pysolv
index 2a6b28a9..525623bc 100755
--- a/examples/pysolv
+++ b/examples/pysolv
@@ -91,6 +91,7 @@ class repo_generic(dict):
             except OSError:
                 pass
         self['cookie'] = ''
+        self['extcookie'] = ''
         if not dorefresh and self.usecachedrepo(None):
             print("repo: '%s': cached" % self.name)
             return True
@@ -247,7 +248,7 @@ class repo_generic(dict):
                 self.handle.write_first_repodata(f)
             f.flush()
             if self.type != 'system' and not ext:
-                if 'extcookie' not in self:
+                if not self['extcookie']:
                     self['extcookie'] = self.calc_cookie_ext(f, self['cookie'])
                 f.write(self['extcookie'])
             if not ext:
diff --git a/examples/rbsolv b/examples/rbsolv
index a2d48e60..144a0dd8 100755
--- a/examples/rbsolv
+++ b/examples/rbsolv
@@ -66,6 +66,7 @@ class Repo_generic
       end
     end
     @cookie = nil
+    @extcookie = nil
     if !dorefresh && usecachedrepo(nil)
       puts "repo: '#{@name}' cached"
       return true
diff --git a/examples/tclsolv b/examples/tclsolv
index 1ea6ef96..27e1466e 100755
--- a/examples/tclsolv
+++ b/examples/tclsolv
@@ -47,11 +47,7 @@ proc repo_calc_cookie_ext {selfName f cookie} {
   $chksum add "1.1"
   $chksum add $cookie
   $chksum add_fstat [$f fileno]
-  set extcookie [$chksum raw]
-  if {[string index $extcookie 0] eq "\000"} {
-    set extcookie [string replace $extcookie 0 0 "\001"]
-  }
-  return $extcookie
+  return [$chksum raw]
 }
 
 proc repo_cachepath {selfName {ext "-"}} {
@@ -79,6 +75,7 @@ proc repo_generic_load {selfName pool} {
     }
   }
   set self(cookie) {}
+  set self(extcookie) {}
   if { !$dorefresh && [repo_usecachedrepo self] } {
     puts "repo $self(name): cached"
     return 1 
@@ -157,7 +154,7 @@ proc repo_writecachedrepo {selfName {ext "-"} {repodata "NULL"}} {
   }
   $f flush
   if {$self(type) ne "system" && $ext eq "-"} {
-    if {![info exists self(extcookie)]} {
+    if {$self(extcookie) eq {}} {
       set self(extcookie) [repo_calc_cookie_ext self $f $self(cookie)]
     }
     $f write $self(extcookie)