From: Duncan Mac-Vicar P <dmacvicar@suse.de>
Date: Fri, 26 Oct 2007 20:25:13 +0000 (+0000)
Subject: Fix the ruby example, and remove a obsolete one
X-Git-Tag: BASE-SuSE-Code-12_1-Branch~308^2~876
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a33dd6f1af5698063e618e620aa02f3dff18772b;p=thirdparty%2Flibsolv.git

Fix the ruby example, and remove a obsolete one
---

diff --git a/examples/ruby/basic.rb b/examples/ruby/basic.rb
index 37a9d0a7..c72558c0 100644
--- a/examples/ruby/basic.rb
+++ b/examples/ruby/basic.rb
@@ -5,15 +5,15 @@ include Satsolver
 pool = Pool.new
 #puts pool.methods.sort
 
-#s = pool.add_empty_source
+#s = pool.add_empty_repo
 
 f = File.open('../../testsuite/data.libzypp/basic-exercises/exercise-20-packages.solv', 'r')
-s = pool.add_source_solv(f, 'foo')
+s = pool.add_repo_solv(f, 'foo')
 
 f = File.open('../../testsuite/data.libzypp/basic-exercises/exercise-20-system.solv', 'r')
-installed = pool.add_source_solv(f, 'system')
+installed = pool.add_repo_solv(f, 'system')
 
-pool.each_source do |repo|
+pool.each_repo do |repo|
   puts repo.name
 end
 
@@ -34,7 +34,7 @@ q.push(r)
 pool.prepare
 pool.promoteepoch = true
 
-# no packages installed so use add_empty_source
+# no packages installed so use add_empty_repo
 solv = Solver.new(pool, installed)
 
 solv.fixsystem = 0
diff --git a/examples/ruby/yps.rb b/examples/ruby/yps.rb
deleted file mode 100644
index bc2cbbe5..00000000
--- a/examples/ruby/yps.rb
+++ /dev/null
@@ -1,149 +0,0 @@
-
-
-
-
-
-
-require 'satsolver'
-include Satsolver
-
-def select_solvable(pool, source, name)
-  Id id;
-  Queue plist;
-  int i, end;
-  Solvable *s;
-
-  id = str2id(pool, name, 1)
-  queueinit(plist);
-  i = source ? source.start : 1
-  tend = source ? source.start + source.nsolvables : pool.nsolvables
-  for ( i in i..tend)
-    s = pool.solvables + i
-    next if not pool_installable(pool, s)
-    queuepush(plist, i) if (s.name == id)
-  end
-
-  prune_best_version_arch(pool, plist);
-
-  if (plist.count == 0)
-    puts("unknown package '#{name}'")
-    exit(1);
-  end
-
-  id = plist.elements[0];
-  queuefree(&plist);
-
-  return pool.solvables + id;
-end
-
-
-//-----------------------------------------------
-
-int
-main(int argc, char **argv)
-{
-  Pool *pool;   // available packages (multiple repos)
-  FILE *fp;
-  Source *system; // installed packages (single repo, aka 'Source')
-  Solvable *xs;
-  Solver *solv;
-  Source *channel;
-  Queue job;
-  Id id;
-  int erase = 0;
-
-  pool = pool_create();
-  pool_setarch(pool, "i686");
-  pool->verbose = 1;
-  queueinit(&job);
-
-  if (argc < 3)
-    {
-      fprintf(stderr, "Usage:\n  yps <system> <source> [ ... <source>] <name>\n");
-      fprintf(stderr, "    to install a package <name>\n");
-      fprintf(stderr, "\n  yps -e <system> <name>\n");
-      fprintf(stderr, "    to erase a package <name>\n");
-      exit(0);
-    }
-
-  // '-e' ?
-
-  if (argc > 1 && !strcmp(argv[1], "-e"))
-    {
-      erase = 1;
-      argc--;
-      argv++;
-    }
-
-  // Load system file (installed packages)
-
-  if ((fp = fopen(argv[1], "r")) == NULL)
-    {
-      perror(argv[1]);
-      exit(1);
-    }
-  system = pool_addsource_solv(pool, fp, "system");
-  channel = 0;
-  fclose(fp);
-
-  // Load further repo files (available packages)
-
-  argc--;
-  argv++;
-  while (argc > 2)           /* all but last arg are sources */
-    {
-      if ((fp = fopen(argv[1], "r")) == 0)
-  {
-    perror(argv[1]);
-    exit(1);
-  }
-      channel = pool_addsource_solv(pool, fp, argv[1]);
-      fclose(fp);
-      argv++;
-      argc--;
-    }
-
-  // setup job queue
-  if (!argv[1][0])
-    ;
-  else if (!erase)
-    {
-      xs = select_solvable(pool, channel, argv[1]);
-      queuepush(&job, SOLVER_INSTALL_SOLVABLE);
-      queuepush(&job, xs - pool->solvables);
-    }
-  else
-    {
-      id = str2id(pool, argv[1], 1);
-      queuepush(&job, SOLVER_ERASE_SOLVABLE_NAME);
-      queuepush(&job, id);
-    }
-
-  pool_prepare(pool);
-
-  pool->promoteepoch = 1;
-
-  // start solving
-
-  solv = solver_create(pool, system);
-
-  solv->fixsystem = 0;
-  solv->updatesystem = 0;
-  solv->allowdowngrade = 0;
-  solv->allowuninstall = 0;
-  solv->noupdateprovide = 0;
-
-  // Solve !
-
-  solve(solv, &job);
-
-  // clean up
-
-  queuefree(&job);
-  solver_free(solv);
-  pool_free(pool);
-
-  exit(0);
-}
-
-// EOF