X-Git-Url: https://git.tld-linux.org/?p=TLD.git;a=blobdiff_plain;f=pld-builder.new%2FPLD_Builder%2Futil.py;fp=pld-builder.new%2FPLD_Builder%2Futil.py;h=0000000000000000000000000000000000000000;hp=316a8f19f1461a377da5a5054dc23abdf7f8e312;hb=3dc53b6865f716904ad4d02e934e04b3d4855c32;hpb=b235722fd546915a60800f2660d76f684d6f1445

diff --git a/pld-builder.new/PLD_Builder/util.py b/pld-builder.new/PLD_Builder/util.py
deleted file mode 100644
index 316a8f1..0000000
--- a/pld-builder.new/PLD_Builder/util.py
+++ /dev/null
@@ -1,75 +0,0 @@
-# vi: encoding=utf-8 ts=8 sts=4 sw=4 et
-
-import re
-import sys
-import os
-import log
-import string
-
-def uuid_python():
-    return str(uuid_random())
-
-def uuid_external():
-    f = os.popen("uuidgen 2>&1")
-    u = string.strip(f.read())
-    f.close()
-    if len(u) != 36:
-        raise Exception, "uuid: fatal, cannot generate uuid: %s" % u
-    return u
-
-# uuid module available in python >= 2.5
-try:
-    from uuid import uuid4 as uuid_random
-except ImportError:
-    uuid = uuid_external
-else:
-    uuid = uuid_python
-
-def pkg_name(nvr):
-    return re.match(r"(.+)-[^-]+-[^-]+", nvr).group(1)
-
-def msg(m):
-    sys.stderr.write(m)
-
-def sendfile(src, dst):
-    cnt = 0
-    while 1:
-        s = src.read(10000)
-        if s == "": break
-        cnt += len(s)
-        dst.write(s)
-    return cnt
-
-def append_to(log, msg):
-    f = open(log, "a")
-    f.write("%s\n" % msg)
-    f.close()
-
-def clean_tmp(dir):
-    # FIXME: use python
-    os.system("rm -f %s/* 2>/dev/null; rmdir %s 2>/dev/null" % (dir, dir))
-
-def collect_files(log):
-    f = open(log, 'r')
-    rx = re.compile(r"^Wrote: (/home.*\.rpm)$")
-    files = []
-    for l in f.xreadlines():
-        m = rx.search(l)
-        if m:
-            files.append(m.group(1))
-    f.close()
-    return files
-
-def find_last_section(log):
-    f = open(log, 'r')
-    rx1 = re.compile(r"^Executing\(%(\w+)\).*$")
-    rx2 = re.compile(r"^Processing (files):.*$")
-    last_section = None
-    for l in f:
-        m = rx1.search(l)
-        if not m:
-            m = rx2.search(l)
-        if m:
-            last_section = m.group(1)
-    f.close()
-    return last_section