Mailinglist Archive: opensuse-commit (1187 mails)

< Previous Next >
commit yast2-packager
  • From: root@xxxxxxx (h_root)
  • Date: Thu, 13 Apr 2006 17:14:06 +0200 (CEST)
  • Message-id: <20060413151406.165548BE81@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package yast2-packager
checked in at Thu Apr 13 17:14:06 CEST 2006.

--------
--- yast2-packager/yast2-packager.changes 2006-04-12 12:42:06.000000000 +0200
+++ STABLE/yast2-packager/yast2-packager.changes 2006-04-12 15:29:04.000000000 +0200
@@ -1,0 +2,14 @@
+Wed Apr 12 15:20:32 CEST 2006 - jsuchome@xxxxxxx
+
+- enable editing iso sources
+- do not add more slashes when concatenating server and directory
+ for non-ftp source url (#163791)
+- 2.13.81
+
+-------------------------------------------------------------------
+Wed Apr 12 14:36:12 CEST 2006 - locilka@xxxxxxx
+
+- Correct handling of copying slides to the local directory when no
+ slides found on the source.
+
+-------------------------------------------------------------------

Old:
----
yast2-packager-2.13.80.tar.bz2

New:
----
yast2-packager-2.13.81.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.NOuuAD/_old 2006-04-13 17:13:20.000000000 +0200
+++ /var/tmp/diff_new_pack.NOuuAD/_new 2006-04-13 17:13:20.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.13.80)
+# spec file for package yast2-packager (Version 2.13.81)
#
# Copyright (c) 2006 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.13.80
+Version: 2.13.81
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.13.80.tar.bz2
+Source0: yast2-packager-2.13.81.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-country yast2-devtools yast2-installation yast2-testsuite yast2-xml
Requires: yast2 yast2-installation checkmedia yast2-country
@@ -41,7 +41,7 @@
Arvin Schnell <arvin@xxxxxxx>

%prep
-%setup -n yast2-packager-2.13.80
+%setup -n yast2-packager-2.13.81

%build
%{prefix}/bin/y2tool y2autoconf
@@ -79,6 +79,14 @@

