Mailinglist Archive: zypp-commit (266 mails)

< Previous Next >
[zypp-commit] r11767 - in /trunk/libzypp: VERSION.cmake devel/devel.ma/Iorder.cc package/libzypp.changes
  • From: mlandres@xxxxxxxxxxxxxxxx
  • Date: Fri, 21 Nov 2008 12:05:11 -0000
  • Message-id: <20081121120511.C7D00FB6E0@xxxxxxxxxxxxxxxx>
Author: mlandres
Date: Fri Nov 21 13:05:11 2008
New Revision: 11767

URL: http://svn.opensuse.org/viewcvs/zypp?rev=11767&view=rev
Log:
version 5.24.0

Modified:
trunk/libzypp/VERSION.cmake
trunk/libzypp/devel/devel.ma/Iorder.cc
trunk/libzypp/package/libzypp.changes

Modified: trunk/libzypp/VERSION.cmake
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=11767&r1=11766&r2=11767&view=diff
==============================================================================
--- trunk/libzypp/VERSION.cmake (original)
+++ trunk/libzypp/VERSION.cmake Fri Nov 21 13:05:11 2008
@@ -63,6 +63,6 @@
SET(LIBZYPP_MINOR "24")
SET(LIBZYPP_PATCH "0")
#
-# LAST RELEASED: 5.23.0 (23)
+# LAST RELEASED: 5.24.0 (23)
# (The number in parenthesis is LIBZYPP_COMPATMINOR)
#=======

Modified: trunk/libzypp/devel/devel.ma/Iorder.cc
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.ma/Iorder.cc?rev=11767&r1=11766&r2=11767&view=diff
==============================================================================
--- trunk/libzypp/devel/devel.ma/Iorder.cc (original)
+++ trunk/libzypp/devel/devel.ma/Iorder.cc Fri Nov 21 13:05:11 2008
@@ -3,11 +3,14 @@

#include "zypp/pool/GetResolvablesToInsDel.h"

