From 3a86cce6c7e785a0f1fce0e324ee0404329c6dd5 Mon Sep 17 00:00:00 2001
From: icedphoenix <icedphoenix@rosalab.ru>
Date: Fri, 21 Sep 2012 14:39:22 +0400
Subject: [PATCH] repodiff: new option --ignore

---
 locale/ru/LC_MESSAGES/urpm-tools.po           | 209 ++++++++++++------
 urpm-repodiff.py                              |  54 ++++-
 .../locale/ru/LC_MESSAGES/urpm-tools.mo       | Bin 38193 -> 38256 bytes
 .../locale/ru/LC_MESSAGES/urpm-tools.po       | 207 ++++++++++++-----
 4 files changed, 338 insertions(+), 132 deletions(-)

diff --git a/locale/ru/LC_MESSAGES/urpm-tools.po b/locale/ru/LC_MESSAGES/urpm-tools.po
index d4ffb57..67e0028 100644
--- a/locale/ru/LC_MESSAGES/urpm-tools.po
+++ b/locale/ru/LC_MESSAGES/urpm-tools.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-13 19:00+0400\n"
+"POT-Creation-Date: 2012-09-21 14:33+0400\n"
 "PO-Revision-Date: 2012-08-21 16:35+0300\n"
 "Last-Translator: Anton Kirilenko <anton.kirilenko@rosalab.ru>\n"
 "Language-Team: RUSSIAN\n"
@@ -20,115 +20,196 @@ msgstr ""
 msgid "Tool for comparing sets of repositories."
 msgstr "Инструмент для сравнения наборов репозиториев."
 
-#: urpm-repodiff.py:85 urpm-tools/urpm-repodiff.py:85
+#: urpm-repodiff.py:84
+msgid "global parameters"
+msgstr "глобальные параметры"
+
+#: urpm-repodiff.py:85
+msgid "Parameters used in all cases."
+msgstr "Параметры, используемые во всех случаях."
+
+#: urpm-repodiff.py:87 urpm-tools/urpm-repodiff.py:85
 msgid "URL or PATH to old repositories"
 msgstr "URL или пути к старым репозиториям"
 
-#: urpm-repodiff.py:87 urpm-tools/urpm-repodiff.py:87
+#: urpm-repodiff.py:89 urpm-tools/urpm-repodiff.py:87
 msgid "URL or PATH to new repositories"
 msgstr "URL или пути к новым репозиториям"
 
-#: urpm-repodiff.py:89 urpm-tools/urpm-repodiff.py:89
-msgid "Show differences in package sizes."
-msgstr "Показывать различия в размерах пакетов."
-
-#: urpm-repodiff.py:91 urpm-tools/urpm-repodiff.py:91
-msgid "Simple output format."
-msgstr "Упрощенный формат вывода."
-
-#: urpm-repodiff.py:93 urpm-tools/urpm-repodiff.py:93
+#: urpm-repodiff.py:91 urpm-tools/urpm-repodiff.py:93
 msgid "Hide service messages."
 msgstr "Не показывать служебные сообщения."
 
-#: urpm-repodiff.py:95 urpm-tools/urpm-repodiff.py:95
+#: urpm-repodiff.py:93
+msgid "Ignore release during package compare."
+msgstr "Не учитывать релиз при сравнении пакетов."
+
+#: urpm-repodiff.py:95
+msgid "Output summary."
+msgstr ""
+
+#: urpm-repodiff.py:97 urpm-tools/urpm-repodiff.py:101
+msgid "Change standart output to \"OUTPUT_FILE\"."
+msgstr "Перенаправить вывод в \"OUTPUT_FILE\""
+
+#: urpm-repodiff.py:99
+#, fuzzy
+msgid "File with list of ignored packages"
+msgstr "Загрузка списка установленных пакетов..."
+
+#: urpm-repodiff.py:100
+msgid "text mode parameters"
+msgstr ""
+
+#: urpm-repodiff.py:101
+msgid "Parameters used only in text mode. (--html not present)"
+msgstr ""
+
+#: urpm-repodiff.py:103 urpm-tools/urpm-repodiff.py:89
+msgid "Show differences in package sizes."
+msgstr "Показывать различия в размерах пакетов."
+
+#: urpm-repodiff.py:105 urpm-tools/urpm-repodiff.py:91
+msgid "Simple output format."
+msgstr "Упрощенный формат вывода."
+
+#: urpm-repodiff.py:107 urpm-tools/urpm-repodiff.py:95
 msgid "Show changelog difference."
 msgstr "Показывать разницу списков изменений."
 
-#: urpm-repodiff.py:97 urpm-tools/urpm-repodiff.py:97
+#: urpm-repodiff.py:108
+msgid "HTML mode parameters"
+msgstr ""
+
+#: urpm-repodiff.py:109
+msgid "Parameters used only in HTML mode. (--html is present)"
+msgstr ""
+
+#: urpm-repodiff.py:111 urpm-tools/urpm-repodiff.py:97
 #, python-format
 msgid "Output in HTML format, if --output is not present               \"%s\" will be created in current directory.               --size, --simple and --changelog options are ignored."
 msgstr "Вывод в формате HTML. Если --output не указан, то файл \"%s\" будет создан в текущей директории. Опции --size, --simple и --changelog будут игнорироваться."
 
-#: urpm-repodiff.py:101
-msgid "Ignore release during package compare."
-msgstr "Не учитывать релиз при сравнении пакетов."
+#: urpm-repodiff.py:115
+#, fuzzy
+msgid "Repository names for output."
+msgstr "Формат вывода."
 
-#: urpm-repodiff.py:103 urpm-tools/urpm-repodiff.py:101
-msgid "Change standart output to \"OUTPUT_FILE\"."
-msgstr "Перенаправить вывод в \"OUTPUT_FILE\""
+#: urpm-repodiff.py:116
+msgid "Filters"
+msgstr ""
 
