Author: dmacvicar Date: Thu Aug 2 12:38:08 2007 New Revision: 6385 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6385&view=rev Log: fix indentation Modified: trunk/updater-kde/updater/zypp/ZYppUpdater.cpp trunk/updater-kde/updater/zypp/opensuseupdater_zypp.desktop trunk/updater-kde/updater/zypp/zypper_install (contents, props changed) trunk/updater-kde/updater/zypp/zyppupdaterpreferences_base.ui Modified: trunk/updater-kde/updater/zypp/ZYppUpdater.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/zypp/ZYppUpdater.cpp?rev=6385&r1=6384&r2=6385&view=diff ============================================================================== --- trunk/updater-kde/updater/zypp/ZYppUpdater.cpp (original) +++ trunk/updater-kde/updater/zypp/ZYppUpdater.cpp Thu Aug 2 12:38:08 2007 @@ -47,7 +47,7 @@ #include "MainWindow.h" #include "UpdateListItem.h" #include "licensedialog.h" -#include "Constants.h" +#include "../Constants.h" K_EXPORT_COMPONENT_FACTORY( opensuseupdater_zypp, KGenericFactory<ZYppUpdater>( "opensuseupdater_zypp" ) ) Modified: trunk/updater-kde/updater/zypp/opensuseupdater_zypp.desktop URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/zypp/opensuseupdater_zypp.desktop?rev=6385&r1=6384&r2=6385&view=diff ============================================================================== --- trunk/updater-kde/updater/zypp/opensuseupdater_zypp.desktop (original) +++ trunk/updater-kde/updater/zypp/opensuseupdater_zypp.desktop Thu Aug 2 12:38:08 2007 @@ -1,6 +1,6 @@ [Desktop Entry] Name=zypp_backend - Comment=ZYpp Backend - ServiceTypes=openSUSEUpdater/Backend - Type=Service - X-KDE-Library=opensuseupdater_zypp +Comment=ZYpp Backend +ServiceTypes=openSUSEUpdater/Backend +Type=Service +X-KDE-Library=opensuseupdater_zypp Modified: trunk/updater-kde/updater/zypp/zypper_install URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/zypp/zypper_install?rev=6385&r1=6384&r2=6385&view=diff ============================================================================== --- trunk/updater-kde/updater/zypp/zypper_install (original) +++ trunk/updater-kde/updater/zypp/zypper_install Thu Aug 2 12:38:08 2007 @@ -2,81 +2,80 @@ patchlist="" - packagelist="" - pkgmgrlist="" - type="patch" +packagelist="" +pkgmgrlist="" +type="patch" - while [ -n "$1" ]; -do +while [ -n "$1" ]; do -case "$1" in - "--patch") - type="patch" - ;; + case "$1" in + "--patch") + type="patch" + ;; - "--package") - type="package" - ;; + "--package") + type="package" + ;; - "--pkgmgr") - type="pkgmgr" - ;; + "--pkgmgr") + type="pkgmgr" + ;; - *) - if [ $type == "patch" ]; then - patchlist="$patchlist $1 " - fi + *) + if [ $type == "patch" ]; then + patchlist="$patchlist $1 " + fi - if [ $type == "package" ]; then - packagelist="$packagelist $1 " - fi + if [ $type == "package" ]; then + packagelist="$packagelist $1 " + fi - if [ $type == "pkgmgr" ]; then - pkgmgrlist="$pkgmgrlist $1 " - fi + if [ $type == "pkgmgr" ]; then + pkgmgrlist="$pkgmgrlist $1 " + fi - ;; - esac + ;; + esac - shift - done + shift +done - patchcommand="zypper -q --terse --non-interactive in -l -t patch $patchlist" - packagecommand="zypper -q --terse --non-interactive in -l -t package $packagelist" - pkgmgrcommand="zypper -q --terse --non-interactive in -l -t patch $pkgmgrlist" +patchcommand="zypper -q --terse --non-interactive in -l -t patch $patchlist" +packagecommand="zypper -q --terse --non-interactive in -l -t package $packagelist" +pkgmgrcommand="zypper -q --terse --non-interactive in -l -t patch $pkgmgrlist" - out=/tmp/opensuseupater_out_$$ - err=/tmp/opensuseupater_err_$$ +out=/tmp/opensuseupater_out_$$ +err=/tmp/opensuseupater_err_$$ - mkfifo $out - mkfifo $err +mkfifo $out +mkfifo $err - retval=0 +retval=0 - cat $err >&2 & - cat $out & +cat $err >&2 & +cat $out & - command="true" +command="true" - if [ -n "$pkgmgrlist" ]; then - command="$command && $pkgmgrcommand " - fi +if [ -n "$pkgmgrlist" ]; then + command="$command && $pkgmgrcommand " +fi - if [ -n "$patchlist" ]; then - command="$command && $patchcommand " - fi +if [ -n "$patchlist" ]; then + command="$command && $patchcommand " +fi - if [ -n "$packagelist" ]; then - command="$command && $packagecommand " - fi +if [ -n "$packagelist" ]; then + command="$command && $packagecommand " +fi - kdesu --noignorebutton -d -c "( $command ) > $out 2> $err " - retval=$? +kdesu --noignorebutton -d -c "( $command ) > $out 2> $err " +retval=$? - rm $out - rm $err +rm $out +rm $err - exit $retval +exit $retval Modified: trunk/updater-kde/updater/zypp/zyppupdaterpreferences_base.ui URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/zypp/zyppupdaterpreferences_base.ui?rev=6385&r1=6384&r2=6385&view=diff ============================================================================== --- trunk/updater-kde/updater/zypp/zyppupdaterpreferences_base.ui (original) +++ trunk/updater-kde/updater/zypp/zyppupdaterpreferences_base.ui Thu Aug 2 12:38:08 2007 @@ -1,71 +1,71 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> - <class>ZYppUpdaterPreferences_Base</class> - <widget class="QWidget"> - <property name="name"> - <cstring>ZYppUpdaterPreferences_Base</cstring> - </property> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>400</width> - <height>109</height> - </rect> - </property> - <property name="caption"> - <string>Form1</string> - </property> - <vbox> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <widget class="QLayoutWidget"> - <property name="name"> - <cstring>layout1</cstring> - </property> - <hbox> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <widget class="QDial"> - <property name="name"> - <cstring>kcfg_Priority</cstring> - </property> - <property name="minValue"> - <number>-20</number> - </property> - <property name="maxValue"> - <number>19</number> - </property> - </widget> - <widget class="QLabel"> - <property name="name"> - <cstring>textLabel1</cstring> - </property> - <property name="text"> - <string>Update checking process priority</string> - </property> - </widget> - </hbox> - </widget> - <spacer> - <property name="name"> - <cstring>spacer1</cstring> - </property> - <property name="orientation"> - <enum>Vertical</enum> - </property> - <property name="sizeType"> - <enum>Expanding</enum> - </property> - <property name="sizeHint"> - <size> - <width>20</width> - <height>16</height> - </size> - </property> - </spacer> - </vbox> - </widget> - <layoutdefaults spacing="6" margin="11"/> - </UI> +<class>ZYppUpdaterPreferences_Base</class> +<widget class="QWidget"> + <property name="name"> + <cstring>ZYppUpdaterPreferences_Base</cstring> + </property> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>400</width> + <height>109</height> + </rect> + </property> + <property name="caption"> + <string>Form1</string> + </property> + <vbox> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <widget class="QLayoutWidget"> + <property name="name"> + <cstring>layout1</cstring> + </property> + <hbox> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <widget class="QDial"> + <property name="name"> + <cstring>kcfg_Priority</cstring> + </property> + <property name="minValue"> + <number>-20</number> + </property> + <property name="maxValue"> + <number>19</number> + </property> + </widget> + <widget class="QLabel"> + <property name="name"> + <cstring>textLabel1</cstring> + </property> + <property name="text"> + <string>Update checking process priority</string> + </property> + </widget> + </hbox> + </widget> + <spacer> + <property name="name"> + <cstring>spacer1</cstring> + </property> + <property name="orientation"> + <enum>Vertical</enum> + </property> + <property name="sizeType"> + <enum>Expanding</enum> + </property> + <property name="sizeHint"> + <size> + <width>20</width> + <height>16</height> + </size> + </property> + </spacer> + </vbox> +</widget> +<layoutdefaults spacing="6" margin="11"/> +</UI> -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org