[Blends-commit] [SCM] blends-gsoc branch, master, updated. 4659f03ec2b53cc69418ac307da213336cefcd68

Emmanouil Kiagias e.kiagias at gmail.com
Wed Aug 21 17:37:42 UTC 2013


The following commit has been merged in the master branch:
commit 4659f03ec2b53cc69418ac307da213336cefcd68
Author: Emmanouil Kiagias <e.kiagias at gmail.com>
Date:   Wed Aug 21 19:37:33 2013 +0200

    warning message with missing/updated packages is printed by default, removed -w and added -q which does not print the message. In Makefile the warning messages are printed when control file is generated, -q is provided when taskdesc is generated

diff --git a/devtools/Makefile b/devtools/Makefile
index 5274eff..2dbec64 100755
--- a/devtools/Makefile
+++ b/devtools/Makefile
@@ -44,7 +44,7 @@ debian/control: debian/control.stub debian/changelog tasks/* $(CONFIGCONTROL)
 
 tasksel: $(BLEND)-tasks.desc
 $(BLEND)-tasks.desc: tasks/* debian/changelog
-	LC_ALL=C $(GENCONTROL) -S -t && sed -i 's/[ \t]*$$//' taskdesc-sec.template && mv taskdesc-sec.template $(BLEND)-tasks.desc.template
+	LC_ALL=C $(GENCONTROL) -S -t -q && sed -i 's/[ \t]*$$//' taskdesc-sec.template && mv taskdesc-sec.template $(BLEND)-tasks.desc.template
 
 statusdump: dependency_data/
 	$(TASKSDIFF) --status-dump --tasks .  --output dependency_data/$(BLEND)_$(VERSION).json
diff --git a/devtools/sec-blend-gen-control b/devtools/sec-blend-gen-control
index d141cb1..75c26b3 100755
--- a/devtools/sec-blend-gen-control
+++ b/devtools/sec-blend-gen-control
@@ -745,8 +745,8 @@ def main():
                         help="Create new debian/control file.")
     parser.add_argument("-t", dest="taskdesc", action="store_true", default=False,
                         help="Print task descriptions and package list for task")
-    parser.add_argument("-w", "--warn-missing", dest="warn", action="store_true", default=False,
-                        help="Print warning message with missing packages which are actually available packages with outdated name")
+    parser.add_argument("-q",  "--quiet", dest="donotwarn", action="store_true", default=False,
+                        help="If -q is provided do not print: warning message with missing packages which are actually available packages with outdated name")
 
     parser.add_argument("-d", "--debug", dest="debug", action="store_true", default=False,
                         help="Print debug information")
@@ -819,7 +819,7 @@ def main():
             suppressempty = suppressempty)
 
     #warn the user in case you find packages with updated names so that's why they seem missing
-    if args.warn:
+    if not args.donotwarn:
         myudd.warn_for_updated_packages(missing, release)
         myudd.warn_embedded_version_packages(missing,release)
     return 0

-- 
Git repository for blends-gsoc code



More information about the Blends-commit mailing list