-#: urpm-repodiff.py:127 urpm-repograph.py:157 urpm-tools/urpm-repodiff.py:125
+#: urpm-repodiff.py:117
+msgid "Filters for output. If none selected then every type will\t\t    be shown"
+msgstr ""
+
+#: urpm-repodiff.py:120
+#, fuzzy
+msgid "Show new packages"
+msgstr "Новый пакет: "
+
+#: urpm-repodiff.py:122
+#, fuzzy
+msgid "Show removed packages"
+msgstr "удалить более старые пакеты"
+
+#: urpm-repodiff.py:124
+#, fuzzy
+msgid "Show updated packages"
+msgstr "    Всего обновлено пакетов: "
+
+#: urpm-repodiff.py:126
+#, fuzzy
+msgid "Show downgraded packages"
+msgstr "    Всего пакетов с пониженной версией: "
+
+#: urpm-repodiff.py:150 urpm-repograph.py:157 urpm-tools/urpm-repodiff.py:125
 #: urpm-tools/urpm-repograph.py:157
 #, python-format
 msgid "Error: URL to repository \"%s\" is incorrect"
 msgstr "Ошибка: Неверный URL репозитория \"%s\""
 
-#: urpm-repodiff.py:149 urpm-repograph.py:179 urpm-tools/urpm-repodiff.py:147
+#: urpm-repodiff.py:172 urpm-repograph.py:179 urpm-tools/urpm-repodiff.py:147
 #: urpm-tools/urpm-repograph.py:179
 #, python-format
 msgid "Error: directory %s does not exist"
 msgstr "Ошибка: директория %s не существует"
 
-#: urpm-repodiff.py:159 urpm-repograph.py:189 urpm-tools/urpm-repodiff.py:157
+#: urpm-repodiff.py:182 urpm-repograph.py:189 urpm-tools/urpm-repodiff.py:157
 #: urpm-tools/urpm-repograph.py:189
 #, python-format
 msgid "Error: \"%s\" is not correct url, path or name of repository"
 msgstr "Ошибка: \"%s\" не является корректным URL, путем или именем репозитория"
 
-#: urpm-repodiff.py:176 urpm-tools/urpm-repodiff.py:174
+#: urpm-repodiff.py:199 urpm-tools/urpm-repodiff.py:174
 #, python-format
 msgid "Error: Cannot open %s for writing."
 msgstr "Ошибка: Не удалось открыть %s для записи."
 
-#: urpm-repodiff.py:185 urpm-repograph.py:222 urpm-repograph.py:237
+#: urpm-repodiff.py:208 urpm-repograph.py:222 urpm-repograph.py:237
 #: urpm-tools/urpm-repodiff.py:183 urpm-tools/urpm-repograph.py:222
 #: urpm-tools/urpm-repograph.py:237
 #, python-format
 msgid "Error: File %s already exists"
 msgstr "Ошибка: Файл %s уже существует"
 
-#: urpm-repodiff.py:194 urpm-repograph.py:246 urpm-tools/urpm-repodiff.py:192
+#: urpm-repodiff.py:217 urpm-repograph.py:246 urpm-tools/urpm-repodiff.py:192
 #: urpm-tools/urpm-repograph.py:246
 #, python-format
 msgid "Error: File %s cannot be created"
 msgstr "Ошибка: Не удалось создать файл %s"
 
-#: urpm-repodiff.py:198 urpm-repograph.py:250 urpm-tools/urpm-repodiff.py:196
+#: urpm-repodiff.py:221 urpm-repograph.py:250 urpm-tools/urpm-repodiff.py:196
 #: urpm-tools/urpm-repograph.py:250
 #, python-format
 msgid "Error: Path %s does not exist."
 msgstr "Ошибка: Путь %s не существует."
 
-#: urpm-repodiff.py:220 urpm-repograph.py:262 urpm-tools/urpm-repodiff.py:218
+#: urpm-repodiff.py:235
+#, python-format
+msgid "Error: number of REPONAME's(%s) are not equal to number of groups(%s)"
+msgstr ""
+
+#: urpm-repodiff.py:249 urpm-repograph.py:262 urpm-tools/urpm-repodiff.py:218
 #: urpm-tools/urpm-repograph.py:262
 #, python-format
 msgid "getting file %s from "
 msgstr "получение файла %s из "
 
-#: urpm-repodiff.py:225 urpm-repograph.py:267 urpm-tools/urpm-repodiff.py:223
+#: urpm-repodiff.py:254 urpm-repograph.py:267 urpm-tools/urpm-repodiff.py:223
 #: urpm-tools/urpm-repograph.py:267
 #, python-format
 msgid "Error: file %s was not copied"
 msgstr "Ошибка: файл %s был скопирован"
 
-#: urpm-repodiff.py:233 urpm-repograph.py:275 urpm-tools/urpm-repodiff.py:231
+#: urpm-repodiff.py:262 urpm-repograph.py:275 urpm-tools/urpm-repodiff.py:231
 #: urpm-tools/urpm-repograph.py:275
 #, python-format
 msgid "Error: file %(from)s was not downloaded to %(to)s"
 msgstr "Ошибка: файл %(from)s не был скачан в %(to)s"
 
-#: urpm-repodiff.py:274 urpm-repograph.py:288 urpm-tools/urpm-repodiff.py:272
+#: urpm-repodiff.py:301
+#, fuzzy, python-format
+msgid "Error: file %s does not exist."
+msgstr "Ошибка: Путь %s не существует."
+
+#: urpm-repodiff.py:314
+#, fuzzy, python-format
+msgid "Error: file %s cannot be read."
+msgstr "Ошибка: Не удалось создать файл %s"
+
+#: urpm-repodiff.py:354 urpm-repograph.py:288 urpm-tools/urpm-repodiff.py:272
 #: urpm-tools/urpm-repograph.py:288
 msgid "Error: file not found: "
 msgstr "Ошибка: файл не найден: "
 
-#: urpm-repodiff.py:279 urpm-repograph.py:293 urpm-tools/urpm-repodiff.py:277
+#: urpm-repodiff.py:359 urpm-repograph.py:293 urpm-tools/urpm-repodiff.py:277
 #: urpm-tools/urpm-repograph.py:293
 #, python-format
 msgid "Error: cannot rename file %(from)s to %(to)s"
 msgstr "Ошибка: не удалось переименовать файл %(from)s в %(to)s"
 
