From: Michael Schroeder <mls@suse.de>
Date: Wed, 26 Aug 2015 13:12:41 +0000 (+0200)
Subject: example solvers: small fixes
X-Git-Tag: 0.6.12~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50df8c16145010794314221043db5ac38c4d68e8;p=thirdparty%2Flibsolv.git

example solvers: small fixes
---

diff --git a/examples/p5solv b/examples/p5solv
index 330ec63a..6759bab9 100755
--- a/examples/p5solv
+++ b/examples/p5solv
@@ -340,6 +340,7 @@ my %langtags = (
 sub add_ext {
   my ($self, $repodata, $what, $ext) = @_;
   my ($filename, $chksum) = $self->find($what);
+  return unless $filename;
   my $handle = $repodata->new_handle();
   $repodata->set_str($handle, $solv::SUSETAGS_FILE_NAME, $filename);
   $repodata->set_checksum($handle, $solv::SUSETAGS_FILE_CHECKSUM, $chksum);
@@ -710,7 +711,7 @@ my %newpkgsfps;
 if (@newpkgs) {
   my $downloadsize = 0;
   $downloadsize += $_->lookup_num($solv::SOLVABLE_DOWNLOADSIZE) for @newpkgs;
-  printf "Downloading %d packages, %d K\n", scalar(@newpkgs), $downloadsize;
+  printf "Downloading %d packages, %d K\n", scalar(@newpkgs), $downloadsize / 1024;
   for my $p (@newpkgs) {
     my $repo = $p->{repo}->{appdata};
     my ($location) = $p->lookup_location();
diff --git a/examples/pysolv b/examples/pysolv
index 22ae209b..b30cd4f0 100755
--- a/examples/pysolv
+++ b/examples/pysolv
@@ -852,7 +852,7 @@ if newpkgs:
     downloadsize = 0
     for p in newpkgs:
         downloadsize += p.lookup_num(solv.SOLVABLE_DOWNLOADSIZE)
-    print("Downloading %d packages, %d K" % (len(newpkgs), downloadsize))
+    print("Downloading %d packages, %d K" % (len(newpkgs), downloadsize / 1024))
     for p in newpkgs:
         repo = p.repo.appdata
         location, medianr = p.lookup_location()
@@ -866,7 +866,7 @@ if newpkgs:
             continue
         if not sysrepo.handle.isempty() and os.access('/usr/bin/applydeltarpm', os.X_OK):
             pname = p.name
-            di = p.repo.Dataiterator(solv.SOLVID_META, solv.DELTA_PACKAGE_NAME, pname, solv.Dataiterator.SEARCH_STRING)
+            di = p.repo.meta.Dataiterator(solv.DELTA_PACKAGE_NAME, pname, solv.Dataiterator.SEARCH_STRING)
             di.prepend_keyname(solv.REPOSITORY_DELTAINFO)
             for d in di:
                 dp = d.parentpos()
diff --git a/examples/rbsolv b/examples/rbsolv
index 470438d1..fb41bc48 100755
--- a/examples/rbsolv
+++ b/examples/rbsolv
@@ -727,7 +727,7 @@ if !newpkgs.empty?
   for p in newpkgs
     downloadsize += p.lookup_num(Solv::SOLVABLE_DOWNLOADSIZE)
   end
-  puts "Downloading #{newpkgs.length} packages, #{downloadsize} K"
+  puts "Downloading #{newpkgs.length} packages, #{downloadsize / 1024} K"
   for p in newpkgs
     repo = p.repo.appdata
     location, medianr = p.lookup_location()
diff --git a/examples/tclsolv b/examples/tclsolv
index a6d0c119..3f222ee5 100755
--- a/examples/tclsolv
+++ b/examples/tclsolv
@@ -26,7 +26,7 @@ proc repo_calc_cookie_file {selfName filename} {
 proc repo_calc_cookie_fp {selfName fp} {
   upvar $selfName self
   set chksum [solv::new_Chksum $solv::REPOKEY_TYPE_SHA256]
-  $chksum add 1.1
+  $chksum add "1.1"
   $chksum add_fp $fp
   return [$chksum raw]
 }
@@ -34,7 +34,7 @@ proc repo_calc_cookie_fp {selfName fp} {
 proc repo_calc_cookie_ext {selfName f cookie} {
   upvar $selfName self
   set chksum [solv::new_Chksum $solv::REPOKEY_TYPE_SHA256]
-  $chksum add 1.1
+  $chksum add "1.1"
   $chksum add $cookie
   $chksum add_fstat [$f fileno]
   set extcookie [$chksum raw]