Hello community,
here is the log from the commit of package yast2-packager
checked in at Thu Sep 6 21:00:01 CEST 2007.
--------
--- yast2-packager/yast2-packager.changes 2007-09-03 16:43:04.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes 2007-09-05 14:59:31.000000000 +0200
@@ -1,0 +2,12 @@
+Wed Sep 5 13:41:41 CEST 2007 - locilka@suse.cz
+
+- Reading and using proxy settings before inst_productsources
+ starts downloading files (#307680).
+- Initializing packager callbacks in inst_productsources on
+ a running system (#307652).
+- Warning when inst_productsources is called in installation and
+ the inst-sys has not enough memory (#305554).
+- Adjusted RPM dependencies.
+- 2.15.75
+
+-------------------------------------------------------------------
Old:
----
yast2-packager-2.15.74.tar.bz2
New:
----
yast2-packager-2.15.75.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.bD3396/_old 2007-09-06 20:58:38.000000000 +0200
+++ /var/tmp/diff_new_pack.bD3396/_new 2007-09-06 20:58:38.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.15.74)
+# spec file for package yast2-packager (Version 2.15.75)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-packager
-Version: 2.15.74
+Version: 2.15.75
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.15.74.tar.bz2
+Source0: yast2-packager-2.15.75.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-country yast2-devtools yast2-slp yast2-testsuite yast2-xml
BuildRequires: yast2 >= 2.15.38
@@ -34,6 +34,10 @@
Requires: yast2-transfer
# XML module (inst_productsources.ycp)
Requires: yast2-xml
+# setenv() builtin
+Conflicts: yast2-core < 2.15.10
+# NotEnoughMemory-related functions moved to misc.ycp import-file
+Conflicts: yast2-add-on < 2.15.15
Provides: yast2-config-package-manager
Obsoletes: yast2-config-package-manager
Provides: y2t_spkg y2t_inst-packages y2pkginf y2c_spkg
@@ -55,7 +59,7 @@
Arvin Schnell
%prep
-%setup -n yast2-packager-2.15.74
+%setup -n yast2-packager-2.15.75
%build
%{prefix}/bin/y2tool y2autoconf
@@ -96,6 +100,15 @@
%doc %{prefix}/share/doc/packages/yast2-packager
%changelog
+* Wed Sep 05 2007 - locilka@suse.cz
+- Reading and using proxy settings before inst_productsources
+ starts downloading files (#307680).
+- Initializing packager callbacks in inst_productsources on
+ a running system (#307652).
+- Warning when inst_productsources is called in installation and
+ the inst-sys has not enough memory (#305554).
+- Adjusted RPM dependencies.
+- 2.15.75
* Mon Sep 03 2007 - locilka@suse.cz
- Correctly evaluating relurl:// parameters, such as
relurl://.../?device=sda5 (#306670).
++++++ yast2-packager-2.15.74.tar.bz2 -> yast2-packager-2.15.75.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.74/src/clients/inst_check_memsize.ycp new/yast2-packager-2.15.75/src/clients/inst_check_memsize.ycp
--- old/yast2-packager-2.15.74/src/clients/inst_check_memsize.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-packager-2.15.75/src/clients/inst_check_memsize.ycp 2007-09-04 16:22:17.000000000 +0200
@@ -0,0 +1,27 @@
+/**
+ * File: clients/inst_check_memsize.ycp
+ * Package: Installation
+ * Summary: Checking whether system has enough memory (bugzilla #305554)
+ * Authors: Lukas Ocilka
+ *
+ * $Id:$
+ *
+ */
+
+{
+ include "add-on/misc.ycp";
+
+ // Memory is low
+ if (HasInsufficientMemory()) {
+ // User wants to continue
+ if (ContinueIfInsufficientMemory ()) {
+ return `continue;
+ // User wants to skip
+ } else {
+ return `skip;
+ }
+ }
+
+ // Enough memory
+ return `continue;
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.74/src/clients/inst_productsources.ycp new/yast2-packager-2.15.75/src/clients/inst_productsources.ycp
--- old/yast2-packager-2.15.74/src/clients/inst_productsources.ycp 2007-08-31 17:33:06.000000000 +0200
+++ new/yast2-packager-2.15.75/src/clients/inst_productsources.ycp 2007-09-05 14:43:06.000000000 +0200
@@ -68,6 +68,7 @@
import "Stage";
import "Report";
import "CommandLine";
+ import "PackageCallbacks";
import "FileUtils";
import "HTTP";
@@ -82,6 +83,11 @@
include "installation/misc.ycp";
+ if (AddOnProduct::skip_add_ons) {
+ y2milestone ("Skipping module (as requested before)");
+ return `auto;
+ }
+
if (GetInstArgs::going_back()) {
y2milestone ("Going back...");
return `back;
@@ -118,6 +124,43 @@
return sformat ("(%1|%2)", s_url, s_path);
}
+
+
+ // See bugzilla #307680
+ // Proxy needs to be read from sysconfig and
+ // set by setenv() builtin
+ void InitProxySettings () {
+ y2milestone ("Adjusting proxy settings");
+
+ map proxy_items = $[
+ "http_proxy":"HTTP_PROXY", "FTP_PROXY":"FTP_PROXY",
+ "HTTPS_PROXY":"HTTPS_PROXY", "NO_PROXY":"NO_PROXY",
+ ];
+ boolean use_proxy = false;
+
+ SCR::RegisterAgent (
+ .current_proxy_settings,
+ `ag_ini(
+ `SysConfigFile("/etc/sysconfig/proxy")
+ )
+ );
+
+ use_proxy = (SCR::Read(.sysconfig.proxy.PROXY_ENABLED) != "no");
+
+ string item_value = "";
+ foreach (string proxy_item, string sysconfig_item, proxy_items, {
+ item_value = (string) SCR::Read (add (.sysconfig.proxy, sysconfig_item));
+ if (item_value == nil) item_value = "";
+
+ if (use_proxy == true && item_value != "") {
+ y2milestone ("Adjusting '%1'='%2'", proxy_item, item_value);
+ setenv (proxy_item, item_value);
+ }
+ });
+
+ SCR::UnregisterAgent (.current_proxy_settings);
+ }
+
// Function returns whether user wants to abort the installation / configuration
// true - abort
// false - do not abort
@@ -312,6 +355,10 @@
y2milestone ("Server response: %1", server_response);
+ if (server_response == nil) {
+ return false;
+ }
+
return true;
}
@@ -424,7 +471,7 @@
map cmd = (map) SCR::Execute (.target.bash_output, "echo -n $LANG");
string ret = tostring (cmd["stdout"]:"");
- if (ret == "C" || ret == "") ret = nil;
+ if (ret == "C" || ret == "" || ret == "POSIX") ret = nil;
y2milestone ("Using lang: %1", ret);
return ret;
@@ -471,6 +518,23 @@
if (UserWantsToAbort()) return `abort;
+ // Bugzilla #305554
+ // Check if there is enough memory (only in inst-sys)
+ // Called via WFM::call because of breaking RPM dependencies
+ // on yast2-add-on package.
+ if (Stage::initial()) {
+ any client_ret = WFM::call ("inst_check_memsize");
+
+ if (client_ret == `skip) {
+ // do not use them next time
+ Installation::add_on_selected = false;
+ Installation::productsources_selected = false;
+ y2milestone ("Skipping inst_productsources");
+
+ return `skip;
+ }
+ }
+
if (! NetworkRunning()) {
y2warning ("Cannot proceed, no network configured...");
// TRANSLATORS: error report
@@ -502,6 +566,15 @@
}
Progress::NextStage();
+
+ if (UserWantsToAbort()) return `abort;
+
+ // hotfix for bug #307680
+ // yast2-transfer ignores proxy settings
+ // will be fixed globally after 10.3
+ if (Mode::normal()) {
+ InitProxySettings();
+ }
if (UserWantsToAbort()) return `abort;
@@ -513,7 +586,14 @@
if (language_long == nil)
language_long = Language::language;
- language_short = substring (language_long, 0, 2);
+ if (language_long != nil) {
+ if (size(language_long) >= 2) {
+ language_short = substring (language_long, 0, 2);
+ } else {
+ language_short = language_long;
+ }
+ }
+
y2milestone ("Preferred language: %1 %2", language_long, language_short);
if (UserWantsToAbort()) return `abort;
@@ -1218,6 +1298,8 @@
"ws_start" : "read",
"read" : $[
`next : "sources",
+ // not enough memory
+ `skip : `next,
`nosources : `next,
`abort : `abort,
],
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.74/src/modules/AddOnProduct.ycp new/yast2-packager-2.15.75/src/modules/AddOnProduct.ycp
--- old/yast2-packager-2.15.74/src/modules/AddOnProduct.ycp 2007-09-03 16:39:25.000000000 +0200
+++ new/yast2-packager-2.15.75/src/modules/AddOnProduct.ycp 2007-09-05 14:40:50.000000000 +0200
@@ -89,6 +89,11 @@
// In installation: check for low-memory machines
global boolean low_memory_already_reported = false;
+// Bugzilla #305554
+// Both online-repositories and add-ons use the same function and variable
+// if true, both are skipped at once without asking
+global boolean skip_add_ons = false;
+
// --> FATE #302123: Allow relative paths in "add_on_products" file
string base_product_url = nil;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.74/VERSION new/yast2-packager-2.15.75/VERSION
--- old/yast2-packager-2.15.74/VERSION 2007-09-03 16:40:30.000000000 +0200
+++ new/yast2-packager-2.15.75/VERSION 2007-09-05 14:59:40.000000000 +0200
@@ -1 +1 @@
-2.15.74
+2.15.75
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org