+Pathname mroot( "/tmp/Bb" );
+TestSetup test( mroot, Arch_ppc64 );
+
bool upgrade()
{
bool rres = false;
{
- //zypp::base::LogControl::TmpLineWriter shutUp;
+ zypp::base::LogControl::TmpLineWriter shutUp;
UpgradeStatistics u;
rres = getZYpp()->resolver()->doUpgrade( u );
}
@@ -23,6 +26,8 @@

bool solve()
{
+ static unsigned run = 0;
+ USR << "Solve " << run++ << endl;
bool rres = false;
{
//zypp::base::LogControl::TmpLineWriter shutUp;
@@ -34,10 +39,35 @@
getZYpp()->resolver()->problems();
return false;
}
- MIL << "resolve " << rres << endl;
return true;
}

+bool verify()
+{
+ bool rres = solve();
+ ResPool pool( test.pool() );
+ for_( it, make_filter_begin<resfilter::ByTransact>(pool),
+ make_filter_end<resfilter::ByTransact>(pool) )
+ {
+ if ( it->status().transacts() &&
+ it->status().isBySolver() )
+ {
+ WAR << "MISSING " << *it << endl;
+ }
+ }
+ return rres;
+}
+
+inline void save()
+{
+ test.poolProxy().saveState();
+}
+
+inline void restore()
+{
+ test.poolProxy().restoreState();
+}
+
/******************************************************************
**
** FUNCTION NAME : main
@@ -49,9 +79,75 @@

Pathname mroot( "/tmp/Bb" );
TestSetup test( mroot, Arch_ppc64 );
- test.loadTarget();
- test.loadTestcaseRepos(
"/suse/ma/BUGS/439802/bug439802/YaST2/solverTestcase" );
+ {
+ zypp::base::LogControl::TmpLineWriter shutUp;
+ test.loadTarget();
+ test.loadTestcaseRepos(
"/suse/ma/BUGS/439802/bug439802/YaST2/solverTestcase" );
+ }
+
+ save();
+ {
+ zypp::base::LogControl::TmpLineWriter shutUp;
+ getPi<Product>( "SUSE_SLES", Edition("11"), Arch("ppc64")
).status().setTransact( true, ResStatus::USER );
+ getPi<Package>( "sles-release", Edition("11-54.3"), Arch("ppc64")
).status().setTransact( true, ResStatus::USER );
+ //upgrade();
+ }
+ ResPool pool( test.pool() );
+ vdumpPoolStats( USR << "Transacting:"<< endl,
+ make_filter_begin<resfilter::ByTransact>(pool),
+ make_filter_end<resfilter::ByTransact>(pool) ) << endl;
+
+ getZYpp()->resolver()->setIgnoreAlreadyRecommended( true );
+ getZYpp()->resolver()->setOnlyRequires( true );

+ restore();
+ getPi<Package>( "gvfs-backends", Edition("1.0.2-1.4"), Arch("ppc64")
).status().setTransact( true, ResStatus::USER );
+
+ INT << sat::Solvable(909).requires() << endl;
+
+ vdumpPoolStats( SEC << "Transacting:"<< endl,
+ make_filter_begin<resfilter::ByTransact>(pool),
+ make_filter_end<resfilter::ByTransact>(pool) ) << endl;
+ verify();
+ vdumpPoolStats( SEC << "Transacting:"<< endl,
+ make_filter_begin<resfilter::ByTransact>(pool),
+ make_filter_end<resfilter::ByTransact>(pool) ) << endl;
+ INT << "===[END]============================================" << endl <<
endl;
+ zypp::base::LogControl::TmpLineWriter shutUp1;
+ return 0;
+
+ pool::GetResolvablesToInsDel collect( pool,
pool::GetResolvablesToInsDel::ORDER_BY_MEDIANR );
+
+ {
+ for_( it, collect._toDelete.begin(), collect._toDelete.end() )
+ {
+ restore();
+ it->status().setTransact( true, ResStatus::USER );
+ SEC << *it << endl;
+ vdumpPoolStats( SEC << "Transacting:"<< endl,
+ make_filter_begin<resfilter::ByTransact>(pool),
+ make_filter_end<resfilter::ByTransact>(pool) ) << endl;
+ save();
+ verify();
+ }
+ }
+
+ {
+ for_( it, collect._toInstall.begin(), collect._toInstall.end() )
+ {
+ restore();
+ it->status().setTransact( true, ResStatus::USER );
+ SEC << *it << endl;
+ vdumpPoolStats( SEC << "Transacting:"<< endl,
+ make_filter_begin<resfilter::ByTransact>(pool),
+ make_filter_end<resfilter::ByTransact>(pool) ) << endl;
+ save();
+ verify();
+ }
+ }
+
+
+#if 0
//getPi<>( "", "", Edition(""), Arch("") );
getPi<Product>( "SUSE_SLES", Edition("11"), Arch("ppc64")
).status().setTransact( true, ResStatus::USER );
getPi<Package>( "sles-release", Edition("11-54.3"), Arch("ppc64")
).status().setTransact( true, ResStatus::USER );
@@ -67,6 +163,7 @@

pool::GetResolvablesToInsDel collect( pool,
pool::GetResolvablesToInsDel::ORDER_BY_MEDIANR );
MIL << "GetResolvablesToInsDel:" << endl << collect << endl;
+
if ( 1 )
{
// Collect until the 1st package from an unwanted media occurs.
@@ -85,9 +182,6 @@
fst=it;
hitUnwantedMedia = true;
}
- else
- {
- }
}
dumpRange( WAR << "toInstall1: " << endl,
collect._toInstall.begin(), fst ) << endl;
@@ -103,8 +197,16 @@
dumpRange( ERR << "toDelete: " << endl,
collect._toDelete.begin(), collect._toDelete.end() ) << endl;
}
+ INT << "===[END]============================================" << endl <<
endl;
+ return 0;
+#endif
+
+
+
+

INT << "===[END]============================================" << endl <<
endl;
+ zypp::base::LogControl::TmpLineWriter shutUp;
return 0;
}


Modified: trunk/libzypp/package/libzypp.changes
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?rev=11767&r1=11766&r2=11767&view=diff
==============================================================================
--- trunk/libzypp/package/libzypp.changes (original)
+++ trunk/libzypp/package/libzypp.changes Fri Nov 21 13:05:11 2008
@@ -3,6 +3,7 @@

- Fix retrieval of deltarpm info.
- revision 11764
+- version 5.24.0 (23)

-------------------------------------------------------------------
Thu Nov 20 22:15:28 CET 2008 - ma@xxxxxxx

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

< Previous Next >
This Thread
  • No further messages