Mailinglist Archive: opensuse-commit (1083 mails)
| < Previous | Next > |
commit yast2-packager
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Mon, 03 Sep 2007 18:48:12 +0200
- Message-id: <20070903164812.BADF6678182@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package yast2-packager
checked in at Mon Sep 3 18:48:12 CEST 2007.
--------
--- yast2-packager/yast2-packager.changes 2007-08-31 17:36:47.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes 2007-09-03 16:43:04.000000000 +0200
@@ -1,0 +2,33 @@
+Mon Sep 3 16:41:26 CEST 2007 - locilka@xxxxxxx
+
+- Correctly evaluating relurl:// parameters, such as
+ relurl://.../?device=sda5 (#306670).
+- 2.15.74
+
+-------------------------------------------------------------------
+Mon Sep 3 16:36:13 CEST 2007 - lslezak@xxxxxxx
+
+- use gif animation for the busy indicator (works also in Gtk UI)
+ (#296945), do not restart the animation too often (wait at least
+ 3 seconds)
+
+-------------------------------------------------------------------
+Mon Sep 3 14:07:53 CEST 2007 - lslezak@xxxxxxx
+
+- better busy indicator for tick callback (#296945)
+- 2.15.73
+
+-------------------------------------------------------------------
+Mon Sep 3 10:41:35 CEST 2007 - lslezak@xxxxxxx
+
+- try HTTP scheme when registering an FTP update source fails due
+ to too restrictive firewall (#227059)
+- 2.15.72
+
+-------------------------------------------------------------------
+Mon Sep 3 09:44:32 CEST 2007 - locilka@xxxxxxx
+
+- Added support for LiveCD installation into ProductLicense module
+ (#299732).
+
+-------------------------------------------------------------------
Old:
----
yast2-packager-2.15.71.tar.bz2
New:
----
yast2-packager-2.15.74.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.m10773/_old 2007-09-03 18:47:49.000000000 +0200
+++ /var/tmp/diff_new_pack.m10773/_new 2007-09-03 18:47:49.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.15.71)
+# spec file for package yast2-packager (Version 2.15.74)
#
# 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.71
+Version: 2.15.74
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.15.71.tar.bz2
+Source0: yast2-packager-2.15.74.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
@@ -55,7 +55,7 @@
Arvin Schnell <arvin@xxxxxxx>
%prep
-%setup -n yast2-packager-2.15.71
+%setup -n yast2-packager-2.15.74
%build
%{prefix}/bin/y2tool y2autoconf
@@ -96,6 +96,24 @@
%doc %{prefix}/share/doc/packages/yast2-packager
%changelog
+* Mon Sep 03 2007 - locilka@xxxxxxx
+- Correctly evaluating relurl:// parameters, such as
+ relurl://.../?device=sda5 (#306670).
+- 2.15.74
+* Mon Sep 03 2007 - lslezak@xxxxxxx
+- use gif animation for the busy indicator (works also in Gtk UI)
+ (#296945), do not restart the animation too often (wait at least
+ 3 seconds)
+* Mon Sep 03 2007 - lslezak@xxxxxxx
+- better busy indicator for tick callback (#296945)
+- 2.15.73
+* Mon Sep 03 2007 - lslezak@xxxxxxx
+- try HTTP scheme when registering an FTP update source fails due
+ to too restrictive firewall (#227059)
+- 2.15.72
+* Mon Sep 03 2007 - locilka@xxxxxxx
+- Added support for LiveCD installation into ProductLicense module
+ (#299732).
* Fri Aug 31 2007 - locilka@xxxxxxx
- Added commandline support for inst_productsources (#304720).
- 2.15.71
++++++ yast2-packager-2.15.71.tar.bz2 -> yast2-packager-2.15.74.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.71/configure new/yast2-packager-2.15.74/configure
--- old/yast2-packager-2.15.71/configure 2007-08-23 17:11:02.000000000 +0200
+++ new/yast2-packager-2.15.74/configure 2007-09-03 16:48:15.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for yast2-packager 2.15.66.
+# Generated by GNU Autoconf 2.60 for yast2-packager 2.15.74.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-packager'
PACKAGE_TARNAME='yast2-packager'
-PACKAGE_VERSION='2.15.66'
-PACKAGE_STRING='yast2-packager 2.15.66'
+PACKAGE_VERSION='2.15.74'
+PACKAGE_STRING='yast2-packager 2.15.74'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1181,7 +1181,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-packager 2.15.66 to adapt to many kinds of systems.
+\`configure' configures yast2-packager 2.15.74 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1252,7 +1252,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-packager 2.15.66:";;
+ short | recursive ) echo "Configuration of yast2-packager 2.15.74:";;
esac
cat <<\_ACEOF
@@ -1330,7 +1330,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-packager configure 2.15.66
+yast2-packager configure 2.15.74
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1344,7 +1344,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-packager $as_me 2.15.66, which was
+It was created by yast2-packager $as_me 2.15.74, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -2145,7 +2145,7 @@
# Define the identity of the package.
PACKAGE='yast2-packager'
- VERSION='2.15.66'
+ VERSION='2.15.74'
cat >>confdefs.h <<_ACEOF
@@ -2372,7 +2372,7 @@
-VERSION="2.15.66"
+VERSION="2.15.74"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak <lslezak@xxxxxxx>"
@@ -3260,7 +3260,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-packager $as_me 2.15.66, which was
+This file was extended by yast2-packager $as_me 2.15.74, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3303,7 +3303,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-packager config.status 2.15.66
+yast2-packager config.status 2.15.74
configured by $0, generated by GNU Autoconf 2.60,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.71/configure.in new/yast2-packager-2.15.74/configure.in
--- old/yast2-packager-2.15.71/configure.in 2007-08-23 17:10:58.000000000 +0200
+++ new/yast2-packager-2.15.74/configure.in 2007-09-03 16:48:10.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.15.7 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-packager, 2.15.66, http://bugs.opensuse.org/, yast2-packager)
+AC_INIT(yast2-packager, 2.15.74, http://bugs.opensuse.org/, yast2-packager)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.15.66"
+VERSION="2.15.74"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak <lslezak@xxxxxxx>"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.71/src/modules/AddOnProduct.ycp new/yast2-packager-2.15.74/src/modules/AddOnProduct.ycp
--- old/yast2-packager-2.15.71/src/modules/AddOnProduct.ycp 2007-08-03 11:53:24.000000000 +0200
+++ new/yast2-packager-2.15.74/src/modules/AddOnProduct.ycp 2007-09-03 16:39:25.000000000 +0200
@@ -105,6 +105,47 @@
}
/**
+ * Reads list of HTTP params and returns them as map
+ *
+ * @params string params
+ * @return map <string, string> params
+ *
+ * @example
+ * MakeMapFromParams ("device=sda3&login=aaa&password=bbb") -> $[
+ * "device" : "sda3",
+ * "login" : "aaa",
+ * "password" : "bbb"
+ * ]
+ */
+map <string, string> MakeMapFromParams (string params) {
+ list <string> params_list = splitstring (params, "&");
+
+ params_list = filter (string one_param, params_list, {
+ return (one_param != "" && one_param != nil);
+ });
+
+ map <string, string> ret = $[];
+ integer eq_pos = nil;
+ string opt = "";
+ string val = "";
+
+ foreach (string one_param, params_list, {
+ eq_pos = search (one_param, "=");
+
+ if (eq_pos == nil) {
+ ret[one_param] = "";
+ } else {
+ opt = substring (one_param, 0, eq_pos);
+ val = substring (one_param, (eq_pos + 1));
+
+ ret[opt] = val;
+ }
+ });
+
+ return ret;
+}
+
+/**
* Returns an absolute URL from base + relative url.
* Relative URL needs to start with 'reulrl://' othewise
* it is not considered being relative and it's returned
@@ -135,11 +176,28 @@
return url;
}
+ // bugzilla #306670
+ integer base_params_pos = search (base_url, "?");
+ string base_params = "";
+
+ if (base_params_pos != nil && base_params_pos >= 0) {
+ base_params = substring (base_url, (base_params_pos + 1));
+ base_url = substring (base_url, 0, base_params_pos);
+ }
+
+ integer added_params_pos = search (url, "?");
+ string added_params = "";
+
+ if (added_params_pos != nil && added_params_pos >= 0) {
+ added_params = substring (url, (added_params_pos + 1));
+ url = substring (url, 0, added_params_pos);
+ }
+
if (! regexpmatch (base_url, "/$")) {
base_url = base_url + "/";
}
- y2milestone ("Merging '%1' to '%2'", url, base_url);
+ y2milestone ("Merging '%1' (params '%2') to '%3' (params '%4')", url, added_params, base_url, base_params);
url = regexpsub (url, "^relurl://(.*)$", "\\1");
url = sformat ("%1%2", base_url, url);
@@ -173,6 +231,29 @@
url = regexpsub (url, "^(.*)/\\./(.*)", "\\1/\\2");
}
+ map <string, string> base_params_map = MakeMapFromParams (base_params);
+ map <string, string> added_params_map = MakeMapFromParams (added_params);
+ map <string, string> final_params_map = (map <string, string>) union (base_params_map, added_params_map);
+
+ if (size (final_params_map) > 0) {
+ y2milestone ("%1 merge %2 -> %3", base_params_map, added_params_map, final_params_map);
+
+ string url_add = "";
+
+ foreach (string opt, string val, final_params_map, {
+ url_add =
+ url_add +
+ // add '&' if needed
+ (size (url_add) > 0 ? "&" : "") +
+ opt +
+ // define 'opt=val' if val is set
+ // otherwise don't use '=val' at all
+ (size (val) > 0 ? "=" + val : "");
+ });
+
+ url = url + "?" + url_add;
+ }
+
y2milestone ("Final URL: '%1'", url);
return url;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.71/src/modules/PackageCallbacks.ycp new/yast2-packager-2.15.74/src/modules/PackageCallbacks.ycp
--- old/yast2-packager-2.15.71/src/modules/PackageCallbacks.ycp 2007-08-31 15:40:22.000000000 +0200
+++ new/yast2-packager-2.15.74/src/modules/PackageCallbacks.ycp 2007-09-03 16:40:30.000000000 +0200
@@ -7,7 +7,7 @@
*
* Purpose: provides the default Callbacks for Pkg::
*
- * $Id: PackageCallbacks.ycp 40627 2007-08-30 14:32:27Z lslezak $
+ * $Id: PackageCallbacks.ycp 40722 2007-09-03 14:40:27Z lslezak $
*
*/
@@ -32,7 +32,9 @@
global boolean _package_popup = false;
global boolean _script_popup = false;
global boolean _scan_popup = false;
-
+ global string _tick_movie = "/usr/share/YaST2/theme/current/animations/ticks-loop3.gif";
+ global integer _tick_movie_x = 7;
+ global integer _tick_movie_y = 1;
global string _package_name = "";
global integer _package_size = 0;
global boolean _deleting_package = false;
@@ -55,6 +57,8 @@
// max. length of the text in the repository popup window
integer max_size = 60;
+ integer tick_time = 0;
+
//--------------------------------------------------------------------------
// defaults
@@ -2085,6 +2089,17 @@
UI::CloseDialog();
}
+ term progressw = `Empty();
+ if ( UI::GetDisplayInfo()["HasAnimationSupport"]:false )
+ {
+ progressw = `HVCenter(`MinSize( _tick_movie_x, _tick_movie_y, `ReplacePoint(`id(`rp_progress), `Image(`id (`progress_widget), `opt(`animated), _tick_movie, "progress_widget" ))));
+ }
+ else
+ {
+ string label = (tick_progress) ? tick_labels[current_tick]:"/" : sformat("%1: %2", progress_task, val_raw);
+ progressw = `Label(label);
+ }
+
UI::OpenDialog(
`HBox(
`HSpacing(1),
@@ -2094,9 +2109,9 @@
(in_percent) ? `ProgressBar (`id (`progress_widget), task, 100, val_percent)
: `VBox(
`Label(task),
- `Label(`id(`progress_widget), (tick_progress) ? tick_labels[current_tick]:"/" : val_raw)
+ progressw
),
- `VSpacing(0.5),
+ `VSpacing(0.2),
`PushButton (`id (`abort), Label::AbortButton ()),
`VSpacing(0.5)
),
@@ -2104,6 +2119,7 @@
)
);
+ tick_time = 0;
}
}
@@ -2139,11 +2155,32 @@
if (IsProgressPopup())
{
if (tick_progress || val_progress)
- {
- string label = (tick_progress) ? tick_labels[current_tick]:"/"
- : sformat("%1: %2", progress_task, val_raw);
+ {
+ term progressw = `Empty();
+ if ( UI::GetDisplayInfo()["HasAnimationSupport"]:false )
+ {
+ progressw = `HVCenter(`MinSize( _tick_movie_x, _tick_movie_y, `Image(`id (`progress_widget), `opt(`animated), _tick_movie, "progress_widget" )));
+ }
+ else
+ {
+ string label = (tick_progress) ? tick_labels[current_tick]:"/" : sformat("%1: %2", progress_task, val_raw);
+ progressw = `Label(label);
+ }
+
+ // restart the animation only when at least 3 seconds elapsed,
+ // don't restart it too often
+ integer tm = time();
+ y2debug("Time elapsed since the last tick callback: %1", tm - tick_time);
+ if (tm - tick_time > 3)
+ {
+ UI::ReplaceWidget (`id(`rp_progress), progressw );
+ tick_time = tm;
+ }
+ else
+ {
+ y2debug("Ignoring the tick callback");
+ }
- UI::ChangeWidget (`id(`progress_widget), `Value, label);
if (tick_progress)
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.71/src/modules/ProductLicense.ycp new/yast2-packager-2.15.74/src/modules/ProductLicense.ycp
--- old/yast2-packager-2.15.71/src/modules/ProductLicense.ycp 2007-08-24 14:36:08.000000000 +0200
+++ new/yast2-packager-2.15.74/src/modules/ProductLicense.ycp 2007-09-03 09:44:15.000000000 +0200
@@ -320,6 +320,31 @@
info_file = "/info.txt";
}
+void SearchForLicense_LiveCDInstallation (integer src_id, string fallback_dir) {
+ y2milestone ("LiveCD License");
+
+ if (FileUtils::Exists ("/license.tar.gz")) {
+ tmpdir = sformat ("%1/product-license/LiveCD/", (string) SCR::Read (.target.tmpdir));
+ string license_file = "/license.tar.gz";
+
+ if (UnpackLicenseTgzFileToDirectory (license_file, tmpdir)) {
+ license_dir = tmpdir;
+ license_file_print = "license.tar.gz";
+ } else {
+ CleanUpLicense (tmpdir);
+ license_file = nil;
+ }
+ } else {
+ license_dir = nil;
+ }
+
+ if (FileUtils::Exists ("/README.BETA")) {
+ info_file = "/README.BETA";
+ } else {
+ info_file = nil;
+ }
+}
+
void SearchForLicense_NormalRunBaseProduct (integer src_id, string fallback_dir) {
y2milestone ("Using default license directory %1", fallback_dir);
@@ -353,7 +378,7 @@
license_dir = tmpdir;
license_file_print = "license.tar.gz";
} else {
- license_file = nil;
+ license_dir = nil;
}
return;
@@ -407,10 +432,16 @@
y2milestone ("Searching for licenses...");
license_file_print = nil;
+ // Bugzilla #299732
+ // Base Product - LiveCD installation
+ if (Mode::live_installation()) {
+
+ SearchForLicense_LiveCDInstallation (src_id, fallback_dir);
+
// Base-product - license not in installation
// * Stage is not initial
// * source ID is not defined
- if (! Stage::initial() && src_id == nil) {
+ } else if (! Stage::initial() && src_id == nil) {
SearchForLicense_NormalRunBaseProduct (src_id, fallback_dir);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.71/src/modules/SourceManager.ycp new/yast2-packager-2.15.74/src/modules/SourceManager.ycp
--- old/yast2-packager-2.15.71/src/modules/SourceManager.ycp 2007-08-29 17:44:05.000000000 +0200
+++ new/yast2-packager-2.15.74/src/modules/SourceManager.ycp 2007-09-03 13:43:10.000000000 +0200
@@ -7,7 +7,7 @@
* Martin Vidner <mvidner@xxxxxxx>
* Status: Work in Progress
*
- * $Id: SourceManager.ycp 40589 2007-08-29 14:45:12Z lslezak $
+ * $Id: SourceManager.ycp 40682 2007-09-03 08:55:31Z lslezak $
*
* Representation of the configuration of source-manager.
* Input and output routines.
@@ -1286,8 +1286,27 @@
Pkg::SourceDelete (todel);
}
// then add the new one
- y2milestone ("adding repository");
+ y2milestone ("Adding update repository...");
integer toadd = Pkg::SourceCreate (url, "/");
+
+ // adding failed, try http fallback for ftp repo (#227059)
+ if (toadd == nil || toadd < 0)
+ {
+ map parsed_url = URL::Parse(url);
+ string scheme = parsed_url["scheme"]:"";
+
+ if (tolower(scheme) == "ftp")
+ {
+ y2milestone("Cannot add FTP update repository, trying HTTP...");
+
+ parsed_url["scheme"] = "http";
+ string fallback_url = URL::Build(parsed_url);
+
+ toadd = Pkg::SourceCreate (fallback_url, "/");
+ url = fallback_url;
+ }
+ }
+
// and add to ZENworks too, but only if it succeeded here (#180820)
if (toadd != -1 && toadd != nil)
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.71/VERSION new/yast2-packager-2.15.74/VERSION
--- old/yast2-packager-2.15.71/VERSION 2007-08-31 17:36:53.000000000 +0200
+++ new/yast2-packager-2.15.74/VERSION 2007-09-03 16:40:30.000000000 +0200
@@ -1 +1 @@
-2.15.71
+2.15.74
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |