Merged revisions 4946,4954,4957-4961,4964-4965,4968-5077 via svnmerge from

https://svn.suse.de/svn/zypp/branches/SuSE-Linux-10_2-Branch/zypper

........
  r5077 | mvidner | 2007-02-22 18:30:23 +0100 (Čt, 22 úno 2007) | 2 lines

  Use the read-only hack for service-list (#247001).
........

diff --git a/package/zypper.changes b/package/zypper.changes
index b19f6ce..0b5354d 100644 (file)
--- a/package/zypper.changes
+++ b/package/zypper.changes
@@ -1,4 +1,9 @@
 -------------------------------------------------------------------
+Thu Feb 22 18:30:10 CET 2007 - mvidner@suse.cz
+
+- Use the read-only hacek for service-list (#247001).
+
+-------------------------------------------------------------------
 Tue Feb 13 14:10:58 CET 2007 - mvidner@suse.cz
 
 - Shrunk zypp-checkpatches (#224886).

diff --git a/src/zypper.cc b/src/zypper.cc
index 679cf2a..3edff31 100644 (file)
--- a/src/zypper.cc
+++ b/src/zypper.cc
@@ -18,6 +18,8 @@
 #include <readline/readline.h>
 #include <readline/history.h>
 
+#include <zypp/zypp_detail/ZYppReadOnlyHack.h>
+
 #include "zmart.h"
 #include "zmart-sources.h"
 #include "zmart-misc.h"
@@ -527,9 +529,11 @@ int one_command(const string& command, int argc, char **argv)
     }
   }
   
-
   // here come commands that need the lock
   try {
+    if (command == "service-list" || command == "sl")
+      zypp_readonly_hack::IWantIt (); // #247001
+
     God = zypp::getZYpp();
   }
   catch (Exception & excpt_r) {