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

List:       kde-commits
Subject:    l10n-kde4/scripts
From:       Chusslove Illich <caslav.ilic () gmx ! net>
Date:       2008-06-01 3:13:48
Message-ID: 1212290028.099202.29217.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 815058 by ilic:

Handle properly new bundle file without original.

 M  +10 -5     lbundle-check.py  


--- trunk/l10n-kde4/scripts/lbundle-check.py #815057:815058
@@ -815,14 +815,19 @@
                 btrack.pop(btrack[bfilepath])
             return
 
-    # If the bundled file is not yet tracked, add it.
+    # If the bundled file is not yet tracked, add it,
+    # or warn about bundled file with no original and stop processing.
     if bfilepath not in btrack:
-        checksum = file_checksum(origpath)
-        revision = bspec.srcvcs.get_revision(origpath)
-        btrack.add(Bundle_track_item(bfilepath, checksum, revision))
+        if os.path.isfile(origpath):
+            checksum = file_checksum(origpath)
+            revision = bspec.srcvcs.get_revision(origpath)
+            btrack.add(Bundle_track_item(bfilepath, checksum, revision))
+        else:
+            warning("found new bundle file '%s', "
+                    "but there is no original at '%s'" % (filepath, origpath))
+            return
 
     # If the original file no longer exists, make the bundled obsolete.
-    # or warn about bundled file with no original.
     # Stop further processing.
     if not os.path.isfile(origpath):
         set_file_state(filepath, bfilepath, origpath, bspec, btrack, cstats,
[prev in list] [next in list] [prev in thread] [next in thread]