[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/runtime/plasma/tools/plasmapkg
From:       Jonathan Riddell <jr () jriddell ! org>
Date:       2009-07-20 12:59:51
Message-ID: 1248094791.391273.26681.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 999744 by jriddell:

Patch from Ryan Kavanagh <ryanakca@ gmail.com>

Check for conflicting options global and
packageroot in plasmapkg


 M  +3 -1      main.cpp  


--- trunk/KDE/kdebase/runtime/plasma/tools/plasmapkg/main.cpp #999743:999744
@@ -163,7 +163,9 @@
             installer->setServicePrefix(servicePrefix);
         }
 
-        if (args->isSet("packageroot")) {
+        if (args->isSet("packageroot") && args->isSet("global")) {
+            KCmdLineArgs::usageError(i18nc("The user entered conflicting options \
packageroot and global, this is the error message telling the user he can use only \
one", "The packageroot and global options conflict each other, please select only \
one.")); +        } else if (args->isSet("packageroot")) {
             packageRoot = args->getOption("packageroot");
         } else if (args->isSet("global")) {
             packageRoot = KStandardDirs::locate("data", packageRoot);


[prev in list] [next in list] [prev in thread] [next in thread]