Hello community, here is the log from the commit of package yast2-packager checked in at Mon Aug 6 18:29:33 CEST 2007. -------- --- yast2-packager/yast2-packager.changes 2007-08-02 14:50:55.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes 2007-08-06 16:58:29.182786000 +0200 @@ -1,0 +2,36 @@ +Mon Aug 6 15:06:37 CEST 2007 - lslezak@suse.cz + +- fixed repository probing (merging URL and product directory has + been moved to pkg-bindings) +- 2.15.54 + +------------------------------------------------------------------- +Mon Aug 6 09:39:01 CEST 2007 - locilka@suse.cz + +- Added text into the license-confirmation dialog about where to + find the license on the media (FATE #302018). +- Using new Pkg::RepositoryAdd and Pkg::SourceRefreshNow functions + that enables installation to set the repository name and alias + before it is used (#297422). + +------------------------------------------------------------------- +Thu Aug 2 21:13:04 CEST 2007 - locilka@suse.cz + +- Support for localized strings in remote repositories + (inst_productsources). +- Better error handling when parsing downloaded XML file in + ag_xmlrepos. +- Added support for downloading from HTTPS servers. +- Only repositories with 'installation_repo' tag set are used in + first stage installation (instead of 'official') (#297628). +- Reporting when list of repositories is empty, cannot be + downloaded or parsed (#294997). +- Using new pkg-bindings functionality to provide optional + directory with licenses (#302018). +- New text for License dialog (FATE #302018 comment #36). +- Download and use y2update before merging installation.xml when + use Add-On product in installation (#295160). +- Renamed product repositories to "Community Repositories". +- Adjusted RPM dependencies (yast2-pkg-bindings). + +------------------------------------------------------------------- Old: ---- yast2-packager-2.15.53.tar.bz2 New: ---- yast2-packager-2.15.54.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.e30265/_old 2007-08-06 18:27:24.000000000 +0200 +++ /var/tmp/diff_new_pack.e30265/_new 2007-08-06 18:27:24.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-packager (Version 2.15.53) +# spec file for package yast2-packager (Version 2.15.54) # # 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.53 +Version: 2.15.54 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-packager-2.15.53.tar.bz2 +Source0: yast2-packager-2.15.54.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 @@ -24,8 +24,8 @@ Requires: perl-XML-Bare yast2-perl-bindings Requires: yast2-country Requires: yast2-installation >= 2.15.12 -# changed ProgressStart callback signature -Requires: yast2-pkg-bindings >= 2.15.35 +# New function: Pkg::SourceProvideDirectory +Requires: yast2-pkg-bindings >= 2.15.38 # Mode::live_installation Requires: yast2 >= 2.15.38 # unzipping license file @@ -55,7 +55,7 @@ Arvin Schnell <arvin@suse.de> %prep -%setup -n yast2-packager-2.15.53 +%setup -n yast2-packager-2.15.54 %build %{prefix}/bin/y2tool y2autoconf @@ -96,6 +96,33 @@ %doc %{prefix}/share/doc/packages/yast2-packager %changelog +* Mon Aug 06 2007 - lslezak@suse.cz +- fixed repository probing (merging URL and product directory has + been moved to pkg-bindings) +- 2.15.54 +* Mon Aug 06 2007 - locilka@suse.cz +- Added text into the license-confirmation dialog about where to + find the license on the media (FATE #302018). +- Using new Pkg::RepositoryAdd and Pkg::SourceRefreshNow functions + that enables installation to set the repository name and alias + before it is used (#297422). +* Thu Aug 02 2007 - locilka@suse.cz +- Support for localized strings in remote repositories + (inst_productsources). +- Better error handling when parsing downloaded XML file in + ag_xmlrepos. +- Added support for downloading from HTTPS servers. +- Only repositories with 'installation_repo' tag set are used in + first stage installation (instead of 'official') (#297628). +- Reporting when list of repositories is empty, cannot be + downloaded or parsed (#294997). +- Using new pkg-bindings functionality to provide optional + directory with licenses (#302018). +- New text for License dialog (FATE #302018 comment #36). +- Download and use y2update before merging installation.xml when + use Add-On product in installation (#295160). +- Renamed product repositories to "Community Repositories". +- Adjusted RPM dependencies (yast2-pkg-bindings). * Thu Aug 02 2007 - lslezak@suse.cz - inst_source - download metadata for CD/DVD repositories immedately, the medium can be changed later and accidentaly ++++++ yast2-packager-2.15.53.tar.bz2 -> yast2-packager-2.15.54.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.53/agents/ag_xmlrepos new/yast2-packager-2.15.54/agents/ag_xmlrepos --- old/yast2-packager-2.15.53/agents/ag_xmlrepos 2007-07-30 12:42:46.000000000 +0200 +++ new/yast2-packager-2.15.54/agents/ag_xmlrepos 2007-08-03 08:34:29.000000000 +0200 @@ -150,7 +150,13 @@ } } - push @repos, $this_repo; + # URL must be defined + # The XML content might be, for instance, 404 Error Page, etc. + if (defined $this_repo->{'url'} && $this_repo->{'url'} ne "") { + push @repos, $this_repo; + } else { + y2warning ("Ignoring repository, no URL defined"); + } } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.53/configure new/yast2-packager-2.15.54/configure --- old/yast2-packager-2.15.53/configure 2007-08-02 14:46:42.000000000 +0200 +++ new/yast2-packager-2.15.54/configure 2007-08-06 16:57:34.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.53. +# Generated by GNU Autoconf 2.60 for yast2-packager 2.15.54. # # 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.53' -PACKAGE_STRING='yast2-packager 2.15.53' +PACKAGE_VERSION='2.15.54' +PACKAGE_STRING='yast2-packager 2.15.54' 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.53 to adapt to many kinds of systems. +`configure' configures yast2-packager 2.15.54 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.53:";; + short | recursive ) echo "Configuration of yast2-packager 2.15.54:";; 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.53 +yast2-packager configure 2.15.54 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.53, which was +It was created by yast2-packager $as_me 2.15.54, 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.53' + VERSION='2.15.54' cat >>confdefs.h <<_ACEOF @@ -2372,7 +2372,7 @@ -VERSION="2.15.53" +VERSION="2.15.54" RPMNAME="yast2-packager" MAINTAINER="Ladislav Slezak <lslezak@suse.cz>" @@ -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.53, which was +This file was extended by yast2-packager $as_me 2.15.54, 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.53 +yast2-packager config.status 2.15.54 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.53/configure.in new/yast2-packager-2.15.54/configure.in --- old/yast2-packager-2.15.53/configure.in 2007-08-02 14:46:36.000000000 +0200 +++ new/yast2-packager-2.15.54/configure.in 2007-08-06 16:57:30.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-packager, 2.15.53, http://bugs.opensuse.org/, yast2-packager) +AC_INIT(yast2-packager, 2.15.54, 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.53" +VERSION="2.15.54" RPMNAME="yast2-packager" MAINTAINER="Ladislav Slezak <lslezak@suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.53/src/clients/inst_productsources.ycp new/yast2-packager-2.15.54/src/clients/inst_productsources.ycp --- old/yast2-packager-2.15.53/src/clients/inst_productsources.ycp 2007-07-30 13:28:34.000000000 +0200 +++ new/yast2-packager-2.15.54/src/clients/inst_productsources.ycp 2007-08-06 14:33:49.000000000 +0200 @@ -15,6 +15,7 @@ * <item> * <link>http://some.server/some_link.xml</link> * <official config:type="boolean">true</official> + * <installation_repo config:type="boolean">true</installation_repo> * </item> * <item> * <link>ftp://some.other.server/some_link.xml</link> @@ -23,7 +24,7 @@ * </servers> * </productDefines> * - * Only official (trusted) links are used during installation. + * Only installation_repo=true (trusted) links are used during installation. * See Bugzilla #293811. * * Format of Suggested sources: @@ -75,6 +76,7 @@ import "AddOnProduct"; import "GetInstArgs"; import "OneClickInstallStandard"; + import "Language"; include "installation/misc.ycp"; @@ -92,6 +94,9 @@ // List of IDs of URLs to be added list <string> repos_to_be_used = []; + string language_long = ""; + string language_short = ""; + // Map of already used suggested repositories // $[ "($url|$path)" : src_id ] map <string, integer> repos_already_used = $[]; @@ -253,6 +258,11 @@ server_response = FTP::Get (from, to); + } else if (regexpmatch (from, "^[hH][tT][tT][pP][sS]://")) { + from = regexpsub (from, "^[hH][tT][tT][pP][sS]://(.*)", "https://\\1"); + + server_response = HTTP::Get (from, to); + } else { y2error ("Not a supported type: %1", from); return false; @@ -289,10 +299,10 @@ list_of_servers = xml_file_content["servers"]:[]; // bugzilla #293811 - // only official (trusted) links are used during installation + // only installation_repo (trusted) links are used during installation if (Stage::initial()) { list_of_servers = filter (map one_server, list_of_servers, { - if (one_server["official"]:false == true) { + if (one_server["installation_repo"]:false == true) { return true; } else { y2milestone ("Sever %1 is not used during installation...", one_server); @@ -368,6 +378,16 @@ return true; } + string GetCurrentLang () { + map cmd = (map) SCR::Execute (.target.bash_output, "echo -n $LANG"); + string ret = tostring (cmd["stdout"]:""); + + if (ret == "C" || ret == "") ret = nil; + + y2milestone ("Using lang: %1", ret); + return ret; + } + symbol ReadDialog () { list <string> actions_todo = [ // TRANSLATORS: progress step @@ -408,18 +428,41 @@ if (! NetworkRunning()) { y2warning ("Cannot proceed, no network configured..."); + // TRANSLATORS: error report + Report::Error (_("Cannot download list of repositories, +no network is configured.")); + return `nosources; } Progress::NextStage(); + // language used for possible translations + if (! Stage::initial()) + language_long = GetCurrentLang (); + + // fallback if no LANG variable set + if (language_long == nil) + language_long = Language::language; + + language_short = substring (language_long, 0, 2); + y2milestone ("Preferred language: %1 %2", language_long, language_short); + if (! ReadControlFile()) { y2milestone ("Feature not supported by the product"); + // TRANSLATORS: light-warning message + Report::Message (_("No product URL defined to download +list of repositories from.")); + return `nosources; } if (! DownloadAndParseSources()) { y2error ("Cannot download or parse repositories"); + // TRANSLATORS: warning message + Report::Warning (_("Unable to download list of repositories +or no repositories defined.")); + return `nosources; } @@ -434,6 +477,53 @@ return `next; } + /** + * Returns a localized string using given parametters. + * + * @param string current_id to identify the source in list_of_repos map + * @param list <string> possible_keys containing which keys in the map + * should be tried (something is always better than amty string) + * + * @struct $[ + * // key + * "description" : "repository description", + * // "localized" + key + * "localized_description" : $[ + * "en_GB" : "repository description (localized to en_GB)", + * ... + * ], + * ] + */ + string GetLocalizedString (string current_id, list <string> possible_keys) { + string ret = ""; + + foreach (string possible_key, possible_keys, { + string loc_key = sformat ("localized_%1", possible_key); + + if (list_of_repos[current_id, loc_key, language_long]:"" != "") { + ret = list_of_repos[current_id, loc_key, language_long]:""; + break; + } else if (list_of_repos[current_id, loc_key, language_short]:"" != "") { + ret = list_of_repos[current_id, loc_key, language_long]:""; + break; + } + }); + + if (ret != "") return ret; + + foreach (string possible_key, possible_keys, { + if (list_of_repos[current_id, possible_key]:"" != "") { + ret = list_of_repos[current_id, possible_key]:""; + break; + } else if (list_of_repos[current_id, possible_key]:"" != "") { + ret = list_of_repos[current_id, possible_key]:""; + break; + } + }); + + return ret; + } + void PrintRepositoryDescription () { string current_id = (string) UI::QueryWidget (`id ("addon_repos"), `CurrentItem); @@ -458,8 +548,8 @@ </p>"), list_of_repos[current_id, "url"]:"", list_of_repos[current_id, "url_from"]:"", - list_of_repos[current_id, "summary"]:list_of_repos[current_id, "name"]:"", - list_of_repos[current_id, "description"]:"" + GetLocalizedString (current_id, ["summary", "name"]), + GetLocalizedString (current_id, ["description"]) ); UI::ChangeWidget (`id ("addon_description"), `Value, description); @@ -515,7 +605,7 @@ items[counter] = `item ( `id (repo_id), - one_repo["name"]:one_repo["url"]:"", + GetLocalizedString (repo_id, ["name", "url"]), already_used ); @@ -724,14 +814,21 @@ return (symbol) dialog_ret; } - boolean CreateSource (string url, string pth) { - integer src_id = Pkg::SourceCreate (url, pth); + boolean CreateSource (string url, string pth, string repo_name) { + integer src_id = Pkg::RepositoryAdd ($[ + "enabled" : true, + "name" : repo_name, + "base_urls" : [url], + "prod_dir" : pth, + "alias" : url, + ]); + if (src_id == nil) { Report::Error (sformat ( // TRANSLATORS: pop-up error message // %1 is replaced with a repository name or URL _("Adding repository %1 failed"), - list_of_repos[CreateRepoId(url,pth), "name"]:url + (repo_name != "" ? repo_name : url) )); // FIXME: retry ? return false; @@ -742,6 +839,8 @@ return false; } + Pkg::SourceRefreshNow (src_id); + if (Stage::initial()) { AddOnProduct::Integrate (src_id); @@ -765,7 +864,7 @@ symbol WriteDialog () { list <string> actions_todo = []; list <string> actions_doing = []; - boolean at_once = nil; + boolean at_once = false; list <integer> repos_to_be_deleted = []; @@ -818,13 +917,13 @@ // TRANSLATORS: progress step // %1 is replaced with repository name or URL _("Add repository: %1"), - list_of_repos[repo_id, "name"]:repo_id + GetLocalizedString (repo_id, ["name", "url"]) )); actions_doing = add (actions_doing, sformat ( // TRANSLATORS: progress step, // %1 is replaced with repository name or URL _("Adding repository: %1 ..."), - list_of_repos[repo_id, "name"]:repo_id + GetLocalizedString (repo_id, ["name", "url"]) )); }); } @@ -861,9 +960,13 @@ foreach (string repo_id, repos_to_be_used, { // If not at once, call one stage per repository if (! at_once) Progress::NextStage(); - CreateSource (list_of_repos[repo_id, "url"]:"", list_of_repos[repo_id, "path"]:"/"); + CreateSource ( + list_of_repos[repo_id, "url"]:"", + list_of_repos[repo_id, "path"]:"/", + GetLocalizedString (repo_id, ["name"]) + ); }); - + // Redraw installation wizard if (Stage::initial()) { UpdateWizardSteps(); @@ -873,8 +976,12 @@ } Progress::Finish(); - sleep (600); - + if (Stage::initial()) { + sleep (600); + } else { + sleep (2000); + } + return `next; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.53/src/clients/inst_source.ycp new/yast2-packager-2.15.54/src/clients/inst_source.ycp --- old/yast2-packager-2.15.53/src/clients/inst_source.ycp 2007-08-02 14:12:57.000000000 +0200 +++ new/yast2-packager-2.15.54/src/clients/inst_source.ycp 2007-08-06 15:09:32.000000000 +0200 @@ -6,7 +6,7 @@ * Purpose: * Adding, removing and prioritizing of repositories for packagemanager. * - * $Id: inst_source.ycp 39896 2007-08-02 12:12:57Z lslezak $ + * $Id: inst_source.ycp 40000 2007-08-06 13:09:31Z lslezak $ * */ @@ -212,24 +212,10 @@ name = preffered_name; string prod_dir = repo[1]:"/"; - string prod_url = url; - - if (substring(prod_url, size(prod_url) - 1, 1) != "/") - { - prod_url = prod_url + "/"; - } - - if (substring(prod_dir, 0, 1) == "/") - { - prod_dir = substring(prod_dir, 1); - } - - prod_url = prod_url + prod_dir; - // probe repository type (do not probe plaindir repo) - string repo_type = (plaindir) ? plaindir_type : Pkg::RepositoryProbe(prod_url); + string repo_type = (plaindir) ? plaindir_type : Pkg::RepositoryProbe(url, prod_dir); - y2internal("Repository type (%1): %2", prod_url, repo_type); + y2milestone("Repository type (%1,%2): %3", url, prod_dir, repo_type); // the probing has failed if (repo_type == nil || repo_type == "NONE") diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.53/src/config/productsources.desktop new/yast2-packager-2.15.54/src/config/productsources.desktop --- old/yast2-packager-2.15.53/src/config/productsources.desktop 2007-07-16 15:53:26.000000000 +0200 +++ new/yast2-packager-2.15.54/src/config/productsources.desktop 2007-08-06 10:11:07.000000000 +0200 @@ -19,6 +19,6 @@ Icon=yast-sw_source Exec=/sbin/yast2 inst_productsources -Name=Additional Product Repositories -GenericName=Download and choose the default repositories from web +Name=Community Repositories +GenericName=Download and choose the community repositories from web X-KDE-SubstituteUID=true diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.53/src/modules/AddOnProduct.ycp new/yast2-packager-2.15.54/src/modules/AddOnProduct.ycp --- old/yast2-packager-2.15.53/src/modules/AddOnProduct.ycp 2007-07-19 13:26:46.000000000 +0200 +++ new/yast2-packager-2.15.54/src/modules/AddOnProduct.ycp 2007-08-06 10:11:07.000000000 +0200 @@ -509,17 +509,18 @@ global boolean Integrate (integer srcid) { y2milestone ("Integrating repository %1", srcid); - // Adds workflow to the Workflow Store if any workflow exists - WorkflowManager::AddWorkflow (`addon, srcid, ""); - // Updating inst-sys string y2update = Pkg::SourceProvideOptionalFile (srcid, 1, "/y2update.tgz"); + if (y2update == nil) { y2milestone ("No YaST update found on the media"); } else { UpdateInstSys (y2update); } + // Adds workflow to the Workflow Store if any workflow exists + WorkflowManager::AddWorkflow (`addon, srcid, ""); + return true; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.53/src/modules/PackagesUI.ycp new/yast2-packager-2.15.54/src/modules/PackagesUI.ycp --- old/yast2-packager-2.15.53/src/modules/PackagesUI.ycp 2007-07-19 10:02:37.000000000 +0200 +++ new/yast2-packager-2.15.54/src/modules/PackagesUI.ycp 2007-08-06 10:11:07.000000000 +0200 @@ -6,7 +6,7 @@ * Purpose: Provides a number of common popups * for the package installation. * - * $Id: PackagesUI.ycp 39518 2007-07-19 07:57:52Z lslezak $ + * $Id: PackagesUI.ycp 39963 2007-08-06 07:44:18Z locilka $ */ { @@ -118,6 +118,13 @@ `VBox ( `HSpacing (70), `RichText (help), + // FATE #302018 + + // TRANSLATORS: Licenses to confirm can be found here. + // do not use more than 76 characters per line, keep it as short as possible + `Label (_("If you like to print this license, +check the EULA.txt file on the first media.")), + `VSpacing(1), `HBox ( `HStretch (), // push button diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.53/src/modules/ProductLicense.ycp new/yast2-packager-2.15.54/src/modules/ProductLicense.ycp --- old/yast2-packager-2.15.53/src/modules/ProductLicense.ycp 2007-08-02 11:22:55.000000000 +0200 +++ new/yast2-packager-2.15.54/src/modules/ProductLicense.ycp 2007-08-06 10:11:07.000000000 +0200 @@ -158,8 +158,8 @@ `Left ( // TRANSLATORS: addition license information // FATE #302018 - `Label (_("If you like to print this license, -check the EULA.txt file on the first media.")) + `Label (_("If you want to print this EULA, you can find it +on the first media in the directory '/media.1/licenses/'")) ), `HSpacing (2*space) ), @@ -263,9 +263,14 @@ // FATE #302018 // Licenses are unzipped under 1stMedia:/media.1/license/ // Don't unzip, just use the directory - license_dir = Pkg::SourceProvideOptionalFile (src_id, 1, "/media.1/license/license.txt"); + license_dir = Pkg::SourceProvideDirectory ( + src_id, 1, + "/media.1/license/", + true, /* optional */ + false /* no subdirs */ + ); if (license_dir != nil) { - license_dir = Pkg::SourceProvideDir (src_id, 1, "/media.1/license/"); + y2milestone ("Using directory %1 for licenses", license_dir); // return from the function return; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.53/VERSION new/yast2-packager-2.15.54/VERSION --- old/yast2-packager-2.15.53/VERSION 2007-08-02 14:45:24.000000000 +0200 +++ new/yast2-packager-2.15.54/VERSION 2007-08-06 16:56:09.000000000 +0200 @@ -1 +1 @@ -2.15.53 +2.15.54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org