August 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r39903 - in /trunk/pkg-bindings: package/yast2-pkg-bindings.changes src/Source.cc
by lslezak＠svn.opensuse.org 02 Aug '07

02 Aug '07

Author: lslezak Date: Thu Aug 2 15:06:06 2007 New Revision: 39903 URL: http://svn.opensuse.org/viewcvs/yast?rev=39903&view=rev Log: - added product directory support Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes trunk/pkg-bindings/src/Source.cc Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/package/yast2-pkg-b… ============================================================================== --- trunk/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ trunk/pkg-bindings/package/yast2-pkg-bindings.changes Thu Aug 2 15:06:06 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Aug 2 15:05:39 CEST 2007 - lslezak(a)suse.cz + +- added product directory support + +------------------------------------------------------------------- Thu Aug 2 09:56:21 CEST 2007 - lslezak(a)suse.cz - added Pkg::CallbackInitDownload() and Pkg::CallbackDestDownload() Modified: trunk/pkg-bindings/src/Source.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Source.cc?rev=3… ============================================================================== --- trunk/pkg-bindings/src/Source.cc (original) +++ trunk/pkg-bindings/src/Source.cc Thu Aug 2 15:06:06 2007 @@ -790,9 +790,7 @@ data->add( YCPString("enabled"), YCPBoolean(repo->repoInfo().enabled())); data->add( YCPString("autorefresh"), YCPBoolean(repo->repoInfo().autorefresh())); data->add( YCPString("type"), YCPString(srctype)); -#warning FIXME: "product_dir" is always "/" -// data->add( YCPString("product_dir"), YCPString(repo->path().asString())); - data->add( YCPString("product_dir"), YCPString("/")); + data->add( YCPString("product_dir"), YCPString(repo->repoInfo().path().asString())); // check if there is an URL if (repo->repoInfo().baseUrlsBegin() != repo->repoInfo().baseUrlsEnd()) @@ -1365,18 +1363,7 @@ std::string alias = removeAlias(url_r, url); y2milestone("Alias from URL: '%s'", alias.c_str()); -#warning FIXME: use base_source (base_source vs. addon) -#warning FIXME: use path_r (product directory) -/* - FIXME: add the product dir to the URL? - std::string prod_dir = path_r.asString(); - if (!prod_dir.empty() && prod_dir != "/") - { - y2milestone("Using product directory: %s", prod_dir.c_str()); - std::string path = url.getPathName(); - path = path + "/" - } -*/ +#warning FIXME: use base_source (base_source vs. addon) (will be probably not needed) // repository type zypp::repo::RepoType repotype; @@ -1432,6 +1419,7 @@ repo.setName(name); repo.setType(repotype); repo.addBaseUrl(url); + repo.setPath(path_r); repo.setEnabled(true); repo.setAutorefresh(true); @@ -1602,7 +1590,7 @@ if (!params->value( YCPString("prod_dir") ).isNull() && params->value(YCPString("prod_dir"))->isString()) { - #warning FIXME TODO: add product directory support + repo.setPath(params->value(YCPString("prod_dir"))->asString()->value()); } repos.push_back(new YRepo(repo)); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r39902 - in /trunk/yast2: VERSION library/packages/src/PackageCallbacksInit.ycp package/yast2.changes yast2.spec.in
by lslezak＠svn.opensuse.org 02 Aug '07

02 Aug '07

