Author: jsuchome Date: Thu Jun 7 13:19:37 2007 New Revision: 38336 URL: http://svn.opensuse.org/viewcvs/yast?rev=38336&view=rev Log: - fix installation of inst-source-utils in CLI mode (#281792) - 2.15.11 Modified: trunk/add-on-creator/VERSION trunk/add-on-creator/package/yast2-add-on-creator.changes trunk/add-on-creator/src/AddOnCreator.ycp trunk/add-on-creator/src/add-on-creator.ycp Modified: trunk/add-on-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/VERSION?rev=38336&r1=38335&r2=38336&view=diff ============================================================================== --- trunk/add-on-creator/VERSION (original) +++ trunk/add-on-creator/VERSION Thu Jun 7 13:19:37 2007 @@ -1 +1 @@ -2.15.10 +2.15.11 Modified: trunk/add-on-creator/package/yast2-add-on-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/package/yast2-add-on-creator.changes?rev=38336&r1=38335&r2=38336&view=diff ============================================================================== --- trunk/add-on-creator/package/yast2-add-on-creator.changes (original) +++ trunk/add-on-creator/package/yast2-add-on-creator.changes Thu Jun 7 13:19:37 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jun 7 13:12:31 CEST 2007 - jsuchome@suse.cz + +- fix installation of inst-source-utils in CLI mode (#281792) +- 2.15.11 + +------------------------------------------------------------------- Wed May 30 10:09:52 CEST 2007 - jsuchome@suse.cz - added support for source rpm's (#279004) Modified: trunk/add-on-creator/src/AddOnCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/src/AddOnCreator.ycp?rev=38336&r1=38335&r2=38336&view=diff ============================================================================== --- trunk/add-on-creator/src/AddOnCreator.ycp (original) +++ trunk/add-on-creator/src/AddOnCreator.ycp Thu Jun 7 13:19:37 2007 @@ -39,6 +39,7 @@ import "FileUtils"; import "Mode"; import "Package"; +import "PackageSystem"; import "Popup"; import "Progress"; import "Report"; @@ -692,6 +693,9 @@ */ global boolean Read() { + if (!PackageSystem::CheckAndInstallPackagesInteractive (["inst-source-utils"])) + return false; + gpg_keys = read_secret_keys (); gpg_key = gpg_keys[0]:""; Modified: trunk/add-on-creator/src/add-on-creator.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/src/add-on-creator.ycp?rev=38336&r1=38335&r2=38336&view=diff ============================================================================== --- trunk/add-on-creator/src/add-on-creator.ycp (original) +++ trunk/add-on-creator/src/add-on-creator.ycp Thu Jun 7 13:19:37 2007 @@ -45,7 +45,6 @@ import "CommandLine"; import "Directory"; import "FileUtils"; -import "PackageSystem"; include "add-on-creator/wizards.ycp"; @@ -470,12 +469,7 @@ ] ]; -any ret = nil; - -if (!PackageSystem::CheckAndInstallPackagesInteractive (["inst-source-utils"])) - ret = `cancel; -else - ret = CommandLine::Run(cmdline_description); +any ret = CommandLine::Run(cmdline_description); /* Finish */ y2milestone("AddOnCreator module finished with %1", ret); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org