Merge pull request #38 from yast/prefer_CD

Always prefer DVD medium to download (not only during update) (bnc#865819)
yast · Feb 26, 2014 · f894e94 · f894e94
2 parents d6d2ff7 + 918d807
commit f894e94
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/package/yast2-packager.changes b/package/yast2-packager.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Feb 26 14:46:40 UTC 2014 - lslezak@suse.cz
+
+- Always prefer DVD medium to download (not only during update)
+  (bnc#865819)
+- 3.1.5
+
 -------------------------------------------------------------------
 Mon Feb 17 16:30:26 CET 2014 - locilka@suse.com
 

diff --git a/package/yast2-packager.spec b/package/yast2-packager.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-packager
-Version:        3.1.4
+Version:        3.1.5
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/clients/inst_kickoff.rb b/src/clients/inst_kickoff.rb
@@ -60,6 +60,10 @@ def main
         end
       end
 
+      # prefer CD/DVD media to download during installation/update
+      Builtins.y2milestone("Prefer CD/DVD media to download")
+      Pkg.SetZConfig({ "download_media_prefer_download" => false })
+
       # installation, for instance...
       if !Mode.update
         # make some directories
@@ -162,10 +166,6 @@ def main
         WFM.CallFunction("inst_bootloader", WFM.Args) 
         #	}
       else
-        # prefer CD/DVD media to download during installation/update
-        Builtins.y2milestone("Update mode - prefer CD/DVD media to download")
-        Pkg.SetZConfig({ "download_media_prefer_download" => false })
-
         if Stage.normal
           Yast.import "Kernel"
           @kernel = Kernel.ComputePackage