- keep functions in front and then the main code

Changed files:
    bin/pfa-from-incoming -> 1.19

diff --git a/bin/pfa-from-incoming b/bin/pfa-from-incoming
index 9826ed9565882297927712c690d61557da95d99d..0d808ca0d398ae8f30919901221d0b65865ca011 100644 (file)
--- a/bin/pfa-from-incoming
+++ b/bin/pfa-from-incoming
@@ -7,13 +7,9 @@ from config import incoming_dir, default_to, ftp_archs
 import config
 from common import noarchcachedir, tmpdir, fileexists
 from baseftptree import BaseFtpTree, BasePkg
-cval=config.value
+cval = config.value
 import ftpio
-
-try:
-    ftpio.connect('from-incoming-pid-%s' % os.getpid())
-except:
-    sys.exit(0)
+import rpm
 
 def rm(file):
     os.remove(file)
@@ -21,6 +17,11 @@ def rm(file):
 def mv(src, dst):
     os.rename(src, dst + '/' + src.split('/')[-1])
 
+def pkg_contents(pkg):
+    print "pkg: %s" % pkg
+    # hardcoded tree name
+    maintree = BaseFtpTree("PLD")
+
 # duplicate code in ftptree.py
 def is_debuginfo(nvr):
     """
@@ -48,37 +49,6 @@ def getcontent(file):
     else:
         return content[:-4]
 
-ftptree = BaseFtpTree(cval['default_to'])
-
-if not ftpio.lock(cval['default_to']):
-    sys.exit(0)
-
-for uploadinfo in findfiles(incoming_dir + 'SRPMS'):
-    content = getcontent(incoming_dir + 'SRPMS/' + uploadinfo)
-    if not content:
-        continue # Uploading not finished
-
-    pkg = BasePkg(uploadinfo[:-19], content = content)
-    srpm = pkg.files['SRPMS'][0]
-
-    if ftptree.has_key(`pkg`):
-        ftpio.log("%s already present in %s; removing newer files" % (srpm, ftptree))
-        rm(incoming_dir + 'SRPMS/' + srpm)
-        f = open(default_to + 'SRPMS/.metadata/' + srpm+'.info', 'a')
-        bid = pkg.build.keys()[0]
-        build = pkg.build[bid]
-        f.write("info:build:%s:requester:%s\ninfo:build:%s:requester_email:%s\n"
-                 % (bid, build.requester, bid, build.requester_email))
-        f.close()
-    else:
-        mv(incoming_dir + 'SRPMS/' + srpm, default_to + 'SRPMS/RPMS')
- 
-        f = open(default_to + 'SRPMS/.metadata/' + srpm + '.info', 'w')
-        f.write(content)
-        f.close()
-
-    rm(incoming_dir + 'SRPMS/' + uploadinfo)
-
 def send_noarch_msg(files_differ, reqs_differ, pkg, rpm, arch):
     req_email=pkg.build[pkg.lastbid].requester_email
     req_bid=pkg.lastbid
@@ -127,8 +97,6 @@ Subject: %s
 
     sm.close()
 
-   
-
 def move_noarch(f, arch, rpm, dstpkg):
     if dstpkg.noarch_arch.has_key(rpm):
         os.system("rpm -qlp %s | LC_ALL=C sort > %s/files.new" %
@@ -158,6 +126,45 @@ def move_noarch(f, arch, rpm, dstpkg):
         f.write("file:noarch:%s\ninfo:noarch_arch:%s:%s\n" % (rpm, rpm, arch))
         mv(incoming_dir + arch + '/' + rpm, default_to + 'noarch/RPMS')
 
+# main()
+try:
+    ftpio.connect('from-incoming-pid-%s' % os.getpid())
+except:
+    sys.exit(0)
+
+ftptree = BaseFtpTree(cval['default_to'])
+
+if not ftpio.lock(cval['default_to']):
+    sys.exit(0)
+
+for uploadinfo in findfiles(incoming_dir + 'SRPMS'):
+    content = getcontent(incoming_dir + 'SRPMS/' + uploadinfo)
+    if not content:
+        continue # Uploading not finished
+
+    pkg = BasePkg(uploadinfo[:-19], content = content)
+    srpm = pkg.files['SRPMS'][0]
+
+    if ftptree.has_key(`pkg`):
+        ftpio.log("%s already present in %s; removing newer files" % (srpm, ftptree))
+        rm(incoming_dir + 'SRPMS/' + srpm)
+        f = open(default_to + 'SRPMS/.metadata/' + srpm+'.info', 'a')
+        bid = pkg.build.keys()[0]
+        build = pkg.build[bid]
+        f.write("info:build:%s:requester:%s\ninfo:build:%s:requester_email:%s\n"
+                 % (bid, build.requester, bid, build.requester_email))
+        f.close()
+    else:
+        mv(incoming_dir + 'SRPMS/' + srpm, default_to + 'SRPMS/RPMS')
+ 
+        f = open(default_to + 'SRPMS/.metadata/' + srpm + '.info', 'w')
+        f.write(content)
+        f.close()
+
+    rm(incoming_dir + 'SRPMS/' + uploadinfo)
+
+
+
 for arch in ftp_archs:
     for uploadinfo in findfiles(incoming_dir+arch):
         content = getcontent(incoming_dir + arch + '/' + uploadinfo)