June 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r38298 - in /branches/tmp/sh/mod-ui/core/libyui/src: Makefile.am YChildrenManager.h YWidget.cc YWidget.h
by sh-sh-sh＠svn.opensuse.org 05 Jun '07

05 Jun '07

Author: sh-sh-sh Date: Tue Jun 5 18:01:57 2007 New Revision: 38298 URL: http://svn.opensuse.org/viewcvs/yast?rev=38298&view=rev Log: children management in YWidget Added: branches/tmp/sh/mod-ui/core/libyui/src/YChildrenManager.h Modified: branches/tmp/sh/mod-ui/core/libyui/src/Makefile.am branches/tmp/sh/mod-ui/core/libyui/src/YWidget.cc branches/tmp/sh/mod-ui/core/libyui/src/YWidget.h Modified: branches/tmp/sh/mod-ui/core/libyui/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/Makefile.am (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/Makefile.am Tue Jun 5 18:01:57 2007 @@ -21,6 +21,7 @@ YUIException.cc \ YProperty.cc \ \ + YWidget.cc \ YAlignment.cc \ YBarGraph.cc \ YCheckBox.cc \ @@ -65,7 +66,6 @@ YTextEntry.cc \ YTime.cc \ YTree.cc \ - YWidget.cc \ YWizard.cc \ YSelectionWidget.cc Added: branches/tmp/sh/mod-ui/core/libyui/src/YChildrenManager.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YChildrenManager.h (added) +++ branches/tmp/sh/mod-ui/core/libyui/src/YChildrenManager.h Tue Jun 5 18:01:57 2007 @@ -0,0 +1,213 @@ +/*---------------------------------------------------------------------\ +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| (C) SuSE GmbH | +\----------------------------------------------------------------------/ + + File: YChildrenManager.h + + Author: Stefan Hundhammer <sh(a)suse.de> + +/-*/ + +#ifndef YChildrenManager_h +#define YChildrenManager_h + +#include <list> +#include <algorithm> +#include <YUIException.h> + + +/** + * Abstract base template class for children management, such as child + * widgets. + **/ +template<class T> class YChildrenManager +{ +protected: + + /** + * Constructor. + * + * 'containerParent' is the class whose children are managed. + **/ + YChildrenManager( T * containerParent ) + : _container( containerParent ) + {} + + /** + * Destructor. + **/ + virtual ~YChildrenManager() {} + +public: + + typedef std::list<T *> ChildrenList; + + /** + * Check if there are any children. + **/ + bool hasChildren() const { return ! empty(); } + + /** + * Check if the children list is empty, i.e. if there are no children. + **/ + bool empty() const { return _children.empty(); } + + /** + * Returns the number of children. + **/ + int count() const { return _children.size(); } + + /** + * Return an iterator that points to the first child. + **/ + typename ChildrenList::const_iterator begin() const + { return _children.begin(); } + + /** + * Returns an iterator that points after the last child. + **/ + typename ChildrenList::const_iterator end() const + { return _children.end(); } + + /** + * Returns the first child or 0 if there is none. + * Useful mostly for children managers that handle only one child. + **/ + T * firstChild() + { return _children.empty() ? (T *) 0 : _children.front(); } + + /** + * Add a new child. + * + * This may throw exceptions if more children are added than the class + * whose children are handled (the associated widget) can handle. + **/ + virtual void add( T * child ) + { _children.push_back( child ); } + + /** + * Remove a child. This only removes the child from the children manager's + * list; it does not delete it. + **/ + virtual void remove( T * child ) + { _children.remove( child ); } + + /** + * Remove all children. This only removes the children from the children + * manager's list; it does not delete them. + **/ + virtual void clear() + { _children.clear(); } + + /** + * Check if the children list contains the specified child. + * Returns 'true' if the children list contains the child, + * 'false' otherwise. + **/ + bool contains( T * child ) const + { + return ( find( _children, _children.begin(), _children.end() ) + != _children.end() ); + } + + /** + * Returns the associated container, i.e. the object whose children are + * handled here. + **/ + T * container() const { return _container; } + +protected: + + T * _container; + ChildrenList _children; +}; + + +/** + * Children manager that can handle one single child (rejecting any more). + * Useful for YAlignment, YFrame etc. + **/ +template<class T> class YSingleChildManager: public YChildrenManager<T> +{ +public: + + YSingleChildManager( T * containerParent ) + : YChildrenManager<T>( containerParent ) + {} + + /** + * Add a new child. + * + * Reimplemented from YChildrenManager. + * + * This will throw a YUITooManyChildrenException if there already is a + * child. + **/ + virtual void add( T * child ) + { + if ( this->empty() ) + this->_children.push_back( child ); + else + YUI_THROW( YUITooManyChildrenException<T>( this->container() ) ); + } + + /** + * Replace the previous child (if any) with a new one. + **/ + void replace( T * newChild ) + { + this->_children.clear(); + this->_children.push_back( newChild ); + } +}; + + +/** + * Children manager that rejects all children. + * + * Useful for widget classes that can't handle children such as YPushButton, + * YSelectionBox etc. + **/ +template<class T> class YChildrenRejector: public YChildrenManager<T> +{ +public: + /** + * Constructor. + **/ + YChildrenRejector( T * containerParent ) + : YChildrenManager<T>( containerParent ) + {} + + /** + * Add a new child. + * + * Reimplemented from YChildrenManager. + * + * Since this class is designed to reject children, this always throws a + * YUITooManyChildrenException. + **/ + virtual void add( T * child ) + { YUI_THROW( YUITooManyChildrenException<T>( this->container() ) ); } + + /** + * Remove a child. + * + * Reimplemented from YChildrenManager. + * + * Since this class is designed to reject children, this always throws a + * YUIInvalidChildException. + **/ + virtual void remove( T * child ) + { YUI_THROW( YUIInvalidChildException<T>( this->container(), child ) ); } +}; + + +#endif // YChildrenManager_h Modified: branches/tmp/sh/mod-ui/core/libyui/src/YWidget.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YWidget.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YWidget.cc Tue Jun 5 18:01:57 2007 @@ -41,12 +41,31 @@ #define MAX_DEBUG_LABEL_LEN 50 +struct YWidgetPrivate +{ + /** + * Constructor + **/ + YWidgetPrivate( YWidget * widget ) + : childrenRejector( widget ) + , childrenManager( childrenRejector ) + {} + + // + // Data members + // + + YWidgetChildrenRejector childrenRejector; // default: no children + YWidgetChildrenManager & childrenManager; +}; + int YWidget::next_internal_widget_id = 0; YWidget::YWidget( const YWidgetOpt & opt ) - : magic( YWIDGET_MAGIC ) + : priv( new YWidgetPrivate( this ) ) + , magic( YWIDGET_MAGIC ) , user_widget_id( YCPNull() ) , yparent(0) , rep(0) @@ -83,7 +102,36 @@ } -string YWidget::debugLabel() +YChildrenManager & +YWidget::childrenManager() const +{ + return priv->childrenManager; +} + + +void +YWidget::setChildrenManager( YChildrenManager & newChildrenManager ) +{ + priv->childrenManager = newChildrenManager; +} + + +void +YWidget::addChild( YWidget * child ) +{ + childrenManager().addChild( child ); +} + + +void +YWidget::removeChild( YWidget * child ) +{ + childrenManager().removeChild( child ); +} + + +string +YWidget::debugLabel() { string label = YShortcut::cleanShortcutString( YShortcut::getShortcutString( this ) ); Modified: branches/tmp/sh/mod-ui/core/libyui/src/YWidget.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YWidget.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YWidget.h Tue Jun 5 18:01:57 2007 @@ -27,6 +27,7 @@ #include "YWidgetOpt.h" #include "YUISymbols.h" #include "YUIException.h" +#include "YChildrenManager.h" #include "ImplPtr.h" #define YWIDGET_MAGIC 42 // what else? ;- ) @@ -44,6 +45,12 @@ typedef std::list<YWidget *>::iterator YWidgetListIterator; typedef std::list<YWidget *>::const_iterator YWidgetListConstIterator; +typedef YChildrenManager<YWidget> YWidgetChildrenManager; +typedef YSingleChildManager<YWidget> YSingleWidgetChildManager; +typedef YChildrenRejector<YWidget> YWidgetChildrenRejector; + +class YWidgetPrivate; + /** * @short Abstract base class of all ui widgets */ @@ -79,6 +86,11 @@ **/ virtual std::string debugLabel(); + + // + // Property Management + // + /** * Return this class's property set. * This also initializes the property upon the first call. @@ -134,6 +146,83 @@ virtual YPropertyValue getProperty( const std::string & propertyName ); // FIXME: = 0 + + // + // Children Management + // + // Even though many widget classes are leaf classes and thus cannot have + // children by design, it makes sense to have the children management in + // this base class: Then descending down a widget tree is transparent to + // the outside without the need to check for container widget classes, + // casting to those container widget classes and only calling child + // management methods in that case. + // + // By default, YWidget and derived classes have a YWidgetChildrenRejector + // as their children manager, i.e. any attempt to add a child will result + // in a YUITooManyChildrenException. + // + // Derived classes that can (semantically) handle children should set the + // children manager to one of + // + // - YWidgetChildrenManager: handles any number of child widgets; + // useful for VBox / HBox + // + // - YSingleWidgetChildManager: handles exactly one child + // useful for widgets like Alignment, Frame, Dialog + // + + + /** + * Returns 'true' if this widget has any children. + **/ + bool hasChildren() const + { return childrenManager().hasChildren(); } + /** + * Returns the first child or 0 if there is none. + * Useful mostly for children managers that handle only one child. + **/ + YWidget * firstChild() const + { return childrenManager().firstChild(); } + + /** + * Return an iterator that points to the first child or to childrenEnd() if + * there are no children. + **/ + YWidgetListConstIterator childrenBegin() const + { return childrenManager().begin(); } + + /** + * Returns the current number of children. + **/ + int childrenCount() const { return childrenManager().count(); } + + /** + * Return an interator that points after the last child. + **/ + YWidgetListConstIterator childrenEnd() const + { return childrenManager().end(); } + + /** + * Add a new child. + * + * This may throw exceptions if more children are added than this widget + * can handle. + **/ + virtual void addChild( YWidget * child ); + + /** + * Remove a child. This only removes the child from the children manager's + * list; it does not delete it. + **/ + virtual void removeChild( YWidget * child ); + + + // + // Misc + // + + + /** * Checks whether or not this object is valid. This is to enable * dangling pointer error checking ( i.e. this object is already @@ -445,6 +534,27 @@ virtual void doneMultipleChanges() {} +protected: + + /** + * Returns this widget's children manager. + **/ + YWidgetChildrenManager & childrenManager() const; + + /** + * Sets a new children manager for this widget. + * The default children manager (a YWidgetChildrenRejector) rejects all + * children. This is useful for leaf widgets such as PushButton, ComboBox + * etc. + * + * Derived classes that can handle children might want to set the children + * manager to a YWidgetChildrenManager (the base class that does not reject + * children) or to a YSingleWidgetChildManager (the class that handles + * exactly one child widget). + **/ + void setChildrenManager( YWidgetChildrenManager & manager ); + + private: /** @@ -528,7 +638,8 @@ private: - static YPropertySet _propertySet; + ImplPtr<YWidgetPrivate *> priv; + static YPropertySet _propertySet; public: -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r38297 - in /trunk/vm: VERSION package/yast2-vm.changes src/VM_XEN.ycp src/xen.ycp
by charlesa＠svn.opensuse.org 05 Jun '07

