From: Ján Kupec <jkupec@suse.cz>
Date: Wed, 27 Jan 2010 14:57:43 +0000 (+0100)
Subject: Setting --root correctly when working with locks.
X-Git-Tag: 1.2.17~16
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=760abbfc99cbd3213ebded448ad46ce486414a87;p=platform%2Fupstream%2Fzypper.git

Setting --root correctly when working with locks.
---

diff --git a/src/locks.cc b/src/locks.cc
index 2326774..2ce3010 100644
--- a/src/locks.cc
+++ b/src/locks.cc
@@ -31,7 +31,8 @@ void list_locks(Zypper & zypper)
   try
   {
     Locks & locks = Locks::instance();
-    locks.read();
+    locks.read(Pathname::assertprefix
+        (zypper.globalOpts().root_dir, ZConfig::instance().locksFile()));
 
     Table t;
 
@@ -119,7 +120,8 @@ void add_locks(Zypper & zypper, const Zypper::ArgList & args, const ResKindSet &
   try
   {
     Locks & locks = Locks::instance();
-    locks.read();
+    locks.read(Pathname::assertprefix
+        (zypper.globalOpts().root_dir, ZConfig::instance().locksFile()));
     start = locks.size();
     for_(it,args.begin(),args.end())
     {
@@ -155,7 +157,8 @@ void add_locks(Zypper & zypper, const Zypper::ArgList & args, const ResKindSet &
 
       locks.addLock(q);
     }
-    locks.save();
+    locks.save(Pathname::assertprefix
+        (zypper.globalOpts().root_dir, ZConfig::instance().locksFile()));
   }
   catch(const Exception & e)
   {
@@ -176,7 +179,8 @@ void remove_locks(Zypper & zypper, const Zypper::ArgList & args)
   try
   {
     Locks & locks = Locks::instance();
-    locks.read();
+    locks.read(Pathname::assertprefix
+        (zypper.globalOpts().root_dir, ZConfig::instance().locksFile()));
     Locks::size_type start = locks.size();
     for_( args_it, args.begin(), args.end() )
     {
@@ -218,7 +222,8 @@ void remove_locks(Zypper & zypper, const Zypper::ArgList & args)
       }
     }
 
-    locks.save();
+    locks.save(Pathname::assertprefix
+        (zypper.globalOpts().root_dir, ZConfig::instance().locksFile()));
 
     // nothing removed
     if (start == locks.size())