From: Duncan Mac-Vicar P Date: Fri, 10 Aug 2007 14:23:16 +0000 (+0000) Subject: link to boost regex, zypp does not do it X-Git-Tag: BASE-SuSE-Linux-10_3-Branch~167 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7ae66ee4f69f088a6870604dc1774ebe377547ec;p=platform%2Fupstream%2Fzypper.git link to boost regex, zypp does not do it --- diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index bd3751f..dcf2ba8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -37,7 +37,7 @@ SET( zypper_SRCS ADD_EXECUTABLE( zypper ${zypper_SRCS} ) -TARGET_LINK_LIBRARIES( zypper ${ZYPP_LIBRARY} ${READLINE_LIBRARY} ) +TARGET_LINK_LIBRARIES( zypper ${ZYPP_LIBRARY} ${READLINE_LIBRARY} boost_regex ) INSTALL( TARGETS zypper diff --git a/src/zypper-misc.cc b/src/zypper-misc.cc index d2de128..88c725b 100644 --- a/src/zypper-misc.cc +++ b/src/zypper-misc.cc @@ -565,6 +565,8 @@ void load_target_resolvables(bool to_pool) void establish () { + int locks = God->applyLocks(); + cout_v << format(_("(%s items locked")) % locks << endl; cout_v << _("Establishing status of aggregates") << endl; God->resolver()->establishPool(); dump_pool (); diff --git a/src/zypper.cc b/src/zypper.cc index 2198b27..5870f36 100644 --- a/src/zypper.cc +++ b/src/zypper.cc @@ -1157,7 +1157,9 @@ int one_command(const ZypperCommand & command, int argc, char **argv) if (initret != ZYPPER_EXIT_OK) return initret; cond_init_target(); // calls ZYpp::initializeTarget("/"); - + + establish(); + Table t; t.style(Ascii);