-#: urpm-repodiff.py:283 urpm-repograph.py:297 urpm-repograph.py:313
+#: urpm-repodiff.py:363 urpm-repograph.py:297 urpm-repograph.py:313
 #: urpm-repograph.py:543 urpm-tools/urpm-repodiff.py:281
 #: urpm-tools/urpm-repograph.py:297 urpm-tools/urpm-repograph.py:313
 #: urpm-tools/urpm-repograph.py:543
@@ -136,103 +217,103 @@ msgstr "Ошибка: не удалось переименовать файл %(
 msgid "Error: file %s is missing."
 msgstr "Ошибка: файл %s отсутствует."
 
-#: urpm-repodiff.py:287 urpm-repograph.py:301 urpm-tools/urpm-repodiff.py:285
+#: urpm-repodiff.py:367 urpm-repograph.py:301 urpm-tools/urpm-repodiff.py:285
 #: urpm-tools/urpm-repograph.py:301
 #, python-format
 msgid "file %(from)s was renamed to %(to)s"
 msgstr "файл %(from)s был переименован в %(to)s"
 
-#: urpm-repodiff.py:296 urpm-repodiff.py:299 urpm-repograph.py:311
+#: urpm-repodiff.py:376 urpm-repodiff.py:379 urpm-repograph.py:311
 #: urpm-repograph.py:541 urpm-tools/urpm-repodiff.py:294
 #: urpm-tools/urpm-repodiff.py:297 urpm-tools/urpm-repograph.py:311
 #: urpm-tools/urpm-repograph.py:541
 msgid "unpacking file "
 msgstr "распаковка файла "
 
-#: urpm-repodiff.py:354 urpm-repograph.py:406 urpm-tools/urpm-repodiff.py:351
+#: urpm-repodiff.py:434 urpm-repograph.py:406 urpm-tools/urpm-repodiff.py:351
 #: urpm-tools/urpm-repograph.py:406
 #, python-format
 msgid "Error: Synthesis file %s was not found."
 msgstr "Ошибка: Synthesis файл %s не найден."
 
-#: urpm-repodiff.py:357 urpm-tools/urpm-repodiff.py:354
+#: urpm-repodiff.py:437 urpm-tools/urpm-repodiff.py:354
 msgid "Parsing synthesis"
 msgstr "Чтение synthesis файла"
 
-#: urpm-repodiff.py:386 urpm-repograph.py:451 urpm-tools/urpm-repodiff.py:380
+#: urpm-repodiff.py:466 urpm-repograph.py:451 urpm-tools/urpm-repodiff.py:380
 #: urpm-tools/urpm-repograph.py:451
 msgid "Error: Failed to open synthesis file "
 msgstr "Ошибка: Не удалось открыть synthesis файл"
 
-#: urpm-repodiff.py:395 urpm-tools/urpm-repodiff.py:389
+#: urpm-repodiff.py:475 urpm-tools/urpm-repodiff.py:389
 msgid "REPODIFF-Warning: strange format of <disttag> or <distepoch>: "
 msgstr "REPODIFF-Предупреждение: необычный формат <disttag> или <distepoch>: "
 
-#: urpm-repodiff.py:416 urpm-repograph.py:371 urpm-tools/urpm-repodiff.py:410
+#: urpm-repodiff.py:496 urpm-repograph.py:371 urpm-tools/urpm-repodiff.py:410
 #: urpm-tools/urpm-repograph.py:371
 msgid "REPODIFF-Warning: strange <info>: "
 msgstr "REPODIFF-Предупреждение: необычное поле <info>: "
 
-#: urpm-repodiff.py:537 urpm-tools/urpm-repodiff.py:527
+#: urpm-repodiff.py:626 urpm-tools/urpm-repodiff.py:527
 msgid "New package: "
 msgstr "Новый пакет: "
 
-#: urpm-repodiff.py:552 urpm-tools/urpm-repodiff.py:542
+#: urpm-repodiff.py:641 urpm-tools/urpm-repodiff.py:542
 msgid "Generating obsoleted list."
 msgstr "Создание списка устаревших пакетов."
 
-#: urpm-repodiff.py:611 urpm-tools/urpm-repodiff.py:601
+#: urpm-repodiff.py:700 urpm-tools/urpm-repodiff.py:601
 msgid "Removed package: "
 msgstr "Удален пакет: "
 
-#: urpm-repodiff.py:619 urpm-tools/urpm-repodiff.py:609
+#: urpm-repodiff.py:708 urpm-tools/urpm-repodiff.py:609
 msgid "    Obsoleted by "
 msgstr "    Устарел из-за добавления "
 
-#: urpm-repodiff.py:640 urpm-tools/urpm-repodiff.py:630
+#: urpm-repodiff.py:730 urpm-tools/urpm-repodiff.py:630
 msgid "Reading changelog"
 msgstr "Чтение списка изменений"
 
-#: urpm-repodiff.py:642 urpm-tools/urpm-repodiff.py:632
+#: urpm-repodiff.py:732 urpm-tools/urpm-repodiff.py:632
 msgid "Error: Can't find changelog "
 msgstr "Ошибка: Не удалось найти список изменений "
 
-#: urpm-repodiff.py:646 urpm-tools/urpm-repodiff.py:636
+#: urpm-repodiff.py:736 urpm-tools/urpm-repodiff.py:636
 msgid "Error: Can't read changelog "
 msgstr "Ошибка: Не удалось прочитать список изменений "
 
-#: urpm-repodiff.py:650 urpm-tools/urpm-repodiff.py:640
+#: urpm-repodiff.py:740 urpm-tools/urpm-repodiff.py:640
 msgid "Error: Wrong changelog."
 msgstr "Ошибка: Неправильный список изменений."
 
-#: urpm-repodiff.py:672 urpm-tools/urpm-repodiff.py:662
+#: urpm-repodiff.py:762 urpm-tools/urpm-repodiff.py:662
 msgid "Error: Corrupted changelog"
 msgstr "Ошибка: Поврежденный список изменений"
 
-#: urpm-repodiff.py:766 urpm-tools/urpm-repodiff.py:756
+#: urpm-repodiff.py:861 urpm-tools/urpm-repodiff.py:756
 msgid "Generating changes list."
 msgstr "Создание списка изменений."
 
