Browse Source

Add -f option to rm in Makefiles and changes 2 properties names in generated code

Yann Weber 9 years ago
parent
commit
e44dbcbad8
3 changed files with 8 additions and 8 deletions
  1. 3
    3
      Makefile
  2. 3
    3
      install/Makefile
  3. 2
    2
      leapi/lefactory.py

+ 3
- 3
Makefile View File

@@ -12,10 +12,10 @@ pip: cleanpycache
12 12
 .PHONY: check doc clean cleanpyc cleandoc cleanpycache
13 13
 
14 14
 cleandoc:
15
-	-rm -Rv ./doc/
15
+	-rm -Rfv ./doc/
16 16
 cleanpyc:
17
-	-find ./ |grep -E "\.pyc$$" |xargs rm -v 2>/dev/null
17
+	-find ./ |grep -E "\.pyc$$" |xargs rm -fv 2>/dev/null
18 18
 cleanpycache: cleanpyc
19
-	-find ./ -type d |grep '__pycache__' | xargs rmdir -v 2>/dev/null
19
+	-find ./ -type d |grep '__pycache__' | xargs rmdir -fv 2>/dev/null
20 20
 
21 21
 clean: cleanpyc cleandoc cleanpycache

+ 3
- 3
install/Makefile View File

@@ -9,12 +9,12 @@ dbinit:
9 9
 .PHONY: clean cleanpycache cleanpyc refreshdyn distclean
10 10
 
11 11
 distclean: clean
12
-	-@rm dynleapi.py
12
+	-@rm -vf dynleapi.py
13 13
 
14 14
 clean: cleanpycache
15 15
 
16 16
 cleanpyc:
17
-	-@rm -v *.pyc
17
+	-@rm -vf *.pyc
18 18
 
19 19
 cleanpycache: cleanpyc
20
-	-@rm -vR __pycache__
20
+	-@rm -vfR __pycache__

+ 2
- 2
leapi/lefactory.py View File

@@ -244,8 +244,8 @@ class LeObject(LeCrud, leapi.leobject._LeObject):
244 244
 class LeRelation(LeCrud, leapi.lerelation._LeRelation):
245 245
     _uid_fieldtype = {lerel_uid_fieldtype}
246 246
     _rel_fieldtypes = {lerel_fieldtypes}
247
-    _lesup_name = {lesup_name}
248
-    _lesub_name = {lesub_name}
247
+    _superior_fieldname = {lesup_name}
248
+    _subordinate_fieldname = {lesub_name}
249 249
 
250 250
 class LeHierarch(LeRelation, leapi.lerelation._LeHierarch):
251 251
     pass

Loading…
Cancel
Save