05 Jun '07

Author: charlesa Date: Tue Jun 5 17:59:26 2007 New Revision: 38297 URL: http://svn.opensuse.org/viewcvs/yast?rev=38297&view=rev Log: Respond when "help" is requested at the command line. (#269913) Prompt for installing graphical tools when running in text mode. (#268510) Modified: trunk/vm/VERSION trunk/vm/package/yast2-vm.changes trunk/vm/src/VM_XEN.ycp trunk/vm/src/xen.ycp Modified: trunk/vm/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/vm/VERSION?rev=38297&r1=38296&r2… ============================================================================== --- trunk/vm/VERSION (original) +++ trunk/vm/VERSION Tue Jun 5 17:59:26 2007 @@ -1 +1 @@ -2.15.4 +2.16.1 Modified: trunk/vm/package/yast2-vm.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/vm/package/yast2-vm.changes?rev=… ============================================================================== --- trunk/vm/package/yast2-vm.changes (original) +++ trunk/vm/package/yast2-vm.changes Tue Jun 5 17:59:26 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Jun 5 09:57:06 MDT 2007 - carnold(a)novell.com + +- Respond when "help" is requested at the command line. (#269913) +- Prompt for installing graphical tools when running in text mode. + (#268510) + +------------------------------------------------------------------- Mon May 21 08:29:37 MDT 2007 - carnold(a)novell.com - The 'Virtualization' category is missing and the virtualization Modified: trunk/vm/src/VM_XEN.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/vm/src/VM_XEN.ycp?rev=38297&r1=3… ============================================================================== --- trunk/vm/src/VM_XEN.ycp (original) +++ trunk/vm/src/VM_XEN.ycp Tue Jun 5 17:59:26 2007 @@ -181,8 +181,13 @@ list<string> packages = ["xen", "xen-libs", "xen-tools", "xen-tools-ioemu"]; packages = add(packages, kernel_pkg); + boolean inst_gui = true; + // Assume python gtk is installed. If in text mode we don't care - if (UI::GetDisplayInfo()["TextMode"]:true == false) { + if (UI::GetDisplayInfo()["TextMode"]:true == true) { + inst_gui = Popup::YesNo (_("Running in text mode. Install graphical components anyway?")); + } + if ( inst_gui == true ) { packages = add(packages, "python-gtk"); // Also make sure virt-manager is there - runs GUI only packages = add(packages, "virt-manager"); Modified: trunk/vm/src/xen.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/vm/src/xen.ycp?rev=38297&r1=3829… ============================================================================== --- trunk/vm/src/xen.ycp (original) +++ trunk/vm/src/xen.ycp Tue Jun 5 17:59:26 2007 @@ -41,6 +41,7 @@ import "Arch"; + import "CommandLine"; import "Mode"; import "Package"; import "Popup"; @@ -66,38 +67,24 @@ return ret; } + /* Main */ -/* boolean GUIHandler() { - - // Assume python gtk is installed. If in text mode we don't care - if (UI::GetDisplayInfo()["TextMode"]:true == false) { - // FIXME: do we want to launch the GUI??? - // start the Xen VM install GUI - //string cmd = "/usr/sbin/xen-vm-install"; - //y2milestone("Executing: %1", cmd); - //integer ret = (integer)SCR::Execute(.target.bash_background, cmd); - //y2milestone("GUIHandler returned: %1", (ret == 0)); - //return (ret == 0); - } - - return true; - } -*/ + /** + * Definition of command line mode options + */ + map cmdline = $[ + "id" : "vm", + "help" : _("Install Hypervisor and Tools"), + "guihandler" : CheckConfiguration + ]; - /* Main */ + any rc = CommandLine::Run(cmdline); + y2milestone("YAST2-VM: rc = %1", rc); // Always check the dom0 configuration - boolean ret = CheckConfiguration(); - if (ret == false) return `abort; - - // only start the GUI if we are running Xen kernel - /* if (Arch::is_xen()) { - ret = GUIHandler(); - if (ret == false) return `abort; - } -*/ - +// boolean ret = CheckConfiguration(); +// if (ret == false) return `abort; /* Finish */ y2milestone("Xen (yast-vm) module finished"); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r38296 - in /branches/tmp/sh/mod-ui/core/libyui/src: Makefile.am YUIException.cc YUIException.h YUI_core.cc YWidget.cc
by sh-sh-sh＠svn.opensuse.org 05 Jun '07

