Author: mvidner Date: Fri May 4 16:47:33 2007 New Revision: 5490 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5490&view=rev Log: Merged revisions 5439-5440 via svnmerge from http://svn.opensuse.org/svn/zypp/branches/SuSE-SLE-10-Branch/backend ........ r5439 | dmacvicar | 2007-04-24 16:33:15 +0200 (Út, 24 dub 2007) | 5 lines write license for patches (#174396) ........ r5440 | dmacvicar | 2007-04-24 16:33:59 +0200 (Út, 24 dub 2007) | 1 line changes ........ Modified: branches/SuSE-SLE-10-GA-Branch/backend/ (props changed) branches/SuSE-SLE-10-GA-Branch/backend/package/libzypp-zmd-backend.changes branches/SuSE-SLE-10-GA-Branch/backend/src/dbsource/DbAccess.cc Modified: branches/SuSE-SLE-10-GA-Branch/backend/package/libzypp-zmd-backend.changes URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-SLE-10-GA-Branch/backend/package/libzypp-zmd-backend.changes?rev=5490&r1=5489&r2=5490&view=diff ============================================================================== --- branches/SuSE-SLE-10-GA-Branch/backend/package/libzypp-zmd-backend.changes (original) +++ branches/SuSE-SLE-10-GA-Branch/backend/package/libzypp-zmd-backend.changes Fri May 4 16:47:33 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Apr 24 16:33:25 CEST 2007 - dmacvicar@suse.de + +- (#174396) write patch license to the db +- r5490 + +------------------------------------------------------------------- Wed Jul 5 21:50:08 CEST 2006 - kkaempf@suse.de - check error value of rpm transaction before reporting error Modified: branches/SuSE-SLE-10-GA-Branch/backend/src/dbsource/DbAccess.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-SLE-10-GA-Branch/backend/src/dbsource/DbAccess.cc?rev=5490&r1=5489&r2=5490&view=diff ============================================================================== --- branches/SuSE-SLE-10-GA-Branch/backend/src/dbsource/DbAccess.cc (original) +++ branches/SuSE-SLE-10-GA-Branch/backend/src/dbsource/DbAccess.cc Fri May 4 16:47:33 2007 @@ -884,6 +884,15 @@ } else if (patch != NULL) { sqlite3_bind_text( handle, 11, patch->category().c_str(), -1, SQLITE_STATIC ); + license = patch->licenseToConfirm(); + if (license.empty()) + { + sqlite3_bind_text( handle, 12, NULL, -1, SQLITE_STATIC ); + } + else + { + sqlite3_bind_text( handle, 12, license.c_str(), -1, SQLITE_STATIC ); + } } else if (product != NULL) { sqlite3_bind_text( handle, 11, product->category().c_str(), -1, SQLITE_STATIC ); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org