Mailinglist Archive: zypp-commit (500 mails)

[tgoettlicher@xxxxxxxxxxxxxxxx]

Author: tgoettlicher
Date: Wed Jul 25 13:30:41 2007
New Revision: 6200

URL: http://svn.opensuse.org/viewcvs/zypp?rev=6200&view=rev
Log:
panic checkin

Added:
    trunk/updater-kde/updater/zypp/zypper_install   (with props)
Removed:
    trunk/updater-kde/updater/zypp/zypper_dummy
Modified:
    trunk/updater-kde/updater/MainWindow.cpp
    trunk/updater-kde/updater/TrayIcon.cpp
    trunk/updater-kde/updater/simpleview.cpp
    trunk/updater-kde/updater/zypp/CMakeLists.txt
    trunk/updater-kde/updater/zypp/ZYppUpdater.cpp

Modified: trunk/updater-kde/updater/MainWindow.cpp
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/MainWindow.cpp?rev=6200&r1=6199&r2=6200&view=diff
==============================================================================
--- trunk/updater-kde/updater/MainWindow.cpp (original)
+++ trunk/updater-kde/updater/MainWindow.cpp Wed Jul 25 13:30:41 2007
@@ -255,7 +255,7 @@
   }
 
        packagesSelected=0;
-       QCheckListItem *packageitem = (QCheckListItem*)patchList->firstChild();
+       QCheckListItem *packageitem = (QCheckListItem*)packageList->firstChild();
 
        while (packageitem != NULL)
        {

Modified: trunk/updater-kde/updater/TrayIcon.cpp
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/TrayIcon.cpp?rev=6200&r1=6199&r2=6200&view=diff
==============================================================================
--- trunk/updater-kde/updater/TrayIcon.cpp (original)
+++ trunk/updater-kde/updater/TrayIcon.cpp Wed Jul 25 13:30:41 2007
@@ -85,39 +85,8 @@
                case APPLET_UPDATES:
     case APPLET_CRITICAL_UPDATES:
                        setPixmap(loadIcon(TRAY_ICON_YELLOW));
-
-                       if (patchCount + packageCount > 0)
-                               QToolTip::add(this, i18n("New software for your system is available"));
-
-               /*
-                       // the following isn't realy stylish but allows fine translations
-                       if (patchCount == 1  && packageCount == 0)
-                               QToolTip::add(this, i18n("1 Patch available"));
-
-                       if (patchCount > 1  && packageCount == 0)
-                               QToolTip::add(this, i18n("%1 Patches available").arg(patchCount) );
-
-                       if (patchCount == 0  && packageCount == 1)
-                               QToolTip::add(this, i18n("1 Package available"));
-
-                       if (patchCount == 0  && packageCount > 1)
-                               QToolTip::add(this, i18n("%1 Packages available").arg(packageCount) );
-
-                       if (patchCount == 1  && packageCount ==  1)
-                               QToolTip::add(this, i18n("1 Patch and 1 Package available"));
-
-                       if (patchCount > 1  && packageCount ==  1)
-                               QToolTip::add(this, i18n("%1 Patches and 1 Package available").arg(patchCount));
-
-                       if (patchCount == 1  && packageCount >  1)
-                               QToolTip::add(this, i18n("1 Patch and %1 Packages available").arg(packageCount));
-
-                       if (patchCount > 1  && packageCount >  1)
-                               QToolTip::add(this, i18n("%1 Patches and %2 Packages available").arg(patchCount).arg(packageCount));
-               */
-
+                       QToolTip::add(this, i18n("New software for your system is available"));
                        popup->show();
-
                        break;
 
                case APPLET_INSTALLING:

Modified: trunk/updater-kde/updater/simpleview.cpp
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/simpleview.cpp?rev=6200&r1=6199&r2=6200&view=diff
==============================================================================
--- trunk/updater-kde/updater/simpleview.cpp (original)
+++ trunk/updater-kde/updater/simpleview.cpp Wed Jul 25 13:30:41 2007
@@ -104,6 +104,13 @@
 
        if (norestart->isOn())
                emit(patchUnselectRestart());
+
+       if (!recommended->isOn() && securityCount == 0  )
+               install->setDisabled(true);
+       else
+               install->setDisabled(false);
+               
+
 }
 
 