%changelog -n yast2-packager
* Wed Apr 12 2006 - jsuchome@xxxxxxx
+- enable editing iso sources
+- do not add more slashes when concatenating server and directory
+ for non-ftp source url (#163791)
+- 2.13.81
+* Wed Apr 12 2006 - locilka@xxxxxxx
+- Correct handling of copying slides to the local directory when no
+ slides found on the source.
+* Wed Apr 12 2006 - jsuchome@xxxxxxx
- enable saving the sources if rug reports errors (#165478)
- 2.13.80
* Wed Apr 12 2006 - locilka@xxxxxxx

++++++ yast2-packager-2.13.80.tar.bz2 -> yast2-packager-2.13.81.tar.bz2 ++++++
++++ 2139 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.80/VERSION new/yast2-packager-2.13.81/VERSION
--- old/yast2-packager-2.13.80/VERSION 2006-04-12 12:32:21.000000000 +0200
+++ new/yast2-packager-2.13.81/VERSION 2006-04-12 15:22:34.000000000 +0200
@@ -1 +1 @@
-2.13.80
+2.13.81
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.80/src/include/inst_source_dialogs.ycp new/yast2-packager-2.13.81/src/include/inst_source_dialogs.ycp
--- old/yast2-packager-2.13.80/src/include/inst_source_dialogs.ycp 2006-02-24 13:27:16.000000000 +0100
+++ new/yast2-packager-2.13.81/src/include/inst_source_dialogs.ycp 2006-04-12 15:20:13.000000000 +0200
@@ -28,9 +28,19 @@
* check if given path points to ISO file
*/
define boolean path_is_iso (string url) {
+ if (size (url) < 4) return false;
return substring (url, size (url) - 4, 4) == ".iso";
}

+ // add a slash to the part of url, if it is not already present
+ define string slashed (string urlpart) {
+
+ if ( substring( urlpart, 0, 1 ) == "/" ) {
+ return urlpart;
+ }
+ return "/" + urlpart;
+ }
+
/**
Return an HBox with ok and cancel buttons for use by other dialogs.
@return An HBox term for use in a CreateDialog call.
@@ -160,7 +170,7 @@
// text entry
`TextEntry( `id( `dir ), _("&Path to Directory or ISO Image"), urlpath ),
// checkbox label
- `Left (`CheckBox (`id (`ch_iso), _("ISO Image"))),
+ `Left (`CheckBox (`id (`ch_iso), _("ISO Image"), path_is_iso (urlpath))),
dialogButtons()
)
);
@@ -325,7 +335,7 @@
// text entry
_("&Path to Directory or ISO Image"),urlpath),
// checkbox label
- `Left (`CheckBox (`id(`ch_iso), _("ISO Image")))
+ `Left (`CheckBox (`id(`ch_iso), _("ISO Image"),path_is_iso (urlpath)))
) :
// text entry
`TextEntry( `id( `dir ), _("&Directory on Server"), urlpath );
@@ -462,10 +472,12 @@
if (UI::WidgetExists (`id (`share)))
{
share = (string)UI::QueryWidget (`id (`share), `Value);
- url = url + server + "/" + share + "/" + directory;
+ url = url + server + slashed(share) + slashed(directory);
}
- else
+ else if (type == `ftp)
url = url + server + "/" + directory;
+ else
+ url = url + server + slashed(directory);

if (UI::WidgetExists (`id (`workgroup)))
workgroup = (string)UI::QueryWidget (`id (`workgroup), `Value);
@@ -503,7 +515,7 @@
)
),
// checkbox label
- `Left (`CheckBox (`id (`ch_iso), _("ISO Image"))),
+ `Left (`CheckBox (`id (`ch_iso), _("ISO Image"),path_is_iso (defaulturl))),
dialogButtons()
)
);
@@ -619,8 +631,16 @@
define string editUrl2( string url, boolean allowHttps ) ``{
if ( size( url ) == 0 ) return getUrl2( "", allowHttps );

- map parsedUrl = URL::Parse( url );
+ if (substring (url, 0, 5) == "iso:/" &&
+ issubstring (url, "&url="))
+ {
+ integer url_pt = find (url, "&url=");
+ string serverpart = substring (url, url_pt + 5);
+ string isopart = substring (url, 0, url_pt);
+ url = serverpart + substring (isopart, find (isopart, "iso=") + 4);
+ }

+ map parsedUrl = URL::Parse( url );
string protocol = parsedUrl[ "scheme" ]:"";
string urlpath = parsedUrl[ "path" ]:"";

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.80/src/modules/Packages.ycp new/yast2-packager-2.13.81/src/modules/Packages.ycp
--- old/yast2-packager-2.13.80/src/modules/Packages.ycp 2006-04-12 08:52:31.000000000 +0200
+++ new/yast2-packager-2.13.81/src/modules/Packages.ycp 2006-04-12 15:20:24.000000000 +0200
@@ -3,7 +3,7 @@
* Package: Package selections
* Authors: Anas Nashif <nashif@xxxxxxx>
*
- * $Id: Packages.ycp 30004 2006-04-11 17:08:19Z jsrain $
+ * $Id: Packages.ycp 30061 2006-04-12 12:37:30Z locilka $
*/

{
@@ -566,14 +566,18 @@
map productmap = Pkg::SourceProductData (initial_source);
string datadir = productmap["datadir"]:"suse";
// FIXME: this is optional
- string slidedir = Pkg::SourceProvideDir( initial_source, 1, "/" + datadir + "/setup/slide" );
+ string slidedir_find = "/" + datadir + "/setup/slide";
+ string slidedir = Pkg::SourceProvideDir( initial_source, 1, slidedir_find );

- // copy all files to our own copy
- string our_slidedir = (string)WFM::Read( .local.tmpdir, "" );
-
- WFM::Execute( .local.bash, sformat( "cp -r %1/* %2/", slidedir, our_slidedir ) ) ;
+ string our_slidedir = (string)WFM::Read( .local.tmpdir, "" );
+ if (slidedir == nil) {
+ y2error("No slide directory '%1' found on source '%2'.", slidedir_find, initial_source);
+ } else {
+ // copy all files to our own copy
+ WFM::Execute( .local.bash, sformat( "cp -r %1/* %2/", slidedir, our_slidedir ) ) ;
+ }
y2milestone( "Setting up the slide directory local copy: %1", our_slidedir);
- SlideShow::SetSlideDir (our_slidedir);
+ SlideShow::SetSlideDir (our_slidedir);

add_on_products_list = Pkg::SourceProvideOptionalFile (initial_source, 1, "/add_on_products");



++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...


< Previous Next >