05 Jun '07

Author: sh-sh-sh Date: Tue Jun 5 16:51:51 2007 New Revision: 38296 URL: http://svn.opensuse.org/viewcvs/yast?rev=38296&view=rev Log: children management classes Modified: branches/tmp/sh/mod-ui/core/libyui/src/Makefile.am branches/tmp/sh/mod-ui/core/libyui/src/YUIException.cc branches/tmp/sh/mod-ui/core/libyui/src/YUIException.h branches/tmp/sh/mod-ui/core/libyui/src/YUI_core.cc branches/tmp/sh/mod-ui/core/libyui/src/YWidget.cc Modified: branches/tmp/sh/mod-ui/core/libyui/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/Makefile.am (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/Makefile.am Tue Jun 5 16:51:51 2007 @@ -82,6 +82,7 @@ YPackageSelectorPlugin.h \ YUIException.h \ YProperty.h \ + YChildrenManager.h \ ImplPtr.h \ \ YAlignment.h \ Modified: branches/tmp/sh/mod-ui/core/libyui/src/YUIException.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YUIException.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YUIException.cc Tue Jun 5 16:51:51 2007 @@ -19,7 +19,6 @@ /-*/ -#include <iostream> #include <sstream> #include <string.h> // strerror() @@ -160,7 +159,7 @@ if ( widget() ) widgetClass = std::string( widget()->widgetClass() ) + "::"; - + return str << "Property type mismatch: " << widgetClass << property().name() @@ -179,10 +178,12 @@ if ( widget() ) widgetClass = std::string( widget()->widgetClass() ) + "::"; - + return str << "Property " << widgetClass << property().name() << "is read-only!" << endl; } + + Modified: branches/tmp/sh/mod-ui/core/libyui/src/YUIException.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YUIException.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YUIException.h Tue Jun 5 16:51:51 2007 @@ -24,7 +24,7 @@ #include <cerrno> -#include <iosfwd> +#include <iostream> #include <stdexcept> #include "YProperty.h" @@ -471,6 +471,103 @@ }; +/** + * Exception class for "too many children": + * Attempt to add a child to a widget class that can't handle children + * (YPushButton etc.) or just one child (YFrame, YDialog). + **/ +template<class YWidget> class YUITooManyChildrenException: public YUIException +{ +public: + + YUITooManyChildrenException( YWidget * container ) + : YUIException( "Too many children" ) + , _container( container ) + {} + + /** + * Returns the container widget that can't handle that many children. + **/ + YWidget * container() const { return _container; } + +protected: + + /** + * Write proper error message with all relevant data. + * Reimplemented from YUIException. + **/ + virtual ostream & dumpOn( ostream & str ) const + { + std::string widgetClass = + container() ? container()->widgetClass() : + "widget"; + + return str << "Too many children for " + << widgetClass + << std::endl; + } + +private: + + YWidget * _container; +}; + + +/** + * Exception class for "invalid child": + * Attempt to remove a child from a children manager that is not in that + * manager's children list. + **/ +template<class YWidget> class YUIInvalidChildException: public YUIException +{ +public: + + YUIInvalidChildException( YWidget * container, + YWidget * child = 0 ) + : YUIException( "Invalid child" ) + , _container( container ) + , _child( child ) + {} + + /** + * Returns the container widget whose child should be removed etc. + **/ + YWidget * container() const { return _container; } + + /** + * Returns the child widget. + **/ + YWidget * child() const { return _child; } + +protected: + + /** + * Write proper error message with all relevant data. + * Reimplemented from YUIException. + **/ + virtual ostream & dumpOn( ostream & str ) const + { + std::string containerWidgetClass = + container() ? container()->widgetClass() : + "widget"; + + std::string childWidgetClass = + child() ? child()->widgetClass() : + "<Null>"; + + return str << childWidgetClass + << " is not a child of " + << containerWidgetClass + << std::endl; + } + +private: + + YWidget * _container; + YWidget * _child; +}; + + // // Helper templates // Modified: branches/tmp/sh/mod-ui/core/libyui/src/YUI_core.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YUI_core.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YUI_core.cc Tue Jun 5 16:51:51 2007 @@ -394,6 +394,8 @@ YRadioButtonGroup * YUI::findRadioButtonGroup( YContainerWidget * root, YWidget * widget, bool * contains ) { + // FIXME: this function is very likely very obsolete + YCPValue root_id = root->id(); #if VERBOSE_FIND_RADIO_BUTTON_GROUP Modified: branches/tmp/sh/mod-ui/core/libyui/src/YWidget.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YWidget.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YWidget.cc Tue Jun 5 16:51:51 2007 @@ -35,6 +35,8 @@ #include "YDialog.h" #include "YUIException.h" +#include "YChildrenManager.h" + using std::string; #define MAX_DEBUG_LABEL_LEN 50 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r38295 - /tags/stable-2_15_42/packager/
by locilka＠svn.opensuse.org 05 Jun '07

