Mailinglist Archive: zypp-commit (233 mails)

< Previous Next >
[zypp-commit] <zypper> master : Zypper must not remove locks which do not match what commandline options specify. (bnc 551956)
  • From: Michael Andres <ma@xxxxxxx>
  • Date: Fri, 6 Nov 2009 14:58:28 +0100
  • Message-id: <E1N6PrW-0008QI-AR@xxxxxxxxxxxxxxxx>
ref: refs/heads/master
commit 6455b7f9765695289a25534189f837809a665fbc
Author: Michael Andres <ma@xxxxxxx>
Date: Fri Nov 6 14:58:28 2009 +0100

Zypper must not remove locks which do not match what commandline options
specify. (bnc 551956)
---
src/locks.cc | 18 +-----------------
1 files changed, 1 insertions(+), 17 deletions(-)

diff --git a/src/locks.cc b/src/locks.cc
index 428b5b4..2326774 100644
--- a/src/locks.cc
+++ b/src/locks.cc
@@ -214,23 +214,7 @@ void remove_locks(Zypper & zypper, const Zypper::ArgList &
args)
}
q.setCaseSensitive();

- //hack to remove unique lock added by zypper
- int res = 0;
- PoolQuery& last = q;
- for_( it, locks.begin(), locks.end() )
- {
- PoolQuery::StrContainer sc = it->attribute(sat::SolvAttr::name);
- if (sc.size() == 1 && sc.count(*args_it))
- {
- res++;
- last = *it;
- }
- }
-
- if (res == 1) //only one with identical name, then remove it
- locks.removeLock(last);
- else
- locks.removeLock(q);
+ locks.removeLock(q);
}
}

--
To unsubscribe, e-mail: zypp-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: zypp-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages