Changeset 1557 in ProjectBuilder

Timestamp:

May 21, 2012, 3:48:43 AM (12 years ago)

Author:

Bruno Cornec

Message:

• pb: Don't create a repomd.xml.key symlink if the pubkey is empty. opensuse zypper will reject the file and refuse to use the repo (even if the option to ignore signatures is specified) (Eric Anderson)

File:

• devel/pb/bin/pb (modified) (2 diffs)

devel/pb/bin/pb

@@ -2056 +2056 @@
 createrepo -s $pbsha .
 # Link to the key
-(cd repodata ; ln -sf ../$ENV{'PBPROJ'}.pubkey repomd.xml.key)
+if [ -s $ENV{'PBPROJ'}.pubkey ]; then
+    (cd repodata ; ln -sf ../$ENV{'PBPROJ'}.pubkey repomd.xml.key)
+else
+    echo "Avoiding creating empty repomd.xml.key; fails on opensuse 12.1"
+fi
 # sign the repomd (at least useful for SLES - which requires a local key)
 # gpg -a --detach-sign repodata/repomd.xml
@@ -2149 +2153 @@
             $rpd =~ s|/./|/|g;
             my ($projcomponent_map) = pb_conf_get_if("projcomponent");
-            pb_log(2,"projcomponent = ".Dumper($projcomponent_map);
+            pb_log(2,"projcomponent = ".Dumper($projcomponent_map)."\n");
             my $projcomponent = $projcomponent_map->{$ENV{PBPROJ}};
             $projcomponent ||= 'contrib';