Author: lslezak Date: Thu Aug 2 14:56:04 2007 New Revision: 39902 URL: http://svn.opensuse.org/viewcvs/yast?rev=39902&view=rev Log: - register download callbacks (#292629) - 2.15.45 Modified: trunk/yast2/VERSION trunk/yast2/library/packages/src/PackageCallbacksInit.ycp trunk/yast2/package/yast2.changes trunk/yast2/yast2.spec.in Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=39902&r1=39901… ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Thu Aug 2 14:56:04 2007 @@ -1 +1 @@ -2.15.44 +2.15.45 Modified: trunk/yast2/library/packages/src/PackageCallbacksInit.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/packages/src/Packa… ============================================================================== --- trunk/yast2/library/packages/src/PackageCallbacksInit.ycp (original) +++ trunk/yast2/library/packages/src/PackageCallbacksInit.ycp Thu Aug 2 14:56:04 2007 @@ -50,6 +50,24 @@ Pkg::CallbackDoneScanDb (""); } +global void SetDownloadCallbacks () +{ + Pkg::CallbackInitDownload ("PackageCallbacks::InitDownload"); + Pkg::CallbackStartDownload ("PackageCallbacks::StartDownload"); + Pkg::CallbackProgressDownload ("PackageCallbacks::ProgressDownload"); + Pkg::CallbackDoneDownload ("PackageCallbacks::DoneDownload"); + Pkg::CallbackDestDownload ("PackageCallbacks::DestDownload"); +} + +global void ResetDownloadCallbacks () +{ + Pkg::CallbackInitDownload (""); + Pkg::CallbackStartDownload (""); + Pkg::CallbackProgressDownload (""); + Pkg::CallbackDoneDownload (""); + Pkg::CallbackDestDownload (""); +} + /** * Register package manager callbacks @@ -127,6 +145,8 @@ SetScriptCallbacks(); SetScanDBCallbacks(); + + SetDownloadCallbacks(); } /* EOF */ Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Thu Aug 2 14:56:04 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Aug 2 14:54:01 CEST 2007 - lslezak(a)suse.cz + +- register download callbacks (#292629) +- 2.15.45 + +------------------------------------------------------------------- Mon Jul 30 13:08:04 CEST 2007 - jsrain(a)suse.cz - install bigsmp kernel regardless the memory size (Fate #159006) Modified: trunk/yast2/yast2.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/yast2.spec.in?rev=39902&r1… ============================================================================== --- trunk/yast2/yast2.spec.in (original) +++ trunk/yast2/yast2.spec.in Thu Aug 2 14:56:04 2007 @@ -6,8 +6,8 @@ BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-pkg-bindings yast2-testsuite yast2-perl-bindings # SCR::RegisterNewAgents() Requires: yast2-core >= 2.15.4 -# Pkg::CallbackProgressReport*() -Requires: yast2-pkg-bindings >= 2.15.30 +# Pkg::CallbackInitDownload() +Requires: yast2-pkg-bindings >= 2.15.39 Requires: yast2_ui yast2_theme # For Cron Agent, Module Requires: perl-Config-Crontab -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r39901 - /tags/stable-2_15_53/packager/
by lslezak＠svn.opensuse.org 02 Aug '07

02 Aug '07

Author: lslezak Date: Thu Aug 2 14:50:33 2007 New Revision: 39901 URL: http://svn.opensuse.org/viewcvs/yast?rev=39901&view=rev Log: Created tag stable-2_15_53 for packager Added: tags/stable-2_15_53/packager/ - copied from r39900, trunk/packager/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r39900 - /trunk/packager/src/include/checkmedia/ui.ycp
by lslezak＠svn.opensuse.org 02 Aug '07

02 Aug '07

Author: lslezak Date: Thu Aug 2 14:50:23 2007 New Revision: 39900 URL: http://svn.opensuse.org/viewcvs/yast?rev=39900&view=rev Log: - don't call the removed code Modified: trunk/packager/src/include/checkmedia/ui.ycp Modified: trunk/packager/src/include/checkmedia/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/include/checkmedia/… ============================================================================== --- trunk/packager/src/include/checkmedia/ui.ycp (original) +++ trunk/packager/src/include/checkmedia/ui.ycp Thu Aug 2 14:50:23 2007 @@ -402,9 +402,6 @@ { CheckMedia::Stop(); - // remount umounted CD drives back - MountCD(unmountedCD); - return `abort; } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r39899 - /tags/stable-2_15_53/packager/
by lslezak＠svn.opensuse.org 02 Aug '07

02 Aug '07

Author: lslezak Date: Thu Aug 2 14:49:52 2007 New Revision: 39899 URL: http://svn.opensuse.org/viewcvs/yast?rev=39899&view=rev Log: - removed to retag Removed: tags/stable-2_15_53/packager/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r39898 - /tags/stable-2_15_53/packager/
by lslezak＠svn.opensuse.org 02 Aug '07

02 Aug '07

