]> git.ipfire.org Git - thirdparty/libsolv.git/commitdiff
example solvers: small fixes
authorMichael Schroeder <mls@suse.de>
Wed, 26 Aug 2015 13:12:41 +0000 (15:12 +0200)
committerMichael Schroeder <mls@suse.de>
Wed, 26 Aug 2015 13:12:41 +0000 (15:12 +0200)
examples/p5solv
examples/pysolv
examples/rbsolv
examples/tclsolv

index 330ec63a99c970b63b661eeda267d7a930ac380b..6759bab9b6e9a1104c4d37ba16ff97ef76152227 100755 (executable)
@@ -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();
index 22ae209ba1320668ca44b6572f6a33c140ff23b7..b30cd4f0dc983e1b202079304336f9c4d06d7e16 100755 (executable)
@@ -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()
index 470438d1c4f50e9ed70247823d38ef7f426e9eeb..fb41bc48f255ed53a8ed20575fa9f3af13339fbd 100755 (executable)
@@ -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()
index a6d0c119f19366d2e047b90493c34ad6f33641bc..3f222ee51e2e67a1c2c2dc91afcb07298a13da8c 100755 (executable)
@@ -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]