Modified: trunk/updater-kde/updater/zypp/CMakeLists.txt
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/zypp/CMakeLists.txt?rev=6200&r1=6199&r2=6200&view=diff
==============================================================================
--- trunk/updater-kde/updater/zypp/CMakeLists.txt (original)
+++ trunk/updater-kde/updater/zypp/CMakeLists.txt Wed Jul 25 13:30:41 2007
@@ -20,13 +20,7 @@
 
 
 INSTALL(
-  PROGRAMS zypper_-q_x zypper_dummy
-  DESTINATION /tmp
+  PROGRAMS zypper_-q_x zypper_install
+  DESTINATION /usr/sbin
 )
 
-#INSTALL(
-#  FILES zypper.xml
-#  DESTINATION /tmp
-#)
-
-

Modified: trunk/updater-kde/updater/zypp/ZYppUpdater.cpp
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/zypp/ZYppUpdater.cpp?rev=6200&r1=6199&r2=6200&view=diff
==============================================================================
--- trunk/updater-kde/updater/zypp/ZYppUpdater.cpp (original)
+++ trunk/updater-kde/updater/zypp/ZYppUpdater.cpp Wed Jul 25 13:30:41 2007
@@ -30,6 +30,7 @@
 #include <qpopupmenu.h>
 #include <qtimer.h>
 #include <qprogressdialog.h>
+#include <qmessagebox.h>
 
 #include <kglobal.h>
 
@@ -46,6 +47,7 @@
 #include "MainWindow.h"
 #include "UpdateListItem.h"
 #include "licensedialog.h"
+#include "../Constants.h"
 
 K_EXPORT_COMPONENT_FACTORY( opensuseupdater_zypp, KGenericFactory<ZYppUpdater>( "opensuseupdater_zypp" ) )
 
@@ -80,20 +82,25 @@
        kdDebug() << "install process exited." << endl;
   emit(showProgress(false));   
 
-       if (p->exitStatus() == 0)
+       
+       QMessageBox::information( NULL, "stdout", _install_stdout_buffer);
+       QMessageBox::information( NULL, "stderr", _install_stderr_buffer);
+
+       if (p->exitStatus() == 0 && _install_stderr_buffer.isEmpty())
        {
-               _install_stderr_buffer.truncate(0);
-               _install_stdout_buffer.truncate(0);
          delete p;
          _install_process = 0L;
+               QMessageBox::information( NULL, PROGRAM_NAME, i18n("Update finished."));
          doCheckForUpdates();
        }
        else
        {
-               updateAppletError( i18n("helper program returned:\n%1").arg(_install_stderr_buffer) );
+               updateAppletError( i18n("helper program returned:\n%1\n%2").arg(_install_stderr_buffer).arg(_install_stdout_buffer) );
        delete p;
          _install_process = 0L;
        }
+       _install_stderr_buffer.truncate(0);
+       _install_stdout_buffer.truncate(0);
 }
 
 void ZYppUpdater::slotInstSourceProcessExited( KProcess *p )
@@ -197,13 +204,17 @@
        if (_install_stdout_buffer.isEmpty())
        emit(showProgress(true));       
 
-       emit(setProgressNextStep(buffer));
+       QString line = QString::fromUtf8(buffer,buflen);
+       if (line.startsWith("Installing:"))
+       {
+               line = line.section(':', 1);
+               emit(setProgressNextStep(line));
+       }
 
   kdDebug() << "got text from install helper..." << endl;
        kdDebug() << buffer << endl;
 
   _install_stdout_buffer += QString::fromUtf8( buffer, buflen );
-
 }
 
 void ZYppUpdater::slotInstallReceivedStderr(KProcess *proc, char *buffer, int buflen)
@@ -218,8 +229,6 @@
 
 
 
-
-
 void ZYppUpdater::slotReceivedStderr(KProcess *proc, char *buffer, int buflen)
 {
   _stderr_buffer += QString::fromUtf8( buffer, buflen );
@@ -247,12 +256,8 @@
   }
 
 
-
-
   _process = new KProcess;
-
-  *_process << "/usr/bin/zypper" << "-q" << "xu";
-//  *_process << "/tmp/zypper_-q_x" ;
+  *_process << "/usr/sbin/zypp-refresh-wrapper";
   
   QObject::connect( _process, SIGNAL( processExited( KProcess * ) ),
            SLOT( slotProcessExited( KProcess * ) ) );
@@ -318,11 +323,10 @@
                return;
        }
 
-       QStringList installList;
+       QStringList installPatchList;
+       QStringList installPackageList;
        QCheckListItem *item = (QCheckListItem*)_patchList->firstChild();
        
