Hello community,
here is the log from the commit of package yast2-support
checked in at Mon Oct 13 17:06:24 CEST 2008.
--------
--- yast2-support/yast2-support.changes 2008-10-09 18:11:13.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-support/yast2-support.changes 2008-10-13 10:29:11.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Oct 13 10:06:52 CEST 2008 - mzugec@suse.cz
+
+- changed workflow for upload tarball
+- 2.17.9
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-support-2.17.8.tar.bz2
New:
----
yast2-support-2.17.9.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-support.spec ++++++
--- /var/tmp/diff_new_pack.a17453/_old 2008-10-13 17:06:11.000000000 +0200
+++ /var/tmp/diff_new_pack.a17453/_new 2008-10-13 17:06:11.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-support (Version 2.17.8)
+# spec file for package yast2-support (Version 2.17.9)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-support
-Version: 2.17.8
+Version: 2.17.9
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-support-2.17.8.tar.bz2
+Source0: yast2-support-2.17.9.tar.bz2
Prefix: /usr
Requires: yast2
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite
@@ -38,7 +38,7 @@
%prep
-%setup -n yast2-support-2.17.8
+%setup -n yast2-support-2.17.9
%build
%{prefix}/bin/y2tool y2autoconf
@@ -71,8 +71,10 @@
%{prefix}/share/applications/YaST2/support.desktop
/usr/share/YaST2/scrconf/*.scr
%doc %{prefix}/share/doc/packages/yast2-support
-
%changelog
+* Mon Oct 13 2008 mzugec@suse.cz
+- changed workflow for upload tarball
+- 2.17.9
* Thu Oct 09 2008 mzugec@suse.cz
- separate minimum, full and default configuration
- removed temporary directory selection
++++++ yast2-support-2.17.8.tar.bz2 -> yast2-support-2.17.9.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-support-2.17.8/configure new/yast2-support-2.17.9/configure
--- old/yast2-support-2.17.8/configure 2008-10-09 17:12:25.000000000 +0200
+++ new/yast2-support-2.17.9/configure 2008-10-13 10:05:23.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-support 2.17.7.
+# Generated by GNU Autoconf 2.61 for yast2-support 2.17.8.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-support'
PACKAGE_TARNAME='yast2-support'
-PACKAGE_VERSION='2.17.7'
-PACKAGE_STRING='yast2-support 2.17.7'
+PACKAGE_VERSION='2.17.8'
+PACKAGE_STRING='yast2-support 2.17.8'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1197,7 +1197,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-support 2.17.7 to adapt to many kinds of systems.
+\`configure' configures yast2-support 2.17.8 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1268,7 +1268,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-support 2.17.7:";;
+ short | recursive ) echo "Configuration of yast2-support 2.17.8:";;
esac
cat <<\_ACEOF
@@ -1346,7 +1346,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-support configure 2.17.7
+yast2-support configure 2.17.8
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1360,7 +1360,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-support $as_me 2.17.7, which was
+It was created by yast2-support $as_me 2.17.8, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2181,7 +2181,7 @@
# Define the identity of the package.
PACKAGE='yast2-support'
- VERSION='2.17.7'
+ VERSION='2.17.8'
cat >>confdefs.h <<_ACEOF
@@ -2409,7 +2409,7 @@
-VERSION="2.17.7"
+VERSION="2.17.8"
RPMNAME="yast2-support"
MAINTAINER="Michal Zugec "
@@ -3304,7 +3304,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-support $as_me 2.17.7, which was
+This file was extended by yast2-support $as_me 2.17.8, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3347,7 +3347,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-support config.status 2.17.7
+yast2-support config.status 2.17.8
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-support-2.17.8/configure.in new/yast2-support-2.17.9/configure.in
--- old/yast2-support-2.17.8/configure.in 2008-10-09 17:12:18.000000000 +0200
+++ new/yast2-support-2.17.9/configure.in 2008-10-13 10:05:15.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.17.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-support, 2.17.7, http://bugs.opensuse.org/, yast2-support)
+AC_INIT(yast2-support, 2.17.8, http://bugs.opensuse.org/, yast2-support)
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.17.7"
+VERSION="2.17.8"
RPMNAME="yast2-support"
MAINTAINER="Michal Zugec "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-support-2.17.8/src/dialogs.ycp new/yast2-support-2.17.9/src/dialogs.ycp
--- old/yast2-support-2.17.8/src/dialogs.ycp 2008-10-09 16:52:18.000000000 +0200
+++ new/yast2-support-2.17.9/src/dialogs.ycp 2008-10-10 14:15:10.000000000 +0200
@@ -139,7 +139,7 @@
return ret;
}
-any UploadDialog(){
+any UploadDialog(boolean data_prepared){
string caption = _("Supportconfig Upload Dialog");
string url="";
@@ -153,16 +153,22 @@
}
y2milestone("%1", Support::log_files);
/* Support configure1 dialog contents */
- term contents = `VBox(
- `Left(
- `HBox(
- `InputField(`id(`tarball_file), _("Package with log files"), Support::log_files["tarball"]:""),
+ term load_save = `Left(
+ `HBox(
+ ((data_prepared)
+ ? `InputField(`id(`save_dir), _("Save As"), Support::log_files["tmp_dir"]:"")
+ : `InputField(`id(`tarball_file), _("Package with log files"), Support::log_files["tarball"]:"")),
`VBox(`Label(""), `PushButton(`id(`browse), Label::BrowseButton()))
- )),
+ )
+ );
+
+ term contents = `VBox(
+ load_save,
`Left(
`HBox(
- `InputField(`id(`url), _("Upload URL"), url),
- `VBox(`Label(""), `PushButton(`id(`upload), `opt(`disabled), _("Upload log files tarball into URL")))
+ `CheckBox(`id(`upload), _("Upload log files tarball into URL"), true),
+ `InputField(`id(`url), _("Upload URL"), url)
+// `VBox(`Label(""), `PushButton(`id(`upload), `opt(`disabled), _("Upload log files tarball into URL")))
))
);
Wizard::SetContentsButtons(caption, contents, HELPS["c1"]:"",
@@ -171,16 +177,55 @@
any ret = nil;
while(true) {
ret = UI::UserInput();
- if (ret == `abort || ret == `next || ret == `back)
+ if (ret == `abort || ret == `back)
break;
+ if (ret == `next){
+ if (!data_prepared){
+ string unpack=sformat("cd %1 && tar xvf %2", Support::log_files["tmp_dir"]:"", Support::log_files["tarball"]:"");
+ y2milestone("unpack %1", SCR::Execute(.target.bash_output, unpack));
+// break;
+ }
+ y2milestone("data_prepared %1", data_prepared);
+ y2milestone("Support::log_files %1", Support::log_files);
+ string command = sformat("supportconfig %1 -f %2", Support::GetParameterList(), Support::log_files["tmp_dir"]:"");
+ if ((boolean)UI::QueryWidget(`upload, `Value)){
+ string url = (string)UI::QueryWidget(`url, `Value);
+ if (size(url)>0) command = sformat("%1 -U %2", command, url);
+ }
+ y2milestone("executing %1", command);
+ map output = (map)SCR::Execute(.target.bash_output, command);
+ y2milestone("output %1", output);
+ if (output["exit"]:-1 != 0) Report::Error (sformat("%1 : %2",_("Cannot write settings"), output));
+ else{
+ command = sformat("find \"%1\" -type f -name \"%2*\"|tr -d '\n'", Support::log_files["tmp_dir"]:"", Support::log_files["log_dir"]:"");
+ y2internal("command %1", command);
+ output=(map)SCR::Execute(.target.bash_output, command);
+ if (output["exit"]:-1 != 0) Report::Error (sformat("%1 : %2", _("Cannot write settings."), output));
+ else{
+ if(size(output["stdout"]:"")>0) Support::log_files["tarball"]=output["stdout"]:"";
+ else y2error("Empty filename : %1", output);
+ }
+ }
+ break;
+ }
if (ret == `browse){
- string tarball_file = UI::AskForExistingFile("/", "*.tgz *.tbz", _("Choose Log Files Tarball File") );
- if (tarball_file != nil && size(tarball_file)>0){
- UI::ChangeWidget(`tarball_file, `Value, tarball_file);
- Support::log_files["tarball"]=tarball_file;
- }
- else
- y2error("Empty or invalid logs tarball path");
+ if (data_prepared){
+ string save_dir = UI::AskForExistingDirectory((string)UI::QueryWidget(`save_dir, `Value), _("Choose Directory Where to Save Tarball") );
+ if (save_dir != nil && size(save_dir)>0){
+ UI::ChangeWidget(`save_dir, `Value, save_dir);
+// Support::log_files["tmp_dir"]=save_dir;
+ }
+ else
+ y2error("Empty or invalid logs tarball path");
+ }else{
+ string tarball_file = UI::AskForExistingFile("/", "*.tgz *.tbz", _("Choose Log Files Tarball File") );
+ if (tarball_file != nil && size(tarball_file)>0){
+ UI::ChangeWidget(`tarball_file, `Value, tarball_file);
+ Support::log_files["tarball"]=tarball_file;
+ }
+ else
+ y2error("Empty or invalid logs tarball path");
+ }
continue;
}
}
@@ -543,11 +588,11 @@
}
ret = (symbol)UI::UserInput();
if (ret == `next ){
+/*
string command = sformat("supportconfig %1 -f %2", Support::GetParameterList(), Support::log_files["tmp_dir"]:"");
y2internal("executing %1", command);
map output = (map)SCR::Execute(.target.bash_output, command);
y2milestone("output %1", output);
- /* Error message */
if (output["exit"]:-1 != 0) Report::Error (sformat("%1 : %2",_("Cannot write settings"), output));
else{
command = sformat("find \"%1\" -type f -name \"%2*\"|tr -d '\n'", Support::log_files["tmp_dir"]:"", Support::log_files["log_dir"]:"");
@@ -559,6 +604,7 @@
else y2error("Empty filename : %1", output);
}
}
+*/
break;
}
if (ret == `abort || ret == `back)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-support-2.17.8/src/Support.ycp new/yast2-support-2.17.9/src/Support.ycp
--- old/yast2-support-2.17.8/src/Support.ycp 2008-09-29 14:19:00.000000000 +0200
+++ new/yast2-support-2.17.9/src/Support.ycp 2008-10-10 14:16:06.000000000 +0200
@@ -313,8 +313,8 @@
}
});
configuration["value"]=new_config;
- y2internal("Write:%1", SCR::Write(.etc.supportconfig.all, configuration));
- y2internal("Write:%1", SCR::Write(.etc.supportconfig, nil));
+ SCR::Write(.etc.supportconfig.all, configuration);
+ y2milestone("Write /etc/supportconfig.conf :%1", SCR::Write(.etc.supportconfig, nil));
return true;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-support-2.17.8/src/wizards.ycp new/yast2-support-2.17.9/src/wizards.ycp
--- old/yast2-support-2.17.8/src/wizards.ycp 2008-09-29 10:52:30.000000000 +0200
+++ new/yast2-support-2.17.9/src/wizards.ycp 2008-10-10 12:49:21.000000000 +0200
@@ -47,7 +47,8 @@
/* FIXME: adapt to your needs */
map aliases = $[
"overview" : ``(OverviewDialog()),
- "upload" : ``(UploadDialog()),
+ "upload1" : ``(UploadDialog(false)),
+ "upload2" : ``(UploadDialog(true)),
"parameters" : ``(ParametersDialog()),
"expert" : ``( ExpertDialog() ),
"contact" : ``(ContactDialog()),
@@ -62,10 +63,10 @@
`abort : `abort,
`back : `back,
`tarball : "parameters",
- `upload : "upload",
+ `upload : "upload1",
`next : `next,
],
- "upload" : $[
+ "upload1" : $[
`abort : `abort,
`back : "overview",
`next : "overview"
@@ -94,8 +95,13 @@
"files" : $[
`abort : `abort,
`back : `back,
- `next : "overview",
+ `next : "upload2",
+ ],
+ "upload2" : $[
+ `abort : `abort,
+ `back : "overview",
+ `next : "overview"
]
];
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-support-2.17.8/VERSION new/yast2-support-2.17.9/VERSION
--- old/yast2-support-2.17.8/VERSION 2008-10-09 17:13:10.000000000 +0200
+++ new/yast2-support-2.17.9/VERSION 2008-10-13 10:06:50.000000000 +0200
@@ -1 +1 @@
-2.17.8
+2.17.9
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org