[Pkg-zenoss-commits] r264 - /trunk/packages/zenoss/debian/patches/ZENHOME90-rest-Products.dpatch

[zack at users.alioth.debian.org]

Author: zack
Date: Sun Jul 22 15:58:30 2007
New Revision: 264

URL: http://svn.debian.org/wsvn/pkg-zenoss/?sc=1&rev=264
Log:
bugfix: as it was the patch introduced a syntax error (but I agree they were dumb in using string concatenation by juxtaposition ... bah)

Modified:
    trunk/packages/zenoss/debian/patches/ZENHOME90-rest-Products.dpatch

Modified: trunk/packages/zenoss/debian/patches/ZENHOME90-rest-Products.dpatch
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/patches/ZENHOME90-rest-Products.dpatch?rev=264&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/patches/ZENHOME90-rest-Products.dpatch (original)
+++ trunk/packages/zenoss/debian/patches/ZENHOME90-rest-Products.dpatch Sun Jul 22 15:58:30 2007
@@ -7,7 +7,7 @@
 @DPATCH@
 diff -urNad zenoss~/Products/ZenModel/help/Administration.stx zenoss/Products/ZenModel/help/Administration.stx
 --- zenoss~/Products/ZenModel/help/Administration.stx	2004-05-18 22:37:04.000000000 +0200
-+++ zenoss/Products/ZenModel/help/Administration.stx	2007-07-22 10:40:58.000000000 +0200
++++ zenoss/Products/ZenModel/help/Administration.stx	2007-07-22 17:55:16.000000000 +0200
 @@ -5,7 +5,7 @@
      Environment
  
@@ -18,8 +18,8 @@
          <p>ORACLE_HOME - path to the oracle client install used to connect to the netcool history database.</p>
  
 diff -urNad zenoss~/Products/ZenRRD/plugins/randomExample.py zenoss/Products/ZenRRD/plugins/randomExample.py
---- zenoss~/Products/ZenRRD/plugins/randomExample.py	2007-07-22 10:40:57.000000000 +0200
-+++ zenoss/Products/ZenRRD/plugins/randomExample.py	2007-07-22 10:40:58.000000000 +0200
+--- zenoss~/Products/ZenRRD/plugins/randomExample.py	2007-07-22 17:55:16.000000000 +0200
++++ zenoss/Products/ZenRRD/plugins/randomExample.py	2007-07-22 17:55:16.000000000 +0200
 @@ -31,7 +31,7 @@
  
      env = {}
@@ -30,8 +30,8 @@
      width=500
      height=100
 diff -urNad zenoss~/Products/ZenUtils/Graphics.py zenoss/Products/ZenUtils/Graphics.py
---- zenoss~/Products/ZenUtils/Graphics.py	2007-07-22 10:40:57.000000000 +0200
-+++ zenoss/Products/ZenUtils/Graphics.py	2007-07-22 10:40:58.000000000 +0200
+--- zenoss~/Products/ZenUtils/Graphics.py	2007-07-22 17:55:16.000000000 +0200
++++ zenoss/Products/ZenUtils/Graphics.py	2007-07-22 17:55:16.000000000 +0200
 @@ -61,7 +61,7 @@
          import pwd, os, os.path
          config = os.path.join(pwd.getpwnam('zenoss')[5], 'lib/graphviz/config')
@@ -42,8 +42,8 @@
          graph = pydot.graph_from_edges(edges, directed=directed)
          graph.ranksep = '1.5'
 diff -urNad zenoss~/Products/ZenUtils/ZenBackup.py zenoss/Products/ZenUtils/ZenBackup.py
---- zenoss~/Products/ZenUtils/ZenBackup.py	2007-07-22 10:40:57.000000000 +0200
-+++ zenoss/Products/ZenUtils/ZenBackup.py	2007-07-22 10:40:58.000000000 +0200
+--- zenoss~/Products/ZenUtils/ZenBackup.py	2007-07-22 17:55:16.000000000 +0200
++++ zenoss/Products/ZenUtils/ZenBackup.py	2007-07-22 17:55:16.000000000 +0200
 @@ -126,7 +126,7 @@
                                 default=None,
                                 help='File to backup to.'
@@ -54,15 +54,16 @@
                                 dest="noEventsDb",
                                 default=False,
 diff -urNad zenoss~/Products/ZenUtils/zenpack.py zenoss/Products/ZenUtils/zenpack.py
---- zenoss~/Products/ZenUtils/zenpack.py	2007-07-22 10:40:57.000000000 +0200
-+++ zenoss/Products/ZenUtils/zenpack.py	2007-07-22 10:45:18.000000000 +0200
+--- zenoss~/Products/ZenUtils/zenpack.py	2007-07-22 17:55:16.000000000 +0200
++++ zenoss/Products/ZenUtils/zenpack.py	2007-07-22 17:55:53.000000000 +0200
 @@ -156,15 +156,15 @@
          
          # Continue without copying if the srcDir is already in Products
          if os.path.exists(root) and os.path.samefile(root, srcDir):
 -            self.log.debug('Directory already in $ZENHOME/Products,'
-+            self.log.debug('Directory already in %s/Products,' % pwd.getpwnam('zenoss')[5]
-                             ' not copying.')
+-                            ' not copying.')
++            self.log.debug('Directory already in %s/Products,' % pwd.getpwnam('zenoss')[5],
++                            'not copying.')
              return packName
          
          # Copy the source dir over to Products
@@ -80,8 +81,9 @@
          # Continue without copying if the srcDir is already in Products
          if os.path.exists(root) and os.path.samefile(root, srcDir):
 -            self.log.debug('Directory already in $ZENHOME/Products,'
-+            self.log.debug('Directory already in %s/Products,' % (pwd.getpwnam('zenoss')[5])
-                             ' not copying.')
+-                            ' not copying.')
++            self.log.debug('Directory already in %s/Products,' % (pwd.getpwnam('zenoss')[5]),
++                            'not copying.')
              return packName
        
 -        targetdir = "$ZENHOME/Products/%s" % packName