05 Jun '07

Author: locilka Date: Tue Jun 5 16:37:15 2007 New Revision: 38295 URL: http://svn.opensuse.org/viewcvs/yast?rev=38295&view=rev Log: Created tag stable-2_15_42 for packager Added: tags/stable-2_15_42/packager/ - copied from r38294, trunk/packager/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r38294 - /tags/stable-2_15_42/
by locilka＠svn.opensuse.org 05 Jun '07

05 Jun '07

Author: locilka Date: Tue Jun 5 16:37:12 2007 New Revision: 38294 URL: http://svn.opensuse.org/viewcvs/yast?rev=38294&view=rev Log: Created tag stable-2_15_42 Added: tags/stable-2_15_42/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r38293 - in /trunk/packager: VERSION package/yast2-packager.changes
by locilka＠svn.opensuse.org 05 Jun '07

05 Jun '07

Author: locilka Date: Tue Jun 5 16:36:35 2007 New Revision: 38293 URL: http://svn.opensuse.org/viewcvs/yast?rev=38293&view=rev Log: 2.15.42 Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=38293&r1=38… ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Tue Jun 5 16:36:35 2007 @@ -1 +1 @@ -2.15.41 +2.15.42 Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Tue Jun 5 16:36:35 2007 @@ -6,6 +6,7 @@ - Add-On Export uses that "autoyast_product" ("PRODUCT") instead of the "product" key which is used for other purposes, mostly for UI (#279893). +- 2.15.42 ------------------------------------------------------------------- Wed May 30 14:16:09 CEST 2007 - lslezak(a)suse.cz -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r38292 - /tags/stable-2_15_9/add-on/
by locilka＠svn.opensuse.org 05 Jun '07

