r384 - in trunk: debian src

[Otavio Salvador]

Author: otavio
Date: Thu Dec  2 18:23:03 2004
New Revision: 384

Modified:
   trunk/debian/changelog
   trunk/src/debpartial-mirror.in
Log:
    - Change cpp use to include from debian-cd tasks too. Closes: #284027


Modified: trunk/debian/changelog
==============================================================================
--- trunk/debian/changelog	(original)
+++ trunk/debian/changelog	Thu Dec  2 18:23:03 2004
@@ -1,10 +1,12 @@
 debpartial-mirror (0.2.10) unstable; urgency=low
 
   * NOT YET RELEASED
-  * Vagrant
+  * Vagrant Cascadian
     - change "Error" to "Warning" in non-fatal cases. Closes: #284004
     - flush output buffer so download percent displays sooner
     - minor wording corrections
+  * Otavio Salvador
+    - Change cpp use to include from debian-cd tasks too. Closes: #284027
 
  -- Vagrant Cascadian <vagrant@freegeek.org>  Thu,  2 Dec 2004 14:01:15 -0800
 

Modified: trunk/src/debpartial-mirror.in
==============================================================================
--- trunk/src/debpartial-mirror.in	(original)
+++ trunk/src/debpartial-mirror.in	Thu Dec  2 18:23:03 2004
@@ -60,7 +60,7 @@
                         if self.__cfg.getIncludeTask(d):
                             for a in self.__cfg.getArchs():
                                 try:
-                                    for i in os.popen('cpp -I ' + os.path.dirname(self.__cfg.getIncludeTask(d)) + ' -DARCH_' + a + ' ' + self.__cfg.getIncludeTask(d) + '| grep -v \'^$\|^#.*\'', 'r').readlines():
+                                    for i in os.popen('cpp -I /usr/share/debian-cd/tasks -I ' + os.path.dirname(self.__cfg.getIncludeTask(d)) + ' -DARCH_' + a + ' ' + self.__cfg.getIncludeTask(d) + '| grep -v \'^$\|^#.*\'', 'r').readlines():
                                         rules[f].append({'section':'*', 'priority':'*', 'package':i[:-1]})
                                 except Exception, msg:
                                     print msg
@@ -69,7 +69,7 @@
                         if self.__cfg.getExcludeTask(d):
                             for a in self.__cfg.getArchs():
                                 try:
-                                    for i in os.popen('cpp -I ' + os.path.dirname(self.__cfg.getExcludeTask(d)) + ' -DARCH_' + a + ' ' + self.__cfg.getExcludeTask(d) + '| grep -v \'^$\|^#.*\'', 'r').readlines():
+                                    for i in os.popen('cpp -I /usr/share/debian-cd/tasks -I ' + os.path.dirname(self.__cfg.getExcludeTask(d)) + ' -DARCH_' + a + ' ' + self.__cfg.getExcludeTask(d) + '| grep -v \'^$\|^#.*\'', 'r').readlines():
                                         excludes[f].append(i[:-1])
                                 except Exception, msg:
                                     print msg