-       int totalUpdateCount=0;
-
        while (item != NULL)
        {
                if (item->isOn())
@@ -333,18 +337,12 @@
                  ZYppResolvable *patch = zi->resolvable();
                                
                if ( patch->license.stripWhiteSpace().isEmpty()) 
-                               {
-                                       installList += item->text();
-                                       totalUpdateCount++;
-                               }
+                                       installPatchList += item->text();
                                else
                                {
                                licenseDialog->setText(i18n("License of %1").arg(patch->name), patch->license);
                                        if ( licenseDialog->exec() )
-                                       {
-                                               installList += item->text();
-                                               totalUpdateCount++;
-                                       }
+                                               installPatchList += item->text();
                                }
            }
                }
@@ -362,28 +360,19 @@
                  {
                  ZYppResolvable *patch = zi->resolvable();
 
-
                if ( patch->license.stripWhiteSpace().isEmpty()) 
-                               {
-                                       installList += item->text();
-                                       totalUpdateCount++;
-                               }
+                                       installPackageList += item->text();
                                else
                                {
                                licenseDialog->setText(i18n("License of %1").arg(patch->name), patch->license);
                                        if ( licenseDialog->exec() ) 
-                                       {
-                                               installList += item->text();
-                                               totalUpdateCount++;
-                                       }
+                                               installPackageList += item->text();
                                }
                        }
     }
     item = (QCheckListItem*)item->nextSibling();
   }
 
-
-
   if ( _install_process ) {
                // TODO update still running
     kdDebug() << "Update process still running. Will not run this time." << endl;
@@ -392,9 +381,17 @@
 
   _install_process = new KProcess;
 
-//  *_install_process << "kdesu" << "-t" << "-c" << "/tmp/zypper_dummy " + installList.join(" ");
-//     *_install_process << "gnomesu" <<   "-c" << "/tmp/zypper_dummy " + installList.join(" ");
-       *_install_process << "gnomesu" <<   "-c" << "/tmp/zypper_dummy " + installList.join(" ");
+       QString command="/usr/sbin/zypper_install ";
+       
+       if (!installPatchList.isEmpty())
+               command += " patch=" + installPatchList.join(" patch=");
+
+       if (!installPackageList.isEmpty())
+               command += " package=" + installPackageList.join(" package=");
+
+       kdDebug() << "Command: " << command << endl;;
+       *_install_process << "kdesu" << "-t" <<  "-c" << command;
+
 
   
   QObject::connect( _install_process, SIGNAL( processExited( KProcess * ) ),
@@ -418,7 +415,7 @@
   
   kdDebug() << "install process started.." << endl;
   emit(updateApplet(APPLET_INSTALLING, 0, 0)); 
-  emit(setProgress(0, totalUpdateCount, ""));        
+  emit(setProgress(0, installPackageList.count() + installPatchList.count(), ""));   
 
 }
 

Added: trunk/updater-kde/updater/zypp/zypper_install
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/zypp/zypper_install?rev=6200&view=auto
==============================================================================
--- trunk/updater-kde/updater/zypp/zypper_install (added)
+++ trunk/updater-kde/updater/zypp/zypper_install Wed Jul 25 13:30:41 2007
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+
+patchlist=""
+packagelist=""
+
+for i in $@
+do
+       type=`echo $i | cut -f1 -d=` 
+       name=`echo $i | cut -f2- -d=` 
+
+       if [ $type == "patch" ]; then
+               patchlist="$patchlist $name "
+       fi
+
+       if [ $type == "package" ]; then
+               packagelist="$packagelist $name "
+       fi
+done
+
+
+patchcommand="zypper -q --terse --non-interactive in -y -l -m -t patch $patchlist"
+packagecommand="zypper -q --terse --non-interactive in -y -l -m -t package $packagelist"
+
+
+echo " "
+
+retval=0
+
+if [ -n "$patchlist" ] && [ -n "$packagelist" ]; then
+       $patchcommand && $packagecommand
+       [ $? -eq 0 ] || retval=1
+else
+       if [ -n "$patchlist" ]; then
+               $patchcommand
+       [ $? -eq 0 ] || retval=1
+       fi
+       if [ -n "$packagelist" ]; then
+o              $packagecommand
+       [ $? -eq 0 ] || retval=1
+       fi
+fi
+       
+
+exit $retval

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