Author: lslezak Date: Thu Aug 2 14:46:01 2007 New Revision: 39898 URL: http://svn.opensuse.org/viewcvs/yast?rev=39898&view=rev Log: Created tag stable-2_15_53 for packager Added: tags/stable-2_15_53/packager/ - copied from r39897, trunk/packager/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r39897 - in /trunk/packager: VERSION package/yast2-packager.changes src/include/checkmedia/ui.ycp
by lslezak＠svn.opensuse.org 02 Aug '07

02 Aug '07

Author: lslezak Date: Thu Aug 2 14:45:54 2007 New Revision: 39897 URL: http://svn.opensuse.org/viewcvs/yast?rev=39897&view=rev Log: - release all sources in the first stage, manual CD unmount is not needed anymore (FATE #413) - 2.15.53 Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes trunk/packager/src/include/checkmedia/ui.ycp Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=39897&r1=39… ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Thu Aug 2 14:45:54 2007 @@ -1 +1 @@ -2.15.52 +2.15.53 Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Thu Aug 2 14:45:54 2007 @@ -7,6 +7,9 @@ - improved download progress callback handlers (#292629) - fixed "tick" callback progress - beep when another medium is needed (#45527, FATE #120296) +- release all sources in the first stage, manual CD unmount is not + needed anymore (FATE #413) +- 2.15.53 ------------------------------------------------------------------- Tue Jul 31 14:24:52 CEST 2007 - locilka(a)suse.cz Modified: trunk/packager/src/include/checkmedia/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/include/checkmedia/… ============================================================================== --- trunk/packager/src/include/checkmedia/ui.ycp (original) +++ trunk/packager/src/include/checkmedia/ui.ycp Thu Aug 2 14:45:54 2007 @@ -132,80 +132,6 @@ return ret; } -/** - * Unmount CD drives in the first installation stage - * @return map map with unmounted drives (key: device name, value: mount point) - */ -define map<string,string> UnmountCD() { - // key: device, value: mountpoint - map<string,string> unmounted = $[]; - - if (Stage::initial()) - { - list<map> cddevices = CheckMedia::DetectedCDDevices(); - y2milestone("Detected CD devices: %1", cddevices); - - if (cddevices != nil) - { - // reload /proc/mounts file - SCR::UnmountAgent(.proc.mounts); - - list<map> mounts = (list<map>)SCR::Read(.proc.mounts); - list<string> cddevs = maplist(map cdd, cddevices, {return cdd["dev_name"]:"";}); - - // check which CD drive is mounted - foreach(map mnt, mounts, { - string mpoint = mnt["file"]:""; - string device = mnt["spec"]:""; - - if (mpoint != nil && device != nil && contains(cddevs, device)) - { - boolean succ = (boolean) SCR::Execute(.target.umount, mpoint); - if (succ == true) - { - unmounted = add(unmounted, device, mpoint); - y2milestone("Unmounted device: %1 (%2)", device, mpoint); - } - else - { - y2warning("Could not unmount device %1 (%2)", device, mpoint); - } - } - } - ); - } - } - - y2milestone("unmounted: %1", unmounted); - - return unmounted; -} - -define boolean MountCD(map<string,string> mountedCDs) { - y2milestone("mountedCDs: %1", mountedCDs); - boolean ret = true; - - if (Stage::initial() && size(mountedCDs) > 0) - { - // remount all unmounted devices back - foreach(string device, string mpoint, mountedCDs, { - boolean succ = (boolean)SCR::Execute(.target.mount, [device, mpoint], "-o ro"); - if (succ) - { - y2milestone("Remounted device %1 (%2)", device, mpoint); - } - else - { - y2error("Mount failed: %1 (%2)", device, mpoint); - ret = false; - } - } - ); - } - - return ret; -} - // mount CD drive and check whether there is directory 'media.1' (the first medium) and 'boot' (bootable product CD) define boolean InsertedCD1() { boolean ret = true; @@ -301,8 +227,12 @@ Wizard::HideAbortButton(); } - // umount CD drives (only in the first stage) - map<string,string> unmountedCD = UnmountCD(); + // umount CD drives (release all sources) + if (Stage::initial()) + { + // release all media + Pkg::SourceReleaseAll(); + } // dialog header string caption = _("Media Check"); @@ -510,9 +440,6 @@ RequireFirstMedium(); } - // remount umounted CD drives back - MountCD(unmountedCD); - return ret; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r39896 - /trunk/packager/src/clients/inst_source.ycp
by lslezak＠svn.opensuse.org 02 Aug '07