-#: urpm-repodiff.py:780 urpm-repodiff.py:783 urpm-tools/urpm-repodiff.py:770
+#: urpm-repodiff.py:877 urpm-repodiff.py:880 urpm-tools/urpm-repodiff.py:770
 #: urpm-tools/urpm-repodiff.py:773
 #, python-format
 msgid "REPODIFF-Warning: Package %s was not described in changelogs.xml"
 msgstr "REPODIFF-Предупреждение: Пакет %s не описан в changelogs.xml"
 
-#: urpm-repodiff.py:781 urpm-tools/urpm-repodiff.py:771
+#: urpm-repodiff.py:878 urpm-tools/urpm-repodiff.py:771
 msgid "REPODIFF-Warning: Changelogs of a package are absent in \"new\" repository."
 msgstr "REPODIFF-Предупреждение: В репозитории \"новый\" отсутствует список изменений пакета."
 
-#: urpm-repodiff.py:784 urpm-tools/urpm-repodiff.py:774
+#: urpm-repodiff.py:881 urpm-tools/urpm-repodiff.py:774
 msgid "REPODIFF-Warning: Changelogs of a package are absent."
 msgstr "REPODIFF-Предупреждение: У пакета отсутствует список изменений."
 
-#: urpm-repodiff.py:810 urpm-tools/urpm-repodiff.py:800
+#: urpm-repodiff.py:910 urpm-tools/urpm-repodiff.py:800
 #, python-format
 msgid "Package %s has no changelog info\n"
 msgstr "Пакет %s не имеет списка изменений\n"
 
-#: urpm-repodiff.py:828 urpm-tools/urpm-repodiff.py:818
+#: urpm-repodiff.py:930 urpm-tools/urpm-repodiff.py:818
 msgid ""
 "\n"
 "\n"
@@ -244,11 +325,11 @@ msgstr ""
 "Обновленные пакеты:\n"
 "\n"
 
-#: urpm-repodiff.py:835 urpm-tools/urpm-repodiff.py:825
+#: urpm-repodiff.py:938 urpm-tools/urpm-repodiff.py:825
 msgid "   ***DOWNGRADED***\n"
 msgstr "   ***УСТАНОВЛЕНА ПРЕДЫДУЩАЯ ВЕРСИЯ***\n"
 
-#: urpm-repodiff.py:844 urpm-tools/urpm-repodiff.py:834
+#: urpm-repodiff.py:956 urpm-tools/urpm-repodiff.py:834
 #, python-format
 msgid ""
 "Size Change: %d bytes\n"
@@ -257,23 +338,27 @@ msgstr ""
 "Размер изменен: %d байт\n"
 "\n"
 
-#: urpm-repodiff.py:854 urpm-tools/urpm-repodiff.py:844
+#: urpm-repodiff.py:971
+msgid "Summary:"
+msgstr ""
+
+#: urpm-repodiff.py:979 urpm-tools/urpm-repodiff.py:844
 msgid "    Total added packages: "
 msgstr "    Всего добавлено пакетов: "
 
-#: urpm-repodiff.py:857 urpm-tools/urpm-repodiff.py:847
+#: urpm-repodiff.py:983 urpm-tools/urpm-repodiff.py:847
 msgid "    Total removed packages: "
 msgstr "    Всего удалено пакетов: "
 
-#: urpm-repodiff.py:866 urpm-tools/urpm-repodiff.py:856
+#: urpm-repodiff.py:994 urpm-tools/urpm-repodiff.py:856
 msgid "    Total updated packages: "
 msgstr "    Всего обновлено пакетов: "
 
-#: urpm-repodiff.py:868 urpm-tools/urpm-repodiff.py:858
+#: urpm-repodiff.py:997 urpm-tools/urpm-repodiff.py:858
 msgid "    Total downgraded packages: "
 msgstr "    Всего пакетов с пониженной версией: "
 
-#: urpm-repodiff.py:1334 urpm-tools/urpm-repodiff.py:1316
+#: urpm-repodiff.py:1498 urpm-tools/urpm-repodiff.py:1316
 msgid "Creating HTML file."
 msgstr "Создание HTML файла."
 
diff --git a/urpm-repodiff.py b/urpm-repodiff.py
index 11926b0..6f8f126 100755
--- a/urpm-repodiff.py
+++ b/urpm-repodiff.py
@@ -303,8 +303,11 @@ def ReadIgnoreList(arg):
     try:
 	ifile = open(ignorefile)
 	for string in ifile:
-	    if string != '':
-		ignorelist.append(string)
+	    if string == '\n':
+		continue
+	    if string.endswith('\n'):
+		string = string[:-1]
+	    ignorelist.append(string)
 	ifile.close()
 	ignorelist.sort()
     except:
@@ -312,6 +315,34 @@ def ReadIgnoreList(arg):
 	exit_proc(arg)
     return ignorelist
 
+def RemoveIgnored(dict_in, ignorelist):
+    dict_out = {}
+    sorted_list = sorted(dict_in)
+    i = 0
+    imax = len(sorted_list)
+    j = 0
+    jmax = len(ignorelist)
+    while (i < imax) and (j < jmax):
+	if ignorelist[j].endswith('*'):
+	    comp_str = ignorelist[j][:-1]
+	    while (i < imax) and (sorted_list[i] < comp_str):
+		dict_out[sorted_list[i]] = dict_in[sorted_list[i]]
+		i = i + 1
+	    while (i < imax) and sorted_list[i].startswith(comp_str):
+		i = i + 1
+	else:
+	    comp_str = ignorelist[j]
+	    while (i < imax) and (sorted_list[i] < comp_str):
+		dict_out[sorted_list[i]] = dict_in[sorted_list[i]]
+		i = i + 1
+	    if (i < imax) and (sorted_list[i] == comp_str):
+		i = i + 1
+	j = j + 1
+    if (i < imax) and (j == jmax):
+	for i in range(i, imax):
+	    dict_out[sorted_list[i]] = dict_in[sorted_list[i]]
+    return dict_out
+
 def RenameSynthFile(localdir, arg):
     """Rename.
 
@@ -519,6 +550,7 @@ def ParsePackage(arg):
     """
     ifchangelog = arg.changelog
     ifnotquiet = arg.quiet
