September 2007 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r7096 - in /trunk/zypper: VERSION.cmake package/zypper.changes
by jkupec＠svn.opensuse.org 03 Sep '07

03 Sep '07

Author: jkupec Date: Mon Sep 3 17:12:58 2007 New Revision: 7096 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7096&view=rev Log: changes&version Modified: trunk/zypper/VERSION.cmake trunk/zypper/package/zypper.changes Modified: trunk/zypper/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/VERSION.cmake?rev=7096&r1… ============================================================================== --- trunk/zypper/VERSION.cmake (original) +++ trunk/zypper/VERSION.cmake Mon Sep 3 17:12:58 2007 @@ -20,4 +20,4 @@ SET(VERSION_MAJOR "0") SET(VERSION_MINOR "8") -SET(VERSION_PATCH "18") +SET(VERSION_PATCH "19") Modified: trunk/zypper/package/zypper.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/package/zypper.changes?re… ============================================================================== --- trunk/zypper/package/zypper.changes (original) +++ trunk/zypper/package/zypper.changes Mon Sep 3 17:12:58 2007 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Mon Sep 3 17:09:00 CEST 2007 - jkupec(a)suse.cz + +- authentication prompt implemented (#190609) +- LOCK documention added to man page (mvidner) +- r7093 +- 0.8.19 + +------------------------------------------------------------------- Mon Sep 3 14:15:59 CEST 2007 - jkupec(a)suse.cz - removing rpm message improved (#307132) -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7095 - /trunk/libzypp/package/libzypp.changes
by mlandres＠svn.opensuse.org 03 Sep '07

03 Sep '07

Author: mlandres Date: Mon Sep 3 17:10:53 2007 New Revision: 7095 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7095&view=rev Log: changes Modified: trunk/libzypp/package/libzypp.changes Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?… ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Mon Sep 3 17:10:53 2007 @@ -4,6 +4,7 @@ - Reset transact bits when switching status from "update" to "protected" (#246976) - version 3.22.1 +- revision 7094 ------------------------------------------------------------------- Mon Sep 3 13:56:42 CEST 2007 - schubi(a)suse.de -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7094 - in /trunk/libzypp: VERSION.cmake devel/devel.ma/Basic.cc package/libzypp.changes zypp/ui/SelectableImpl.cc zypp/ui/SelectableImpl.h
by mlandres＠svn.opensuse.org 03 Sep '07

03 Sep '07

Author: mlandres Date: Mon Sep 3 17:10:22 2007 New Revision: 7094 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7094&view=rev Log: Reset transact bits when switching status from "update" to "protected" (#246976) Modified: trunk/libzypp/VERSION.cmake trunk/libzypp/devel/devel.ma/Basic.cc trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/ui/SelectableImpl.cc trunk/libzypp/zypp/ui/SelectableImpl.h Modified: trunk/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=7094&r… ============================================================================== --- trunk/libzypp/VERSION.cmake (original) +++ trunk/libzypp/VERSION.cmake Mon Sep 3 17:10:22 2007 @@ -47,4 +47,4 @@ SET(LIBZYPP_MAJOR "3") SET(LIBZYPP_MINOR "22") SET(LIBZYPP_COMPATMINOR "21") -SET(LIBZYPP_PATCH "0") +SET(LIBZYPP_PATCH "1") Modified: trunk/libzypp/devel/devel.ma/Basic.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.ma/Basic.cc?… ============================================================================== --- trunk/libzypp/devel/devel.ma/Basic.cc (original) +++ trunk/libzypp/devel/devel.ma/Basic.cc Mon Sep 3 17:10:22 2007 @@ -9,27 +9,22 @@ #include <zypp/base/SerialNumber.h> #include <zypp/PathInfo.h> #include <zypp/TmpPath.h> +#include "zypp/ResPoolProxy.h" using namespace std; using namespace zypp; +using namespace zypp::ui; -void chk( ResObject::constPtr p ) +bool chst( Selectable::Ptr & sel, Status status ) { - MIL << p << endl; - DBG << p->deps() << endl; + DBG << "+++ " << sel << endl; + Status ostatus( sel->status() ); + bool res = sel->set_status( status ); + (res?MIL:WAR) << ostatus << " -> " << status << " ==>(" << res << ") " << sel->status() << endl; + DBG << "--- " << sel << endl; + return res; } -namespace zypp { -namespace filesystem { - void touch( const char * p ) - { - static std::string w; - ofstream s(p); - s<<w<<endl; - w+="a"; - } -} -} /****************************************************************** ** ** FUNCTION NAME : main @@ -39,38 +34,49 @@ { INT << "===[START]==========================================" << endl; - ResPool pool( getZYpp()->pool() ); - USR << pool << endl; - const char *const lines[] = { "@ package", "@ installed", "- foo 1 1 i686", - "@ provides", - "modalias(kernel-bigsmp:pci:*provided*)", - "@ suplements", - "modalias(kernel-bigsmp:pci:*suplements*)", + "@ available", + "- foo 2 1 i686", "@ fin" }; - //debug::addPool( lines, lines+(sizeof(lines)/sizeof(const char *const)) ); - //debug::addPool( "/tmp/a" ); + debug::addPool( lines, lines+(sizeof(lines)/sizeof(const char *const)) ); + + ResPool pool( getZYpp()->pool() ); + ResPoolProxy uipool( getZYpp()->poolProxy() ); + USR << pool << endl; - for_each( pool.begin(), pool.end(), chk ); + USR << uipool << endl; + + //for_each( pool.begin(), pool.end(), Print() ); - SEC << pool.serial().serial() << endl; - SEC << pool.serial().serial() << endl; - filesystem::touch( "/etc/sysconfig/storage" ); - SEC << pool.serial().serial() << endl; - SEC << pool.serial().serial() << endl; - SEC << pool.serial().serial() << endl; - filesystem::touch( "/etc/sysconfig/storage" ); - SEC << pool.serial().serial() << endl; - SEC << pool.serial().serial() << endl; - filesystem::touch( "/etc/sysconfig/storage" ); - SEC << pool.serial().serial() << endl; - SEC << pool.serial().serial() << endl; - SEC << pool.serial().serial() << endl; + Selectable::Ptr sel( *uipool.byKindBegin<Package>() ); + +/* enum Status + { + S_Protected, // Keep this unmodified ( have installedObj && S_Protected ) + S_Taboo, // Keep this unmodified ( have no installedObj && S_Taboo) + // requested by user: + S_Del, // delete installedObj ( clears S_Protected if set ) + S_Update, // install candidateObj ( have installedObj, clears S_Protected if set ) + S_Install, // install candidateObj ( have no installedObj, clears S_Taboo if set ) + // not requested by user: + S_AutoDel, // delete installedObj + S_AutoUpdate, // install candidateObj ( have installedObj ) + S_AutoInstall, // install candidateObj ( have no installedObj ) + // no modification: + S_KeepInstalled, // no modification ( have installedObj && !S_Protected, clears S_Protected if set ) + S_NoInst, // no modification ( have no installedObj && !S_Taboo, clears S_Taboo if set ) + }; +*/ + MIL << sel << endl; + chst( sel, ui::S_Update ); + chst( sel, ui::S_Install ); + chst( sel, ui::S_Protected ); + chst( sel, ui::S_KeepInstalled ); INT << "===[END]============================================" << endl << endl; Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?… ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Mon Sep 3 17:10:22 2007 @@ -1,8 +1,15 @@ ------------------------------------------------------------------- +Mon Sep 3 17:14:02 CEST 2007 - ma(a)suse.de + +- Reset transact bits when switching status from + "update" to "protected" (#246976) +- version 3.22.1 + +------------------------------------------------------------------- Mon Sep 3 13:56:42 CEST 2007 - schubi(a)suse.de - new translations added -- rev 7083 +- rev 7083 ------------------------------------------------------------------- Fri Aug 31 22:10:55 CEST 2007 - ma(a)suse.de Modified: trunk/libzypp/zypp/ui/SelectableImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ui/SelectableImpl.c… ============================================================================== --- trunk/libzypp/zypp/ui/SelectableImpl.cc (original) +++ trunk/libzypp/zypp/ui/SelectableImpl.cc Mon Sep 3 17:10:22 2007 @@ -126,6 +126,7 @@ bool setProtected() const { if ( inst ) { + resetTransactingCandidates(); inst.status().setTransact( false, ResStatus::USER ); return inst.status().setLock( true, ResStatus::USER ); } else Modified: trunk/libzypp/zypp/ui/SelectableImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ui/SelectableImpl.h… ============================================================================== --- trunk/libzypp/zypp/ui/SelectableImpl.h (original) +++ trunk/libzypp/zypp/ui/SelectableImpl.h Mon Sep 3 17:10:22 2007 @@ -188,7 +188,7 @@ return str << '[' << obj.kind() << ']' << obj.name() << ": " << obj.status() << " (I " << obj._installedItem << ")" << " (A " << obj._availableItems.size() << ")" - << obj._candidate; + << obj.candidateObj(); } ///////////////////////////////////////////////////////////////// -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7093 - /trunk/zypper/src/zypper-media-callbacks.h
by jkupec＠svn.opensuse.org 03 Sep '07

03 Sep '07

Author: jkupec Date: Mon Sep 3 17:08:46 2007 New Revision: 7093 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7093&view=rev Log: - authentication prompt implemented (190609) Modified: trunk/zypper/src/zypper-media-callbacks.h Modified: trunk/zypper/src/zypper-media-callbacks.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-media-callback… ============================================================================== --- trunk/zypper/src/zypper-media-callbacks.h (original) +++ trunk/zypper/src/zypper-media-callbacks.h Mon Sep 3 17:08:46 2007 @@ -22,6 +22,7 @@ #include <zypp/Repository.h> #include <zypp/Digest.h> #include <zypp/Url.h> +#include <zypp/media/MediaUserAuth.h> #include "zypper.h" #include "zypper-callbacks.h" @@ -106,6 +107,50 @@ } }; + struct AuthenticationReportReceiver : public zypp::callback::ReceiveReport<zypp::media::AuthenticationReport> + { + virtual bool prompt(const zypp::Url & url, + const std::string & description, + zypp::media::AuthData & auth_data) + { + if (gSettings.non_interactive) + { + MIL << "Non-interactive mode: aborting" << std::endl; + cout_vv << description << std::endl; + cout_vv << "Non-interactive mode: aborting" << std::endl; + return false; + } + + cout << description << std::endl; + + // curl authentication + zypp::media::CurlAuthData * auth_data_ptr = + dynamic_cast<zypp::media::CurlAuthData*> (&auth_data); + if (auth_data_ptr) + { + cout_vv << "available auth types: " + << auth_data_ptr->authTypeAsString() << std::endl; + + cout << "User Name: "; + string username; + std::cin >> username; + auth_data_ptr->setUserName(username); + + cout << "Password: "; + string password; + std::cin >> password; + if (password.empty()) return false; + auth_data_ptr->setPassword(password); + + auth_data_ptr->setAuthType("basic,digest"); + + return true; + } + + return false; + } + }; + /////////////////////////////////////////////////////////////////// }; // namespace ZmartRecipients /////////////////////////////////////////////////////////////////// @@ -115,18 +160,21 @@ private: ZmartRecipients::MediaChangeReportReceiver _mediaChangeReport; ZmartRecipients::DownloadProgressReportReceiver _mediaDownloadReport; + ZmartRecipients::AuthenticationReportReceiver _mediaAuthenticationReport; public: MediaCallbacks() { MIL << "Set media callbacks.." << endl; _mediaChangeReport.connect(); _mediaDownloadReport.connect(); + _mediaAuthenticationReport.connect(); } ~MediaCallbacks() { _mediaChangeReport.disconnect(); _mediaDownloadReport.disconnect(); + _mediaAuthenticationReport.disconnect(); } }; -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7092 - /trunk/libzypp-testsuite/solver/deptestomatic.howto
by kkaempf＠svn.opensuse.org 03 Sep '07

03 Sep '07

Author: kkaempf Date: Mon Sep 3 16:54:30 2007 New Revision: 7092 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7092&view=rev Log: typo Modified: trunk/libzypp-testsuite/solver/deptestomatic.howto Modified: trunk/libzypp-testsuite/solver/deptestomatic.howto URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/deptest… ============================================================================== --- trunk/libzypp-testsuite/solver/deptestomatic.howto (original) +++ trunk/libzypp-testsuite/solver/deptestomatic.howto Mon Sep 3 16:54:30 2007 @@ -50,7 +50,7 @@ </setup>  -  +  <trial> <note/>  -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7091 - /trunk/updater-kde/package/opensuse-updater-kde.spec
by tgoettlicher＠svn.opensuse.org 03 Sep '07

03 Sep '07

Author: tgoettlicher Date: Mon Sep 3 16:47:49 2007 New Revision: 7091 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7091&view=rev Log: spec Modified: trunk/updater-kde/package/opensuse-updater-kde.spec Modified: trunk/updater-kde/package/opensuse-updater-kde.spec URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/package/opensuse-upd… ============================================================================== --- trunk/updater-kde/package/opensuse-updater-kde.spec (original) +++ trunk/updater-kde/package/opensuse-updater-kde.spec Mon Sep 3 16:47:49 2007 @@ -89,6 +89,10 @@ %changelog -n opensuse-updater-kde +* Mon Sep 3 2007 - tgoettlicher(a)suse.de +- changed call of "yast2 inst_source" to "yast2 repositories" +- updated translations +- fixed bug that prevented install of pkg-mgr-patch * Thu Aug 30 2007 - tgoettlicher(a)suse.de - improved error handling * Thu Aug 30 2007 - tgoettlicher(a)suse.de -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7090 - /trunk/zypper/doc/zypper.8
by mvidner＠svn.opensuse.org 03 Sep '07

03 Sep '07

Author: mvidner Date: Mon Sep 3 16:05:38 2007 New Revision: 7090 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7090&view=rev Log: Documented /etc/zypp/locks Modified: trunk/zypper/doc/zypper.8 Modified: trunk/zypper/doc/zypper.8 URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/doc/zypper.8?rev=7090&r1=… ============================================================================== --- trunk/zypper/doc/zypper.8 (original) +++ trunk/zypper/doc/zypper.8 Mon Sep 3 16:05:38 2007 @@ -346,11 +346,38 @@ .I \-R, \-\-root <dir> Operates on a different root directory. +.SH "LOCKS" +.LP +The file +.B /etc/zypp/locks +can contain a list of packages to be locked. These will not be updated +or removed by the solver. + +Empty lines and lines beginning with \fB#\fR are ignored. Each line is of the form +"\fIPATTERN \fR[ \fIOP EDITION \fR]" +where +.I PATTERN +is a name with shell wildcards \fB?\fR and \fB*\fR, +.I OP +is one of \fB< <= = >= >\fR, and +.I EDITION +is \fI VERSION\fR[\fB-\fIRELEASE\fR]. + +.TP +Example: +# Don't update the old KDE +.br +kde* < 3.5 + + .SH "FILES" .TP .B /etc/zypp/repos.d Directory containing repository configuration (*.repo) files. You can use the \fBrepo\fR commands to manipulate these files, or you can edit them yourself. In either case, after doing the modifications, executing \fBzypper refresh\fR is strongly recommended. .TP +.B /etc/zypp/locks +File with package lock definitions, see the section LOCKS. +.TP .B /var/cache/zypp/raw Directory for storing raw metadata contained in repositories. .TP -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7089 - /trunk/updater-kde/package/opensuse-updater-kde.changes
by tgoettlicher＠svn.opensuse.org 03 Sep '07

03 Sep '07

Author: tgoettlicher Date: Mon Sep 3 16:05:17 2007 New Revision: 7089 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7089&view=rev Log: changes Modified: trunk/updater-kde/package/opensuse-updater-kde.changes Modified: trunk/updater-kde/package/opensuse-updater-kde.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/package/opensuse-upd… ============================================================================== --- trunk/updater-kde/package/opensuse-updater-kde.changes (original) +++ trunk/updater-kde/package/opensuse-updater-kde.changes Mon Sep 3 16:05:17 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Sep 3 16:02:13 CEST 2007 - tgoettlicher(a)suse.de + +- changed call of "yast2 inst_source" to "yast2 repositories" +- r7088 + +------------------------------------------------------------------- Mon Sep 3 12:49:17 CEST 2007 - tgoettlicher(a)suse.de - updated translations -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7088 - /trunk/updater-kde/updater/zypp/ZYppUpdater.cpp
by tgoettlicher＠svn.opensuse.org 03 Sep '07

03 Sep '07

Author: tgoettlicher Date: Mon Sep 3 16:04:07 2007 New Revision: 7088 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7088&view=rev Log: changed call of "yast2 inst_source" to "yast2 repositories" Modified: trunk/updater-kde/updater/zypp/ZYppUpdater.cpp Modified: trunk/updater-kde/updater/zypp/ZYppUpdater.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/zypp/ZYppUpd… ============================================================================== --- trunk/updater-kde/updater/zypp/ZYppUpdater.cpp (original) +++ trunk/updater-kde/updater/zypp/ZYppUpdater.cpp Mon Sep 3 16:04:07 2007 @@ -493,7 +493,7 @@ kdDebug() << "configure updater" << endl; KProcess *inst_source = new KProcess; - *inst_source << "opensuseupdater-su" << "-c" << "/sbin/yast2 inst_source"; + *inst_source << "opensuseupdater-su" << "-c" << "/sbin/yast2 repositories"; connect( inst_source, SIGNAL( processExited( KProcess * ) ), SLOT( slotInstSourceProcessExited( KProcess * ) ) ); -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7087 - /trunk/zypper/package/zypper.changes
by jkupec＠svn.opensuse.org 03 Sep '07

03 Sep '07

Author: jkupec Date: Mon Sep 3 14:16:44 2007 New Revision: 7087 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7087&view=rev Log: .chages Modified: trunk/zypper/package/zypper.changes Modified: trunk/zypper/package/zypper.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/package/zypper.changes?re… ============================================================================== --- trunk/zypper/package/zypper.changes (original) +++ trunk/zypper/package/zypper.changes Mon Sep 3 14:16:44 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Sep 3 14:15:59 CEST 2007 - jkupec(a)suse.cz + +- removing rpm message improved (#307132) +- r7086 + +------------------------------------------------------------------- Mon Sep 3 12:34:35 CEST 2007 - kkaempf(a)suse.de - make (r)etry (c)ancel answer case-insensitive (#307122) -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0