02 Aug '07

Author: lslezak Date: Thu Aug 2 14:12:57 2007 New Revision: 39896 URL: http://svn.opensuse.org/viewcvs/yast?rev=39896&view=rev Log: - don't call SourceProductData(), it's useless Modified: trunk/packager/src/clients/inst_source.ycp Modified: trunk/packager/src/clients/inst_source.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/inst_source… ============================================================================== --- trunk/packager/src/clients/inst_source.ycp (original) +++ trunk/packager/src/clients/inst_source.ycp Thu Aug 2 14:12:57 2007 @@ -63,14 +63,12 @@ define term createItem( integer index, map source ) ``{ integer id = source[ "SrcId" ]:0; map generalData = Pkg::SourceGeneralData( id ); - map productData = Pkg::SourceProductData( id ); - y2milestone("generalData: %1", generalData); - y2milestone("productData: %1", productData); + y2milestone("generalData(%1): %2", id, generalData); string alias = haskey(sourceStatesOut[index]:$[], "name") ? sourceStatesOut[index,"name"]:"" : // unkown name (alias) of the source - generalData[ "alias" ]:productData["label"]:generalData[ "type" ]: _("Unknown Name"); + generalData[ "alias" ]:generalData[ "type" ]: _("Unknown Name"); term item = `item( `id( index ), @@ -87,14 +85,12 @@ map<string,any> getSourceInfo (integer index, map source) { integer id = source[ "SrcId" ]:0; map generalData = Pkg::SourceGeneralData( id ); - map productData = Pkg::SourceProductData( id ); - y2milestone("generalData: %1", generalData); - y2milestone("productData: %1", productData); + y2milestone("generalData(%1): %2", id, generalData); string alias = haskey(sourceStatesOut[index]:$[], "name") ? sourceStatesOut[index,"name"]:"" : // unkown name (alias) of the source - generalData[ "alias" ]:productData["label"]:generalData[ "type" ]: _("Unknown Name"); + generalData[ "alias" ]:generalData[ "type" ]: _("Unknown Name"); map<string,any> out = $[ "enabled" : source["enabled"]:true, -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r39895 - /tags/stable-2_15_2/live-installer/
by jsrain＠svn.opensuse.org 02 Aug '07

02 Aug '07

Author: jsrain Date: Thu Aug 2 13:46:18 2007 New Revision: 39895 URL: http://svn.opensuse.org/viewcvs/yast?rev=39895&view=rev Log: Created tag stable-2_15_2 for live-installer Added: tags/stable-2_15_2/live-installer/ - copied from r39894, trunk/live-installer/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r39894 - in /trunk/live-installer: VERSION package/yast2-live-installer.changes
by jsrain＠svn.opensuse.org 02 Aug '07

02 Aug '07

Author: jsrain Date: Thu Aug 2 13:46:12 2007 New Revision: 39894 URL: http://svn.opensuse.org/viewcvs/yast?rev=39894&view=rev Log: bump Modified: trunk/live-installer/VERSION trunk/live-installer/package/yast2-live-installer.changes Modified: trunk/live-installer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/VERSION?rev=39894… ============================================================================== --- trunk/live-installer/VERSION (original) +++ trunk/live-installer/VERSION Thu Aug 2 13:46:12 2007 @@ -1 +1 @@ -2.15.1 +2.15.2 Modified: trunk/live-installer/package/yast2-live-installer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/package/yast2-liv… ============================================================================== --- trunk/live-installer/package/yast2-live-installer.changes (original) +++ trunk/live-installer/package/yast2-live-installer.changes Thu Aug 2 13:46:12 2007 @@ -4,6 +4,7 @@ - even more simplified installation overview - report progress while copying to the system - reduced the steps +- 2.15.3 ------------------------------------------------------------------- Mon Jul 30 17:27:29 CEST 2007 - jsrain(a)suse.cz -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0