Author: lslezak Date: Wed Jun 4 17:28:22 2008 New Revision: 48080 URL: http://svn.opensuse.org/viewcvs/yast?rev=48080&view=rev Log: - use PackageLock::Connect() - display [Abort] button (bnc#293356) Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/clients/key_manager.ycp trunk/packager/src/clients/repositories.ycp trunk/packager/src/clients/sw_single.ycp trunk/packager/yast2-packager.spec.in Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.changes?rev=48080&r1=48079&r2=48080&view=diff ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Wed Jun 4 17:28:22 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Jun 4 17:26:06 CEST 2008 - lslezak@suse.cz + +- use PackageLock::Connect() - display [Abort] button (bnc#293356) + +------------------------------------------------------------------- Wed Jun 4 13:19:01 CEST 2008 - lslezak@suse.cz - removed the workaround for locking 64-bit packages on PPC32 Modified: trunk/packager/src/clients/key_manager.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/key_manager.ycp?rev=48080&r1=48079&r2=48080&view=diff ============================================================================== --- trunk/packager/src/clients/key_manager.ycp (original) +++ trunk/packager/src/clients/key_manager.ycp Wed Jun 4 17:28:22 2008 @@ -26,14 +26,10 @@ symbol Read() { - // TODO: the check dialog contains only [Continue] [Retry] buttons - // there is no [Abort] (#293356) - if (!PackageLock::Check()) + if (!PackageLock::Connect(false)["connected"]:false) { - // error message - SW management is already in use, access denied + // SW management is already in use, access denied // the yast module cannot be started - Report::Error(_("The GPG key management module cannot work -without access to the software management system.")); Wizard::CloseDialog (); return `abort; } Modified: trunk/packager/src/clients/repositories.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/repositories.ycp?rev=48080&r1=48079&r2=48080&view=diff ============================================================================== --- trunk/packager/src/clients/repositories.ycp (original) +++ trunk/packager/src/clients/repositories.ycp Wed Jun 4 17:28:22 2008 @@ -835,7 +835,7 @@ } // check whether running as root - if (! Confirm::MustBeRoot () || ! PackageLock::Check ()) + if (! Confirm::MustBeRoot () || !PackageLock::Connect(false)["connected"]:false) { UI::CloseDialog (); return `abort; Modified: trunk/packager/src/clients/sw_single.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/sw_single.ycp?rev=48080&r1=48079&r2=48080&view=diff ============================================================================== --- trunk/packager/src/clients/sw_single.ycp (original) +++ trunk/packager/src/clients/sw_single.ycp Wed Jun 4 17:28:22 2008 @@ -317,14 +317,10 @@ return `abort; } - // TODO: the check dialog contains only [Continue] [Retry] buttons - // there is no [Abort] (#293356) - if (!PackageLock::Check()) + if (!PackageLock::Connect(false)["connected"]:false) { - // error message - SW management is already in use, access denied + // SW management is already in use, access denied // the yast module cannot be started - Report::Error(_("The software management module cannot work -without access to the software management system.")); UI::CloseDialog (); return `abort; } Modified: trunk/packager/yast2-packager.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/yast2-packager.spec.in?rev=48080&r1=48079&r2=48080&view=diff ============================================================================== --- trunk/packager/yast2-packager.spec.in (original) +++ trunk/packager/yast2-packager.spec.in Wed Jun 4 17:28:22 2008 @@ -4,8 +4,8 @@ @HEADER@ BuildRequires: gcc-c++ libxcrypt-devel yast2-country-data yast2-xml perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite yast2-slp -# empty package callbacks -BuildRequires: yast2 >= 2.16.52 +# PackageLock::Connect() +BuildRequires: yast2 >= 2.16.72 # "order" flag for pattern resolvables BuildRequires: yast2-pkg-bindings >= 2.16.31 @@ -20,8 +20,8 @@ # "order" flag for pattern resolvables Requires: yast2-pkg-bindings >= 2.16.31 -# empty package callbacks -Requires: yast2 >= 2.16.52 +# PackageLock::Connect() +Requires: yast2 >= 2.16.72 # unzipping license file Requires: unzip -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org