05 Jun '07

Author: locilka Date: Tue Jun 5 16:27:21 2007 New Revision: 38292 URL: http://svn.opensuse.org/viewcvs/yast?rev=38292&view=rev Log: Created tag stable-2_15_9 for add-on Added: tags/stable-2_15_9/add-on/ - copied from r38291, trunk/add-on/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r38291 - /tags/stable-2_15_7/samba-server/
by locilka＠svn.opensuse.org 05 Jun '07

05 Jun '07

Author: locilka Date: Tue Jun 5 16:16:32 2007 New Revision: 38291 URL: http://svn.opensuse.org/viewcvs/yast?rev=38291&view=rev Log: Created tag stable-2_15_7 for samba-server Added: tags/stable-2_15_7/samba-server/ - copied from r38290, trunk/samba-server/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r38290 - /tags/branch-SLE-10-SP1-2_13_5/product-creator/
by jsuchome＠svn.opensuse.org 05 Jun '07

05 Jun '07

Author: jsuchome Date: Tue Jun 5 16:02:44 2007 New Revision: 38290 URL: http://svn.opensuse.org/viewcvs/yast?rev=38290&view=rev Log: Created tag branch-SLE-10-SP1-2_13_5 for product-creator Added: tags/branch-SLE-10-SP1-2_13_5/product-creator/ - copied from r38289, branches/SuSE-SLE-10-SP1-Branch/product-creator/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r38289 - in /branches/SuSE-SLE-10-SP1-Branch/product-creator: VERSION package/yast2-product-creator.changes src/Kiwi.ycp src/kiwi.ycp
by jsuchome＠svn.opensuse.org 05 Jun '07

