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=39896&r2=39897&view=diff
==============================================================================
--- 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.changes?rev=39897&r1=39896&r2=39897&view=diff
==============================================================================
--- 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@suse.cz
Modified: trunk/packager/src/include/checkmedia/ui.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/include/checkmedia/ui.ycp?rev=39897&r1=39896&r2=39897&view=diff
==============================================================================
--- 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 UnmountCD() {
- // key: device, value: mountpoint
- map 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 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 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@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