+    ignorelist = arg.ignorelist
     pkgdict_old = {}
     for tmp_list in arg.temp_old:
 	for directory in tmp_list:
@@ -531,6 +563,10 @@ def ParsePackage(arg):
 	    RenameSynthFile(directory, arg)
 	    UnpackFiles(directory, ifchangelog, ifnotquiet)
 	    ParseSynthesis(directory + synthesis_file, pkgdict_new, arg)
+    pkgdict_old = RemoveIgnored(pkgdict_old, ignorelist)
+    pdkdict_new = RemoveIgnored(pkgdict_new, ignorelist)
+    ignorelist = ""
+    arg.ignorelist = ""
     return pkgdict_old, pkgdict_new
 
 def CreateDicts(dict_old, dict_new):
@@ -972,6 +1008,7 @@ def HTML_ParsePackage(arg):
     """
     ifchangelog = arg.changelog
     ifnotquiet = arg.quiet
+    ignorelist = arg.ignorelist
 
     html_old_dict_list = []
     html_new_dict_list = []
@@ -982,14 +1019,16 @@ def HTML_ParsePackage(arg):
     	    RenameSynthFile(directory, arg)
     	    UnpackFiles(directory, 0, ifnotquiet)
     	    ParseSynthesis(directory + synthesis_file, tmp_dict, arg)
-    	html_old_dict_list.append(tmp_dict)
+    	html_old_dict_list.append(RemoveIgnored(tmp_dict, ignorelist))
     for tmp_list in arg.temp_new:
 	tmp_dict = {}
 	for directory in tmp_list:
 	    RenameSynthFile(directory, arg)
 	    UnpackFiles(directory, 0, ifnotquiet)
 	    ParseSynthesis(directory + synthesis_file, tmp_dict, arg)
-	html_new_dict_list.append(tmp_dict)
+	html_new_dict_list.append(RemoveIgnored(tmp_dict, ignorelist))
+    ignorelist = ""
+    arg.ignorelist = ""
     return html_old_dict_list, html_new_dict_list
 
 def HTML_UniteDicts(list_dict):
@@ -1503,12 +1542,9 @@ def main(args):
 	arg.show_downgraded=True
 
     if arg.ignore:
-	ignorelist = ReadIgnoreList(arg)
+	arg.ignorelist = ReadIgnoreList(arg)
     else:
-	ignorelist = []
-
-    for s in ignorelist:
-	print s
+	arg.ignorelist = []
 
     GetFiles(arg)
 
diff --git a/urpm-tools/locale/ru/LC_MESSAGES/urpm-tools.mo b/urpm-tools/locale/ru/LC_MESSAGES/urpm-tools.mo
index 38a4f9472a33280c84a2bfd3c60b712fe8e023dd..8af0793d8f9ffb4dae4932263a739db149d65843 100644
GIT binary patch
delta 5286
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

delta 5226
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

diff --git a/urpm-tools/locale/ru/LC_MESSAGES/urpm-tools.po b/urpm-tools/locale/ru/LC_MESSAGES/urpm-tools.po
index 0511d18..74dfa19 100644
--- a/urpm-tools/locale/ru/LC_MESSAGES/urpm-tools.po
+++ b/urpm-tools/locale/ru/LC_MESSAGES/urpm-tools.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-13 19:00+0400\n"
+"POT-Creation-Date: 2012-09-21 14:33+0400\n"
 "PO-Revision-Date: 2012-08-21 16:35+0300\n"
 "Last-Translator: Anton Kirilenko <anton.kirilenko@rosalab.ru>\n"
 "Language-Team: RUSSIAN\n"
@@ -20,115 +20,196 @@ msgstr ""
 msgid "Tool for comparing sets of repositories."
 msgstr "Инструмент для сравнения наборов репозиториев."
 
-#: urpm-repodiff.py:85 urpm-tools/urpm-repodiff.py:85
+#: urpm-repodiff.py:84
+msgid "global parameters"
+msgstr ""
+
+#: urpm-repodiff.py:85
+msgid "Parameters used in all cases."
+msgstr ""
+
+#: urpm-repodiff.py:87 urpm-tools/urpm-repodiff.py:85
 msgid "URL or PATH to old repositories"
 msgstr "URL или пути к старым репозиториям"
 
-#: urpm-repodiff.py:87 urpm-tools/urpm-repodiff.py:87
+#: urpm-repodiff.py:89 urpm-tools/urpm-repodiff.py:87
 msgid "URL or PATH to new repositories"
 msgstr "URL или пути к новым репозиториям"
 
-#: urpm-repodiff.py:89 urpm-tools/urpm-repodiff.py:89
-msgid "Show differences in package sizes."
-msgstr "Показывать различия в размерах пакетов."
-
-#: urpm-repodiff.py:91 urpm-tools/urpm-repodiff.py:91
-msgid "Simple output format."
-msgstr "Упрощенный формат вывода."
-
-#: urpm-repodiff.py:93 urpm-tools/urpm-repodiff.py:93
+#: urpm-repodiff.py:91 urpm-tools/urpm-repodiff.py:93
 msgid "Hide service messages."
 msgstr "Не показывать служебные сообщения."
 
-#: urpm-repodiff.py:95 urpm-tools/urpm-repodiff.py:95
+#: urpm-repodiff.py:93
+msgid "Ignore release during package compare."
+msgstr ""
+
+#: urpm-repodiff.py:95
+msgid "Output summary."
+msgstr "Отобразить итог."
+
+#: urpm-repodiff.py:97 urpm-tools/urpm-repodiff.py:101
+msgid "Change standart output to \"OUTPUT_FILE\"."
+msgstr "Перенаправить вывод в \"OUTPUT_FILE\""
+
+#: urpm-repodiff.py:99
+#, fuzzy
+msgid "File with list of ignored packages"
+msgstr "Загрузка списка установленных пакетов..."
+
+#: urpm-repodiff.py:100
+msgid "text mode parameters"
+msgstr ""
+
+#: urpm-repodiff.py:101
+msgid "Parameters used only in text mode. (--html not present)"
+msgstr ""
+
+#: urpm-repodiff.py:103 urpm-tools/urpm-repodiff.py:89
+msgid "Show differences in package sizes."
+msgstr "Показывать различия в размерах пакетов."
+
+#: urpm-repodiff.py:105 urpm-tools/urpm-repodiff.py:91
+msgid "Simple output format."
+msgstr "Упрощенный формат вывода."
+
+#: urpm-repodiff.py:107 urpm-tools/urpm-repodiff.py:95
 msgid "Show changelog difference."
 msgstr "Показывать разницу списков изменений."
 
-#: urpm-repodiff.py:97 urpm-tools/urpm-repodiff.py:97
+#: urpm-repodiff.py:108
+msgid "HTML mode parameters"
+msgstr ""
+
+#: urpm-repodiff.py:109
+msgid "Parameters used only in HTML mode. (--html is present)"
+msgstr ""
+
+#: urpm-repodiff.py:111 urpm-tools/urpm-repodiff.py:97
 #, python-format
 msgid "Output in HTML format, if --output is not present               \"%s\" will be created in current directory.               --size, --simple and --changelog options are ignored."
 msgstr "Вывод в формате HTML. Если --output не указан, то файл \"%s\" будет создан в текущей директории. Опции --size, --simple и --changelog будут игнорироваться."
 
-#: urpm-repodiff.py:101
-msgid "Ignore release during package compare."
+#: urpm-repodiff.py:115
+#, fuzzy
+msgid "Repository names for output."
+msgstr "Формат вывода."
+
+#: urpm-repodiff.py:116
+msgid "Filters"
 msgstr ""
 
-#: urpm-repodiff.py:103 urpm-tools/urpm-repodiff.py:101
-msgid "Change standart output to \"OUTPUT_FILE\"."
-msgstr "Перенаправить вывод в \"OUTPUT_FILE\""
+#: urpm-repodiff.py:117
+msgid "Filters for output. If none selected then every type will\t\t    be shown"
+msgstr ""
 
-#: urpm-repodiff.py:127 urpm-repograph.py:157 urpm-tools/urpm-repodiff.py:125
+#: urpm-repodiff.py:120
+#, fuzzy
+msgid "Show new packages"
+msgstr "Новый пакет: "
+
+#: urpm-repodiff.py:122
+#, fuzzy
+msgid "Show removed packages"
+msgstr "удалить более старые пакеты"
+
+#: urpm-repodiff.py:124
+#, fuzzy
+msgid "Show updated packages"
+msgstr "    Всего обновлено пакетов: "
+
+#: urpm-repodiff.py:126
+#, fuzzy
+msgid "Show downgraded packages"
+msgstr "    Всего пакетов с пониженной версией: "
+
+#: urpm-repodiff.py:150 urpm-repograph.py:157 urpm-tools/urpm-repodiff.py:125
 #: urpm-tools/urpm-repograph.py:157
 #, python-format
 msgid "Error: URL to repository \"%s\" is incorrect"
 msgstr "Ошибка: Неверный URL репозитория \"%s\""
 
-#: urpm-repodiff.py:149 urpm-repograph.py:179 urpm-tools/urpm-repodiff.py:147
+#: urpm-repodiff.py:172 urpm-repograph.py:179 urpm-tools/urpm-repodiff.py:147
 #: urpm-tools/urpm-repograph.py:179
 #, python-format
 msgid "Error: directory %s does not exist"
 msgstr "Ошибка: директория %s не существует"
 
-#: urpm-repodiff.py:159 urpm-repograph.py:189 urpm-tools/urpm-repodiff.py:157
+#: urpm-repodiff.py:182 urpm-repograph.py:189 urpm-tools/urpm-repodiff.py:157
 #: urpm-tools/urpm-repograph.py:189
 #, python-format
 msgid "Error: \"%s\" is not correct url, path or name of repository"
 msgstr "Ошибка: \"%s\" не является корректным URL, путем или именем репозитория"
 
-#: urpm-repodiff.py:176 urpm-tools/urpm-repodiff.py:174
+#: urpm-repodiff.py:199 urpm-tools/urpm-repodiff.py:174
 #, python-format
 msgid "Error: Cannot open %s for writing."
 msgstr "Ошибка: Не удалось открыть %s для записи."
 
-#: urpm-repodiff.py:185 urpm-repograph.py:222 urpm-repograph.py:237
+#: urpm-repodiff.py:208 urpm-repograph.py:222 urpm-repograph.py:237
 #: urpm-tools/urpm-repodiff.py:183 urpm-tools/urpm-repograph.py:222
 #: urpm-tools/urpm-repograph.py:237
 #, python-format
 msgid "Error: File %s already exists"
 msgstr "Ошибка: Файл %s уже существует"
 
-#: urpm-repodiff.py:194 urpm-repograph.py:246 urpm-tools/urpm-repodiff.py:192
+#: urpm-repodiff.py:217 urpm-repograph.py:246 urpm-tools/urpm-repodiff.py:192
 #: urpm-tools/urpm-repograph.py:246
 #, python-format
 msgid "Error: File %s cannot be created"
 msgstr "Ошибка: Не удалось создать файл %s"
 
-#: urpm-repodiff.py:198 urpm-repograph.py:250 urpm-tools/urpm-repodiff.py:196
+#: urpm-repodiff.py:221 urpm-repograph.py:250 urpm-tools/urpm-repodiff.py:196
 #: urpm-tools/urpm-repograph.py:250
 #, python-format
 msgid "Error: Path %s does not exist."
 msgstr "Ошибка: Путь %s не существует."
 
-#: urpm-repodiff.py:220 urpm-repograph.py:262 urpm-tools/urpm-repodiff.py:218
+#: urpm-repodiff.py:235
+#, python-format
+msgid "Error: number of REPONAME's(%s) are not equal to number of groups(%s)"
+msgstr ""
+
+#: urpm-repodiff.py:249 urpm-repograph.py:262 urpm-tools/urpm-repodiff.py:218
 #: urpm-tools/urpm-repograph.py:262
 #, python-format
 msgid "getting file %s from "
 msgstr "получение файла %s из "
 
-#: urpm-repodiff.py:225 urpm-repograph.py:267 urpm-tools/urpm-repodiff.py:223
+#: urpm-repodiff.py:254 urpm-repograph.py:267 urpm-tools/urpm-repodiff.py:223
 #: urpm-tools/urpm-repograph.py:267
 #, python-format
 msgid "Error: file %s was not copied"
 msgstr "Ошибка: файл %s был скопирован"
 
-#: urpm-repodiff.py:233 urpm-repograph.py:275 urpm-tools/urpm-repodiff.py:231
+#: urpm-repodiff.py:262 urpm-repograph.py:275 urpm-tools/urpm-repodiff.py:231
 #: urpm-tools/urpm-repograph.py:275
 #, python-format
 msgid "Error: file %(from)s was not downloaded to %(to)s"
 msgstr "Ошибка: файл %(from)s не был скачан в %(to)s"
 
-#: urpm-repodiff.py:274 urpm-repograph.py:288 urpm-tools/urpm-repodiff.py:272
+#: urpm-repodiff.py:301
+#, fuzzy, python-format
+msgid "Error: file %s does not exist."
+msgstr "Ошибка: Путь %s не существует."
+
+#: urpm-repodiff.py:314
+#, fuzzy, python-format
+msgid "Error: file %s cannot be read."
+msgstr "Ошибка: Не удалось создать файл %s"
+
+#: urpm-repodiff.py:354 urpm-repograph.py:288 urpm-tools/urpm-repodiff.py:272
 #: urpm-tools/urpm-repograph.py:288
 msgid "Error: file not found: "
 msgstr "Ошибка: файл не найден: "
 
-#: urpm-repodiff.py:279 urpm-repograph.py:293 urpm-tools/urpm-repodiff.py:277
+#: urpm-repodiff.py:359 urpm-repograph.py:293 urpm-tools/urpm-repodiff.py:277
 #: urpm-tools/urpm-repograph.py:293
 #, python-format
 msgid "Error: cannot rename file %(from)s to %(to)s"
 msgstr "Ошибка: не удалось переименовать файл %(from)s в %(to)s"
 
-#: urpm-repodiff.py:283 urpm-repograph.py:297 urpm-repograph.py:313
+#: urpm-repodiff.py:363 urpm-repograph.py:297 urpm-repograph.py:313
 #: urpm-repograph.py:543 urpm-tools/urpm-repodiff.py:281
 #: urpm-tools/urpm-repograph.py:297 urpm-tools/urpm-repograph.py:313
 #: urpm-tools/urpm-repograph.py:543
@@ -136,103 +217,103 @@ msgstr "Ошибка: не удалось переименовать файл %(
 msgid "Error: file %s is missing."
 msgstr "Ошибка: файл %s отсутствует."
 
-#: urpm-repodiff.py:287 urpm-repograph.py:301 urpm-tools/urpm-repodiff.py:285
+#: urpm-repodiff.py:367 urpm-repograph.py:301 urpm-tools/urpm-repodiff.py:285
 #: urpm-tools/urpm-repograph.py:301
 #, python-format
 msgid "file %(from)s was renamed to %(to)s"
 msgstr "файл %(from)s был переименован в %(to)s"
 
-#: urpm-repodiff.py:296 urpm-repodiff.py:299 urpm-repograph.py:311
+#: urpm-repodiff.py:376 urpm-repodiff.py:379 urpm-repograph.py:311
 #: urpm-repograph.py:541 urpm-tools/urpm-repodiff.py:294
 #: urpm-tools/urpm-repodiff.py:297 urpm-tools/urpm-repograph.py:311
 #: urpm-tools/urpm-repograph.py:541
 msgid "unpacking file "
 msgstr "распаковка файла "
 
-#: urpm-repodiff.py:354 urpm-repograph.py:406 urpm-tools/urpm-repodiff.py:351
+#: urpm-repodiff.py:434 urpm-repograph.py:406 urpm-tools/urpm-repodiff.py:351
 #: urpm-tools/urpm-repograph.py:406
 #, python-format
 msgid "Error: Synthesis file %s was not found."
 msgstr "Ошибка: Synthesis файл %s не найден."
 
-#: urpm-repodiff.py:357 urpm-tools/urpm-repodiff.py:354
+#: urpm-repodiff.py:437 urpm-tools/urpm-repodiff.py:354
 msgid "Parsing synthesis"
 msgstr "Чтение synthesis файла"
 
-#: urpm-repodiff.py:386 urpm-repograph.py:451 urpm-tools/urpm-repodiff.py:380
+#: urpm-repodiff.py:466 urpm-repograph.py:451 urpm-tools/urpm-repodiff.py:380
 #: urpm-tools/urpm-repograph.py:451
 msgid "Error: Failed to open synthesis file "
 msgstr "Ошибка: Не удалось открыть synthesis файл"
 
-#: urpm-repodiff.py:395 urpm-tools/urpm-repodiff.py:389
+#: urpm-repodiff.py:475 urpm-tools/urpm-repodiff.py:389
 msgid "REPODIFF-Warning: strange format of <disttag> or <distepoch>: "
 msgstr "REPODIFF-Предупреждение: необычный формат <disttag> или <distepoch>: "
 
-#: urpm-repodiff.py:416 urpm-repograph.py:371 urpm-tools/urpm-repodiff.py:410
+#: urpm-repodiff.py:496 urpm-repograph.py:371 urpm-tools/urpm-repodiff.py:410
 #: urpm-tools/urpm-repograph.py:371
 msgid "REPODIFF-Warning: strange <info>: "
 msgstr "REPODIFF-Предупреждение: необычное поле <info>: "
 
-#: urpm-repodiff.py:537 urpm-tools/urpm-repodiff.py:527
+#: urpm-repodiff.py:626 urpm-tools/urpm-repodiff.py:527
 msgid "New package: "
 msgstr "Новый пакет: "
 
-#: urpm-repodiff.py:552 urpm-tools/urpm-repodiff.py:542
+#: urpm-repodiff.py:641 urpm-tools/urpm-repodiff.py:542
 msgid "Generating obsoleted list."
 msgstr "Создание списка устаревших пакетов."
 
-#: urpm-repodiff.py:611 urpm-tools/urpm-repodiff.py:601
+#: urpm-repodiff.py:700 urpm-tools/urpm-repodiff.py:601
 msgid "Removed package: "
 msgstr "Удален пакет: "
 
-#: urpm-repodiff.py:619 urpm-tools/urpm-repodiff.py:609
+#: urpm-repodiff.py:708 urpm-tools/urpm-repodiff.py:609
 msgid "    Obsoleted by "
 msgstr "    Устарел из-за добавления "
 
-#: urpm-repodiff.py:640 urpm-tools/urpm-repodiff.py:630
+#: urpm-repodiff.py:730 urpm-tools/urpm-repodiff.py:630
 msgid "Reading changelog"
 msgstr "Чтение списка изменений"
 
-#: urpm-repodiff.py:642 urpm-tools/urpm-repodiff.py:632
+#: urpm-repodiff.py:732 urpm-tools/urpm-repodiff.py:632
 msgid "Error: Can't find changelog "
 msgstr "Ошибка: Не удалось найти список изменений "
 
-#: urpm-repodiff.py:646 urpm-tools/urpm-repodiff.py:636
+#: urpm-repodiff.py:736 urpm-tools/urpm-repodiff.py:636
 msgid "Error: Can't read changelog "
 msgstr "Ошибка: Не удалось прочитать список изменений "
 
-#: urpm-repodiff.py:650 urpm-tools/urpm-repodiff.py:640
+#: urpm-repodiff.py:740 urpm-tools/urpm-repodiff.py:640
 msgid "Error: Wrong changelog."
 msgstr "Ошибка: Неправильный список изменений."
 
-#: urpm-repodiff.py:672 urpm-tools/urpm-repodiff.py:662
+#: urpm-repodiff.py:762 urpm-tools/urpm-repodiff.py:662
 msgid "Error: Corrupted changelog"
 msgstr "Ошибка: Поврежденный список изменений"
 
-#: urpm-repodiff.py:766 urpm-tools/urpm-repodiff.py:756
+#: urpm-repodiff.py:861 urpm-tools/urpm-repodiff.py:756
 msgid "Generating changes list."
 msgstr "Создание списка изменений."
 
-#: urpm-repodiff.py:780 urpm-repodiff.py:783 urpm-tools/urpm-repodiff.py:770
+#: urpm-repodiff.py:877 urpm-repodiff.py:880 urpm-tools/urpm-repodiff.py:770
 #: urpm-tools/urpm-repodiff.py:773
 #, python-format
 msgid "REPODIFF-Warning: Package %s was not described in changelogs.xml"
 msgstr "REPODIFF-Предупреждение: Пакет %s не описан в changelogs.xml"
 
-#: urpm-repodiff.py:781 urpm-tools/urpm-repodiff.py:771
+#: urpm-repodiff.py:878 urpm-tools/urpm-repodiff.py:771
 msgid "REPODIFF-Warning: Changelogs of a package are absent in \"new\" repository."
 msgstr "REPODIFF-Предупреждение: В репозитории \"новый\" отсутствует список изменений пакета."
 
-#: urpm-repodiff.py:784 urpm-tools/urpm-repodiff.py:774
+#: urpm-repodiff.py:881 urpm-tools/urpm-repodiff.py:774
 msgid "REPODIFF-Warning: Changelogs of a package are absent."
 msgstr "REPODIFF-Предупреждение: У пакета отсутствует список изменений."
 
-#: urpm-repodiff.py:810 urpm-tools/urpm-repodiff.py:800
+#: urpm-repodiff.py:910 urpm-tools/urpm-repodiff.py:800
 #, python-format
 msgid "Package %s has no changelog info\n"
 msgstr "Пакет %s не имеет списка изменений\n"
 
-#: urpm-repodiff.py:828 urpm-tools/urpm-repodiff.py:818
+#: urpm-repodiff.py:930 urpm-tools/urpm-repodiff.py:818
 msgid ""
 "\n"
 "\n"
@@ -244,11 +325,11 @@ msgstr ""
 "Обновленные пакеты:\n"
 "\n"
 
-#: urpm-repodiff.py:835 urpm-tools/urpm-repodiff.py:825
+#: urpm-repodiff.py:938 urpm-tools/urpm-repodiff.py:825
 msgid "   ***DOWNGRADED***\n"
 msgstr "   ***УСТАНОВЛЕНА ПРЕДЫДУЩАЯ ВЕРСИЯ***\n"
 
-#: urpm-repodiff.py:844 urpm-tools/urpm-repodiff.py:834
+#: urpm-repodiff.py:956 urpm-tools/urpm-repodiff.py:834
 #, python-format
 msgid ""
 "Size Change: %d bytes\n"
@@ -257,23 +338,27 @@ msgstr ""
 "Размер изменен: %d байт\n"
 "\n"
 
-#: urpm-repodiff.py:854 urpm-tools/urpm-repodiff.py:844
+#: urpm-repodiff.py:971
+msgid "Summary:"
+msgstr ""
+
+#: urpm-repodiff.py:979 urpm-tools/urpm-repodiff.py:844
 msgid "    Total added packages: "
 msgstr "    Всего добавлено пакетов: "
 
-#: urpm-repodiff.py:857 urpm-tools/urpm-repodiff.py:847
+#: urpm-repodiff.py:983 urpm-tools/urpm-repodiff.py:847
 msgid "    Total removed packages: "
 msgstr "    Всего удалено пакетов: "
 
-#: urpm-repodiff.py:866 urpm-tools/urpm-repodiff.py:856
+#: urpm-repodiff.py:994 urpm-tools/urpm-repodiff.py:856
 msgid "    Total updated packages: "
 msgstr "    Всего обновлено пакетов: "
 
-#: urpm-repodiff.py:868 urpm-tools/urpm-repodiff.py:858
+#: urpm-repodiff.py:997 urpm-tools/urpm-repodiff.py:858
 msgid "    Total downgraded packages: "
 msgstr "    Всего пакетов с пониженной версией: "
 
-#: urpm-repodiff.py:1334 urpm-tools/urpm-repodiff.py:1316
+#: urpm-repodiff.py:1498 urpm-tools/urpm-repodiff.py:1316
 msgid "Creating HTML file."
 msgstr "Создание HTML файла."