05 Jun '07

Author: jsuchome Date: Tue Jun 5 16:02:39 2007 New Revision: 38289 URL: http://svn.opensuse.org/viewcvs/yast?rev=38289&view=rev Log: - kiwi UI: create output directly in output directory to prevent problems with kernel symlink (#279981) - 2.13.5 Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Kiwi.ycp branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi.ycp Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION Tue Jun 5 16:02:39 2007 @@ -1 +1 @@ -2.13.4 +2.13.5 Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes Tue Jun 5 16:02:39 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Jun 5 15:35:29 CEST 2007 - jsuchome(a)suse.cz + +- kiwi UI: create output directly in output directory to prevent + problems with kernel symlink (#279981) +- 2.13.5 + +------------------------------------------------------------------- Thu May 31 14:33:51 CEST 2007 - lslezak(a)suse.cz - if the product is not bootable do not create /boot directory, Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Kiwi.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Kiwi.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Kiwi.ycp Tue Jun 5 16:02:39 2007 @@ -386,7 +386,7 @@ } // run kiwi to finally create the live iso image - global boolean PrepareAndCreate () { + global boolean PrepareAndCreate (string out_dir) { if (config_dir == "" || !FileUtils::Exists (config_dir)) return false; @@ -462,9 +462,8 @@ // now continue with creating UI::ChangeWidget (`id(`log), `LastLine, "\n"); - cmd = sformat ("kiwi --create %1/myphysical -d %1/output --logfile terminal", - tmp_dir); - SCR::Execute (.target.mkdir, tmp_dir + "/output"); + cmd = sformat ("kiwi --create %1/myphysical -d %2 --logfile terminal", + tmp_dir, out_dir); y2milestone ("calling '%1'", cmd); // label UI::ReplaceWidget (`id (`rpl), `Left (`Label (_("Creating Image...")))); @@ -505,22 +504,5 @@ return (images_dir + get_config_dir (KiwiConfig["name"]:"", kiwi_task)); } - /** - * move the final image(s) created by kiwi to user defined directory - */ - global string MoveOutput (string out_dir) { - string ret = tmp_dir + "/output"; // the actual output directory - if (out_dir == "") return ret; - if (FileUtils::CheckAndCreatePath (out_dir)) - { - y2milestone ("moving %1/* to %2/", ret, out_dir); - SCR::Execute (.target.bash, sformat ("mv %1/* %2/", ret, out_dir)); - ret = out_dir; - } - return ret; - } - } - - Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi.ycp Tue Jun 5 16:02:39 2007 @@ -661,13 +661,13 @@ { if (Kiwi::WriteConfigXML (KiwiConfig, kiwi_task)) { - if (Kiwi::PrepareAndCreate ()) + string out_dir = KiwiConfig["iso-directory"]:""; + if (FileUtils::CheckAndCreatePath (out_dir) && Kiwi::PrepareAndCreate (out_dir)) { - string dir = Kiwi::MoveOutput (KiwiConfig["iso-directory"]:""); if (kiwi_task == "usb" && false) { // additional question (yes/no) - if (Popup::YesNo (sformat (success[kiwi_task]:"", dir) + _(" + if (Popup::YesNo (sformat (success[kiwi_task]:"", out_dir) + _(" Save the image to the stick now?"))) { NotImplementedHandler ("", $[ "ID" : ""]); @@ -675,7 +675,7 @@ } else { - Popup::Message (sformat (success[kiwi_task]:"", dir)); + Popup::Message (sformat (success[kiwi_task]:"", out_dir)); } ret = true; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0