Mailinglist Archive: opensuse-commit (1097 mails)

< Previous Next >
commit autoyast2 for openSUSE:Factory
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Thu, 14 Jan 2010 22:32:40 +0100
  • Message-id: <20100114213240.8BA9B2029B@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package autoyast2 for openSUSE:Factory
checked in at Thu Jan 14 22:32:40 CET 2010.



--------
--- autoyast2/autoyast2.changes 2009-12-18 16:22:11.000000000 +0100
+++ autoyast2/autoyast2.changes 2010-01-14 15:48:43.000000000 +0100
@@ -1,0 +2,12 @@
+Thu Jan 14 15:05:16 CET 2010 - ug@xxxxxxx
+
+- autoyast=label://LABEL/PATH implemented (fate#308525)
+- 2.19.1
+
+-------------------------------------------------------------------
+Wed Dec 23 11:30:12 CET 2009 - ug@xxxxxxx
+
+- merged the code for autoyast=device and autoyast=usb to reduce
+ redundancy and fix the "already mounted" bug for USB (bnc#565558)
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
autoyast2-2.19.0.tar.bz2

New:
----
autoyast2-2.19.1.tar.bz2

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

Other differences:
------------------
++++++ autoyast2.spec ++++++
--- /var/tmp/diff_new_pack.OWywcg/_old 2010-01-14 22:32:12.000000000 +0100
+++ /var/tmp/diff_new_pack.OWywcg/_new 2010-01-14 22:32:12.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package autoyast2 (Version 2.19.0)
+# spec file for package autoyast2 (Version 2.19.1)
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,10 +19,10 @@


Name: autoyast2
-Version: 2.19.0
+Version: 2.19.1
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: autoyast2-2.19.0.tar.bz2
+Source0: autoyast2-2.19.1.tar.bz2
Prefix: /usr
Group: System/YaST
License: GPLv2+
@@ -31,10 +31,12 @@
BuildRequires: yast2 >= 2.16.36
# After API cleanup
BuildRequires: yast2-update >= 2.18.3
+BuildRequires: yast2-storage >= 2.19.2
Requires: yast2 >= 2.16.36
Requires: yast2-core yast2-xml libxslt
Requires: autoyast2-installation = %{version}
Requires: yast2-schema yast2 yast2-country yast2-storage
+Requires: yast2-storage >= 2.19.2
Provides: yast2-module-autoinst yast2-config-autoinst
Obsoletes: yast2-module-autoinst yast2-config-autoinst
Provides: yast2-lib-autoinst
@@ -55,7 +57,7 @@

%package installation
License: GPLv2+
-Version: 2.19.0
+Version: 2.19.1
Release: 1
Summary: YaST2 - Auto Installation Modules
Group: System/YaST
@@ -72,7 +74,7 @@
generated with the autoyast2 package.

%prep
-%setup -n autoyast2-2.19.0
+%setup -n autoyast2-2.19.1

%build
%{prefix}/bin/y2tool y2autoconf

++++++ autoyast2-2.19.0.tar.bz2 -> autoyast2-2.19.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/autoyast2-2.19.0/VERSION new/autoyast2-2.19.1/VERSION
--- old/autoyast2-2.19.0/VERSION 2009-12-18 16:11:32.000000000 +0100
+++ new/autoyast2-2.19.1/VERSION 2010-01-14 15:40:23.000000000 +0100
@@ -1 +1 @@
-2.19.0
+2.19.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/autoyast2-2.19.0/configure
new/autoyast2-2.19.1/configure
--- old/autoyast2-2.19.0/configure 2009-12-18 16:11:52.000000000 +0100
+++ new/autoyast2-2.19.1/configure 2010-01-14 15:40:59.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for autoyast2 2.19.0.
+# Generated by GNU Autoconf 2.63 for autoyast2 2.19.1.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -596,8 +596,8 @@
# Identity of this package.
PACKAGE_NAME='autoyast2'
PACKAGE_TARNAME='autoyast2'
-PACKAGE_VERSION='2.19.0'
-PACKAGE_STRING='autoyast2 2.19.0'
+PACKAGE_VERSION='2.19.1'
+PACKAGE_STRING='autoyast2 2.19.1'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'

ac_unique_file="RPMNAME"
@@ -1282,7 +1282,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 autoyast2 2.19.0 to adapt to many kinds of systems.
+\`configure' configures autoyast2 2.19.1 to adapt to many kinds of systems.

Usage: $0 [OPTION]... [VAR=VALUE]...

@@ -1353,7 +1353,7 @@

if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of autoyast2 2.19.0:";;
+ short | recursive ) echo "Configuration of autoyast2 2.19.1:";;
esac
cat <<\_ACEOF

@@ -1433,7 +1433,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-autoyast2 configure 2.19.0
+autoyast2 configure 2.19.1
generated by GNU Autoconf 2.63

Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1447,7 +1447,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.

-It was created by autoyast2 $as_me 2.19.0, which was
+It was created by autoyast2 $as_me 2.19.1, which was
generated by GNU Autoconf 2.63. Invocation command line was

$ $0 $@
@@ -2427,7 +2427,7 @@

# Define the identity of the package.
PACKAGE='autoyast2'
- VERSION='2.19.0'
+ VERSION='2.19.1'


cat >>confdefs.h <<_ACEOF
@@ -2549,7 +2549,7 @@



-VERSION="2.19.0"
+VERSION="2.19.1"
RPMNAME="autoyast2"
MAINTAINER="Uwe Gansert <ug@xxxxxxx>"

@@ -3609,7 +3609,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by autoyast2 $as_me 2.19.0, which was
+This file was extended by autoyast2 $as_me 2.19.1, which was
generated by GNU Autoconf 2.63. Invocation command line was

CONFIG_FILES = $CONFIG_FILES
@@ -3659,7 +3659,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-autoyast2 config.status 2.19.0
+autoyast2 config.status 2.19.1
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`\\"

diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/autoyast2-2.19.0/configure.in
new/autoyast2-2.19.1/configure.in
--- old/autoyast2-2.19.0/configure.in 2009-12-18 16:11:49.000000000 +0100
+++ new/autoyast2-2.19.1/configure.in 2010-01-14 15:40:56.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! --
dnl (edit configure.in.in instead)

-AC_INIT(autoyast2, 2.19.0, http://bugs.opensuse.org/, autoyast2)
+AC_INIT(autoyast2, 2.19.1, http://bugs.opensuse.org/, autoyast2)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])

@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)

dnl Important YaST2 variables
-VERSION="2.19.0"
+VERSION="2.19.1"
RPMNAME="autoyast2"
MAINTAINER="Uwe Gansert <ug@xxxxxxx>"

diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/autoyast2-2.19.0/doc/Installation.xml
new/autoyast2-2.19.1/doc/Installation.xml
--- old/autoyast2-2.19.0/doc/Installation.xml 2009-11-10 14:54:44.000000000
+0100
+++ new/autoyast2-2.19.1/doc/Installation.xml 2010-01-14 15:08:20.000000000
+0100
@@ -404,6 +404,10 @@
<entry>autoyast=cifs://&lt;server&gt;/&lt;path&gt; (since
openSUSE 11.2, not SLES 11)</entry>
<entry>Looks for control file on &lt;server&gt; with CIFS</entry>
</row>
+ <row>
+ <entry>autoyast=label://&lt;label&gt;/&lt;path&gt; (since
openSUSE 11.3, not SLES 11)</entry>
+ <entry>Looks for control file on a device that has the
label</entry>
+ </row>
</tbody>
</tgroup>
</table>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/autoyast2-2.19.0/src/include/autopart.ycp
new/autoyast2-2.19.1/src/include/autopart.ycp
--- old/autoyast2-2.19.0/src/include/autopart.ycp 2009-12-16
18:45:54.000000000 +0100
+++ new/autoyast2-2.19.1/src/include/autopart.ycp 2010-01-08
16:26:32.000000000 +0100
@@ -1,7 +1,7 @@
/*


-$Id: autopart.ycp 60133 2009-12-16 17:46:51Z aschnell $
+$Id: autopart.ycp 60295 2010-01-08 14:56:17Z aschnell $
*/
{
textdomain "autoinst";
@@ -1393,8 +1393,7 @@
if( Partitions::IsDosPartition( fsid ) )
{
integer psize = (p["region",0]:0 + p["region",1]:1 - 1) *
cyl_size;
- win = Storage::GetFreeSpace( p["device"]:"", psize, `fat32,
- false );
+ win = Storage::GetFreeSpace( p["device"]:"", `fat32, false );
y2milestone( "win=%1", win );
if( win != nil && psize > 300*1024*1024 )
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/autoyast2-2.19.0/src/include/io.ycp
new/autoyast2-2.19.1/src/include/io.ycp
--- old/autoyast2-2.19.0/src/include/io.ycp 2009-12-15 12:20:56.000000000
+0100
+++ new/autoyast2-2.19.1/src/include/io.ycp 2010-01-07 14:37:32.000000000
+0100
@@ -4,7 +4,7 @@
* Summary: I/O
* Authors: Anas Nashif<nashif@xxxxxxx>
*
- * $Id: io.ycp 60111 2009-12-15 11:02:03Z ug $
+ * $Id: io.ycp 60266 2010-01-07 13:37:31Z ug $
*/
{
textdomain "autoinst";
@@ -238,9 +238,9 @@
WFM::Execute(.local.umount, mount_point);

}
- else if (Scheme == "floppy" || Scheme == "usb")
+ else if (Scheme == "floppy")
{
- if (StorageDevices::FloppyReady() && Scheme == "floppy")
+ if (StorageDevices::FloppyReady())
{
WFM::Execute(.local.mount, [StorageDevices::FloppyDevice(),
mount_point]);

@@ -254,50 +254,23 @@
ok = true;
}
SCR::Execute(.target.umount, mount_point);
- } else {
- y2milestone("looking for %1 on USB", Path);
- list<map> probe = (list<map>)SCR::Read(.probe.usb);
- foreach( map d, probe, ``{
- if( d["bus"]:"USB" == "SCSI" && haskey(d, "dev_name") ) {
- integer i = 0;
- string dev = d["dev_name"]:"";
- while( SCR::Read(.target.lstat, dev) != $[] || i < 5 )
{
- if( !(boolean)WFM::Execute(.local.mount, [ dev,
mount_point ]) ) {
- y2milestone("mount failed for %1", dev);
- i = i + 1;
- dev = d["dev_name"]:"" + sformat("%1",i);
- continue;
- }
- if (WFM::Execute (.local.bash, "/bin/cp " +
mount_point + "/" + Path + " " + Localfile) != 0) {
- y2milestone("not found on %1",dev);
- } else {
- y2milestone("found on %1", dev);
- GET_error = "";
- ok = true;
- }
- SCR::Execute(.target.umount, mount_point);
- if( ok == true )
- break;
- i = i + 1;
- dev = d["dev_name"]:"" + sformat("%1",i);
- }
- }
- if( ok == true )
- break;
- });
}
}
- else if (Scheme == "device") // Device
+ else if (Scheme == "device" || Scheme == "usb" ) // Device or USB
{
if ( Path != "")
{
list<string> deviceList = [];
if( Host == "" ) {
- list<map> disks = (list<map>)SCR::Read(.probe.disk);
+ list<map> disks = (Scheme == "device") ?
(list<map>)SCR::Read(.probe.disk) : (list<map>)SCR::Read(.probe.usb);
foreach( map m, disks, ``{
+ if( Scheme == "usb" &&
+ m["bus"]:"USB" != "SCSI" )
+ continue;
if( haskey( m, "dev_name") ) {
integer i = 0;
string dev = m["dev_name"]:"";
+ deviceList = add( deviceList, substring( dev, 5 ) );
// not uncommon for USB sticks to have no partition
do {
i = i + 1;
dev = m["dev_name"]:"" + sformat("%1",i);
@@ -339,9 +312,13 @@
}
});
y2milestone("already mounted=%1
mountpoint=%2",already_mounted,mount_point);
- if( ! already_mounted )
- WFM::Execute(.local.mount, [sformat("/dev/%1", Host) ,
- mount_point]);
+ if( ! already_mounted &&
+ !(boolean)WFM::Execute(.local.mount, [sformat("/dev/%1",
Host),
+ mount_point]) ) {
+ y2milestone("%1 is not mounted and mount failed",
sformat("/dev/%1", Host));
+ GET_error = sformat(_("%1 is not mounted and mount
failed"), sformat("/dev/%1", Host));
+ continue;
+ }

if (WFM::Execute (.local.bash, "/bin/cp " + mount_point + "/"
+ Path + " " + Localfile) != 0 )
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/autoyast2-2.19.0/src/modules/AutoinstLVM.ycp
new/autoyast2-2.19.1/src/modules/AutoinstLVM.ycp
--- old/autoyast2-2.19.0/src/modules/AutoinstLVM.ycp 2009-07-21
16:37:24.000000000 +0200
+++ new/autoyast2-2.19.1/src/modules/AutoinstLVM.ycp 2010-01-07
12:10:44.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: LVM
* Authors: Anas Nashif <nashif@xxxxxxx>
*
- * $Id: AutoinstLVM.ycp 57248 2009-05-19 13:45:06Z ug $
+ * $Id: AutoinstLVM.ycp 60237 2010-01-05 16:07:41Z aschnell $
*/
{

@@ -147,7 +147,7 @@

foreach(map lv, lvs, ``{
if (!contains(keepLVM[vgname]:[], lv["name"]:"")) {
- Storage::DeleteDevice("","/dev/"+vgname+"/"+lv["name"]:"" );
+ Storage::DeleteDevice("/dev/"+vgname+"/"+lv["name"]:"");
}
});

diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/autoyast2-2.19.0/src/modules/ProfileLocation.ycp
new/autoyast2-2.19.1/src/modules/ProfileLocation.ycp
--- old/autoyast2-2.19.0/src/modules/ProfileLocation.ycp 2009-07-21
16:37:24.000000000 +0200
+++ new/autoyast2-2.19.1/src/modules/ProfileLocation.ycp 2010-01-14
15:25:09.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Process Auto-Installation Location
* Author: Anas Nashif <nashif@xxxxxxx>
*
- * $Id: ProfileLocation.ycp 55578 2009-02-18 10:14:53Z ug $
+ * $Id: ProfileLocation.ycp 60367 2010-01-14 14:25:09Z ug $
*/
{
module "ProfileLocation";
@@ -76,6 +76,30 @@
y2milestone("relurl for profile changed to:
%1://%2%3",AutoinstConfig::scheme, AutoinstConfig::host,
AutoinstConfig::filepath);
SCR::Write ( .etc.install_inf.ayrelurl,
sformat("%1://%2/%3",AutoinstConfig::scheme, AutoinstConfig::host,
AutoinstConfig::filepath) );
SCR::Write (.etc.install_inf, nil);
+ } else if( AutoinstConfig::scheme == "label" ) {
+ y2milestone("searching label");
+ foreach( string device, map v, Storage::GetTargetMap(), ``{
+ y2milestone("looking on %1", device);
+ if( v["label"]:"" == AutoinstConfig::host ) { // FIXME: does
not work. Label was "msdos" while testing
+ AutoinstConfig::scheme = "device";
+ AutoinstConfig::host = substring( device, 5 );
+ y2milestone("found on %1", AutoinstConfig::host);
+ break;
+ }
+ foreach( map p, v["partitions"]:[], ``{
+ if( p["label"]:"" == AutoinstConfig::host ) {
+ AutoinstConfig::scheme = "device";
+ AutoinstConfig::host = substring( p["device"]:device
, 5 );
+ y2milestone("found on %1", AutoinstConfig::host);
+ break;
+ }
+ y2milestone("not found on %1", p["device"]:"hm?");
+ });
+ if( AutoinstConfig::scheme == "device" )
+ break;
+ });
+ if( AutoinstConfig::scheme == "label" )
+ Popup::Error( _("label not found while looking for autoyast
profile") );
}
string filename = basename(AutoinstConfig::filepath);

@@ -83,6 +107,7 @@
if ( filename != "" )
{
y2milestone("File=%1", filename);
+ y2milestone("Get %1://%2/%3 to %4", AutoinstConfig::scheme,
AutoinstConfig::host, AutoinstConfig::filepath, localfile);
ret = Get(AutoinstConfig::scheme,
AutoinstConfig::host,
AutoinstConfig::filepath,


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



Remember to have fun...

--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages