It seems that if you change the attributes on a file, the bzr diff command
reports this, but meld has no idea what to do with the line
=== modified file 'local/scripts/setup/setup.py' (properties changed: -x to
+x)
Requested info accd to meld is below:
- meld version: '1.6.0'
- source control software type: 'Bazaar-NG'
$ bzr --version
Bazaar (bzr) 2.5.1
Python interpreter: /usr/bin/python2 2.7.3
Python standard library: /usr/lib/python2.7
Platform: Linux-3.4.9-1-ARCH-x86_64-with-glibc2.2.5
bzrlib: /usr/lib/python2.7/site-packages/bzrlib
- the output of 'bzr --no-aliases --no-plugins diff somefile.txt'
=== modified file 'local/scripts/setup/setup.py' (properties changed: -x to
+x)
--- local/scripts/setup/setup.py 2012-03-30 07:10:53 +0000
+++ local/scripts/setup/setup.py 2012-08-28 02:38:48 +0000
@@ -148,6 +148,21 @@
This is to call the script to import a list of servers
"""
ServerImporter().syncServerList(dstore)
+
+def addUsageDefns(dstore):
+ """
+ Add the netflow inbound and outbound resources to the Total Traffic
+ resource
+ """
+ group_id = dstore.resource.getResourceGroupIdByName('Total Traffic')
+ defnid = dstore.genericUsage.getDefnByName('Netflow-v5')['defnid']
+
+ resourceid = dstore.resource.getResourceIdByName('Outbound')
+ dstore.resource.addResourceToGroup(group_id, defnid,
+ 'default', resourceid)
+ resourceid = dstore.resource.getResourceIdByName('Inbound')
+ dstore.resource.addResourceToGroup(group_id, defnid,
+ 'default', resourceid)
if __name__ == '__main__':
import sys
@@ -182,6 +197,8 @@
setupAdmin(dstore)
print 'customize database'
customizeDatabase(dstore)
+ print 'Usage Defns'
+ addUsageDefns(dstore)
print 'Ldap sync'
ldapSync()
print 'Import Servers sync'
- patch command: 'patch -p0 -R -d /tmp/tmp_shkCA-meld'
--
Louis
_______________________________________________
meld-list mailing list
[email protected]
https://mail.gnome.org/mailman/listinfo/meld-list
