Changeset 562 for CMT/HEAD/mgr

Timestamp:

Mar 8, 2011, 5:02:59 PM (13 years ago)

Author:

rybkin

Message:

See C.L. 445

Location:

CMT/HEAD/mgr

Files:

• cmt_svn_checkout.py (modified) (2 diffs)
• fragments/cleanup_header (modified) (1 diff)

CMT/HEAD/mgr/cmt_svn_checkout.py

@@ -23 +23 @@
 """
 
-__version__ = '0.4.0'
-__date__ = 'Wed Jul 01 2009'
+__version__ = '0.5.0'
+__date__ = 'Wed Feb 22 2011'
 __author__ = 'Grigory Rybkin'
 
@@ -266 +266 @@
                 if not self.with_version_directory:
                     sc += self.write(os.path.join(p,'version.cmt'), version)
+                elif os.path.exists(os.path.join(p,'version.cmt')):
+                    print >>sys.stderr, 'Warning: file %s normally should not be under version control. Please, consider removing' % os.path.join(d,'version.cmt')
+                    try:
+                        os.rename(os.path.join(p,'version.cmt'),
+                                  os.path.join(p,'version.cmt.orig'))
+                        print >>sys.stderr, 'renamed %s -> %s' % (`os.path.join(p,'version.cmt')`, `os.path.join(p,'version.cmt.orig')`)
+                    except (IOError, os.error), e:
+                        error(e)
+                    
                 if self.config:
                     sc += self.generate(p)

CMT/HEAD/mgr/fragments/cleanup_header

@@ -7 +7 @@
 .DEFAULT::
         $(echo) "(${CONSTITUENT}.make) $@: No rule for such target" >&2
-#       @echo "#CMT> Warning: $@: No rule for such target" >&2; exit
-        if echo $@ | grep '$(package)setup\.make$$' >/dev/null; then\
-         echo "$(CMTMSGPREFIX)" "(${CONSTITUENT}.make): $@: File no longer generated" >&2; exit 0; fi
 else
 .DEFAULT::
-        $(echo) "(${CONSTITUENT}.make) PEDANTIC: $@: No rule for such target" >&2
-        if echo $@ | grep '$(package)setup\.make$$' >/dev/null; then\
-         echo "$(CMTMSGPREFIX)" "(${CONSTITUENT}.make): $@: File no longer generated" >&2; exit 0;\
-         elif test $@ = "$(cmt_final_setup)" -o\
-         $@ = "$(cmt_final_setup_${CONSTITUENT})" ; then\
-         found=n; for s in 1 2 3 4 5; do\
-         sleep $$s; test ! -f $@ || { found=y; break; }\
-         done; if test $$found = n; then\
-         test -z "$(cmtmsg)" ||\
-         echo "$(CMTMSGPREFIX)" "(${CONSTITUENT}.make) PEDANTIC: $@: Seems to be missing. Ignore it for now" >&2; exit 0 ; fi;\
-         elif test `expr $@ : '.*/'` -ne 0 ; then\
-         test -z "$(cmtmsg)" ||\
-         echo "$(CMTMSGPREFIX)" "(${CONSTITUENT}.make) PEDANTIC: $@: Seems to be a missing file. Please check" >&2; exit 2 ; \
-         else\
-         test -z "$(cmtmsg)" ||\
-         echo "$(CMTMSGPREFIX)" "(${CONSTITUENT}.make) PEDANTIC: $@: Seems to be a fake target due to some pattern. Just ignore it" >&2 ; exit 0; fi
+        $(error PEDANTIC: $@: No rule for such target)
 endif